Some minor IO null checks
This commit is contained in:
@@ -336,10 +336,13 @@ 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);
|
||||||
|
if(item != null){
|
||||||
|
items[item.id] = itemamount;
|
||||||
total += itemamount;
|
total += itemamount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public interface ItemConsumer{
|
public interface ItemConsumer{
|
||||||
void accept(Item item, int amount);
|
void accept(Item item, int amount);
|
||||||
|
|||||||
@@ -162,14 +162,16 @@ 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();
|
||||||
|
if(liq != null){
|
||||||
|
int liquidid = liq.id;
|
||||||
liquids[liquidid] = amount;
|
liquids[liquidid] = amount;
|
||||||
if(amount > 0){
|
if(amount > 0){
|
||||||
current = liq;
|
current = liq;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public interface LiquidConsumer{
|
public interface LiquidConsumer{
|
||||||
void accept(Liquid liquid, float amount);
|
void accept(Liquid liquid, float amount);
|
||||||
|
|||||||
Reference in New Issue
Block a user