Fixes for #6 Server Crash When Rotting to Null (may not be complete fix)

Stormwind99 · Jun 28, 2018 · 0e228e7 · 0e228e7
1 parent 4b24385
commit 0e228e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/java/com/wumple/foodfunk/EventManager.java b/src/java/com/wumple/foodfunk/EventManager.java
@@ -62,7 +62,7 @@ public static void onPlayerInteract(PlayerInteractEvent event)
 		{
 			TileEntity tile = event.getEntityPlayer().world.getTileEntity(event.getPos());
 
-			if(tile != null & tile instanceof IInventory)
+			if ((tile != null) && (tile instanceof IInventory))
 			{
 				RotHandler.rotInvo(event.getEntityPlayer().world, (IInventory)tile);
 			}

diff --git a/src/java/com/wumple/foodfunk/RotHandler.java b/src/java/com/wumple/foodfunk/RotHandler.java
@@ -57,7 +57,7 @@ private static ItemStack forceRot(ItemStack stack, String rotID)
 
 		Item item = Item.REGISTRY.getObject(new ResourceLocation(rotID));
 
-		return item == null ? null : new ItemStack(item, stack.getCount()); // , meta);
+		return item == null ? ItemStack.EMPTY : new ItemStack(item, stack.getCount()); // , meta);
 	}
 
 	/*
@@ -134,6 +134,10 @@ public static void rotInvo(World world, IInventory inventory)
 
 					if(rotItem == null || rotItem.isEmpty() || (rotItem.getItem() != slotItem.getItem()))
 					{
+						if (rotItem == null)
+						{
+							rotItem = ItemStack.EMPTY;
+						}
 						inventory.setInventorySlotContents(i, rotItem);
 						flag = true;
 					}