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

Removing Nulls.unit

Browse Source
This commit is contained in:
Anuken
2024-07-10 15:54:46 -04:00
parent e3ba8b714b
commit 295573142f
12 changed files with 106 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/io/TypeIO.java
View File

@@ -279,7 +279,7 @@ public class TypeIO{
}
public static void writeUnit(Writes write, Unit unit){
write.b(unit == null || unit.isNull() ? 0 : unit instanceof BlockUnitc ? 1 : 2);
write.b(unit == null ? 0 : unit instanceof BlockUnitc ? 1 : 2);
//block units are special
if(unit instanceof BlockUnitc){
@@ -295,15 +295,14 @@ public class TypeIO{
byte type = read.b();
int id = read.i();
//nothing
if(type == 0) return Nulls.unit;
if(type == 0) return null;
if(type == 2){ //standard unit
Unit unit = Groups.unit.getByID(id);
return unit == null ? Nulls.unit : unit;
return Groups.unit.getByID(id);
}else if(type == 1){ //block
Building tile = world.build(id);
return tile instanceof ControlBlock cont ? cont.unit() : Nulls.unit;
return tile instanceof ControlBlock cont ? cont.unit() : null;
}
return Nulls.unit;
return null;
}
public static void writeCommand(Writes write, @Nullable UnitCommand command){