Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed @solid variable

Browse Source
This commit is contained in:
Anuken
2024-06-16 01:35:48 -04:00
parent 5c9e9e3ff4
commit 56b0deb910
37 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import arc.math.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.ctype.*;
import mindustry.game.*;
import mindustry.type.*;
@@ -116,9 +115,6 @@ public class GlobalVars{
put("@color" + Strings.capitalize(entry.key), entry.value.toDoubleBits());
}
//used as a special value for any environmental solid block
put("@solid", Blocks.stoneWall);
for(UnitType type : Vars.content.units()){
put("@" + type.name, type);
}

4
core/src/mindustry/logic/LExecutor.java
View File

@@ -428,9 +428,7 @@ public class LExecutor{
p4.setobj(null);
p5.setobj(null);
}else{
//any environmental solid block is returned as StoneWall, aka "@solid"
Block block = !tile.synthetic() ? (tile.solid() ? Blocks.stoneWall : Blocks.air) : tile.block();
p3.setobj(block);
p3.setobj(tile.block());
p4.setobj(tile.build != null ? tile.build : null);
//Allows reading of ore tiles if they are present (overlay is not air) otherwise returns the floor
p5.setobj(tile.overlay() == Blocks.air ? tile.floor() : tile.overlay());