lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More null stack fixes

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-02-19 16:06:29 -08:00
parent c682571be0
commit 5475549c18
10 changed files with 49 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java
View file

@ -17,15 +17,13 @@ public class InventoryHolding extends ItemInventory
public InventoryHolding(ItemStack itemStack)
{
super(itemStack, ItemSigilHolding.inventorySize, "SigilOfHolding");
// readFromNBT(itemStack.getTagCompound());
}
public void onGuiSaved(EntityPlayer entityPlayer)
{
masterStack = findParentStack(entityPlayer);
if (masterStack != null)
if (!masterStack.isEmpty())
{
save();
}
@ -50,7 +48,7 @@ public class InventoryHolding extends ItemInventory
}
}
return null;
return ItemStack.EMPTY;
}
public void save()

6
src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java
View file

@ -25,7 +25,7 @@ public class ItemInventory implements IInventory
this.name = name;
this.masterStack = masterStack;
if (masterStack != null)
if (!masterStack.isEmpty())
this.readFromStack(masterStack);
}
@ -150,13 +150,13 @@ public class ItemInventory implements IInventory
@Override
public ItemStack removeStackFromSlot(int slot)
{
if (inventory[slot] != null)
if (!inventory[slot].isEmpty())
{
ItemStack itemStack = inventory[slot];
setInventorySlotContents(slot, ItemStack.EMPTY);
return itemStack;
}
return null;
return ItemStack.EMPTY;
}
@Override