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

Some minor IO null checks

Browse Source
This commit is contained in:
Anuken
2022-06-12 09:22:06 -04:00
parent 7ac2645a63
commit 8f4a5c3572
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/modules/ItemModule.java
+5 -2
View File
@@ -336,8 +336,11 @@ public class ItemModule extends BlockModule{
for(int j = 0; j < count; j++){ for(int j = 0; j < count; j++){
int itemid = legacy ? read.ub() : read.s(); int itemid = legacy ? read.ub() : read.s();
int itemamount = read.i(); int itemamount = read.i();
items[content.item(itemid).id] = itemamount; Item item = content.item(itemid);
total += itemamount; if(item != null){
items[item.id] = itemamount;
total += itemamount;
}
} }
} }
core/src/mindustry/world/modules/LiquidModule.java
+6 -4
View File
@@ -162,11 +162,13 @@ public class LiquidModule extends BlockModule{
for(int j = 0; j < count; j++){ for(int j = 0; j < count; j++){
Liquid liq = content.liquid(legacy ? read.ub() : read.s()); Liquid liq = content.liquid(legacy ? read.ub() : read.s());
int liquidid = liq.id;
float amount = read.f(); float amount = read.f();
liquids[liquidid] = amount; if(liq != null){
if(amount > 0){ int liquidid = liq.id;
current = liq; liquids[liquidid] = amount;
if(amount > 0){
current = liq;
}
} }
} }
} }