Skip to content

Commit 23378b2

Browse files
committed
Replaced null checks with empty itemstack checks.
Due to these objects being wrapped into a BukkitMCItemStack, they are never null. So check for empty item stacks instead.
1 parent 5d055bf commit 23378b2

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/main/java/com/laytonsmith/core/ObjectGenerator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -406,19 +406,19 @@ public Construct itemMeta(MCItemStack is, Target t) {
406406
ma.set("fuel", new CInt(brewStand.getFuelLevel(), t), t);
407407
MCBrewerInventory inv = brewStand.getInventory();
408408
CArray invData = CArray.GetAssociativeArray(t);
409-
if(inv.getFuel() != null) {
409+
if(inv.getFuel().getAmount() != 0) {
410410
invData.set("fuel", ObjectGenerator.GetGenerator().item(inv.getFuel(), t), t);
411411
}
412-
if(inv.getIngredient() != null) {
412+
if(inv.getIngredient().getAmount() != 0) {
413413
invData.set("ingredient", ObjectGenerator.GetGenerator().item(inv.getIngredient(), t), t);
414414
}
415-
if(inv.getLeftBottle() != null) {
415+
if(inv.getLeftBottle().getAmount() != 0) {
416416
invData.set("leftbottle", ObjectGenerator.GetGenerator().item(inv.getLeftBottle(), t), t);
417417
}
418-
if(inv.getMiddleBottle() != null) {
418+
if(inv.getMiddleBottle().getAmount() != 0) {
419419
invData.set("middlebottle", ObjectGenerator.GetGenerator().item(inv.getMiddleBottle(), t), t);
420420
}
421-
if(inv.getRightBottle() != null) {
421+
if(inv.getRightBottle().getAmount() != 0) {
422422
invData.set("rightbottle", ObjectGenerator.GetGenerator().item(inv.getRightBottle(), t), t);
423423
}
424424
ma.set("inventory", invData, t);
@@ -428,13 +428,13 @@ public Construct itemMeta(MCItemStack is, Target t) {
428428
ma.set("cooktime", new CInt(furnace.getCookTime(), t), t);
429429
MCFurnaceInventory inv = furnace.getInventory();
430430
CArray invData = CArray.GetAssociativeArray(t);
431-
if(inv.getResult() != null) {
431+
if(inv.getResult().getAmount() != 0) {
432432
invData.set("result", ObjectGenerator.GetGenerator().item(inv.getResult(), t), t);
433433
}
434-
if(inv.getFuel() != null) {
434+
if(inv.getFuel().getAmount() != 0) {
435435
invData.set("fuel", ObjectGenerator.GetGenerator().item(inv.getFuel(), t), t);
436436
}
437-
if(inv.getSmelting() != null) {
437+
if(inv.getSmelting().getAmount() != 0) {
438438
invData.set("smelting", ObjectGenerator.GetGenerator().item(inv.getSmelting(), t), t);
439439
}
440440
ma.set("inventory", invData, t);

0 commit comments

Comments
 (0)