mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Slightly different implementation of #6910

Browse Source
This commit is contained in:
Anuken 2022-06-08 08:33:01 -04:00
parent 1c0eff0871
commit e627008fbc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/logic/GlobalVars.java
View File

@ -68,12 +68,14 @@ public class GlobalVars{
} }
for(Block block : Vars.content.blocks()){ for(Block block : Vars.content.blocks()){
put("@" + block.name, block); //only register blocks that have no item equivalent (this skips sand)
if(content.item(block.name) == null){
put("@" + block.name, block);
}
} }
//used as a special value for any environmental solid block //used as a special value for any environmental solid block
put("@solid", Blocks.stoneWall); put("@solid", Blocks.stoneWall);
put("@air", Blocks.air);
for(UnitType type : Vars.content.units()){ for(UnitType type : Vars.content.units()){
put("@" + type.name, type); put("@" + type.name, type);
@ -161,6 +163,12 @@ public class GlobalVars{
/** Adds a constant value by name. */ /** Adds a constant value by name. */
public int put(String name, Object value){ public int put(String name, Object value){
int existingIdx = namesToIds.get(name, -1);
if(existingIdx != -1){ //don't overwrite existing vars (see #6910)
Log.debug("Failed to add global logic variable '@', as it already exists.", name);
return existingIdx;
}
Var var = new Var(name); Var var = new Var(name);
var.constant = true; var.constant = true;
if(value instanceof Number num){ if(value instanceof Number num){