Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
makeo committed 2015-12-18 19:56:53 +01:00
commit f95ba99b35
1 file changed
+2
@@ -131,6 +131,8 @@ public class TileArcaneDropper extends TileEntity implements IInventory, ISidedI
public ItemStack getStackInSlot(int slot) {
updateInventory();
if(slot >= items.size()) return null; //Get rekt. nothing here on this slot.
EntityItem entity = items.get(slot);
return entity == null || entity.isDead ? null : entity.getEntityItem();
}