avoid ticking empty item states, closes #50

TheIllusiveC4 · May 31, 2020 · 47ba6c7 · 47ba6c7
1 parent 6d904e2
commit 47ba6c7
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/top/theillusivec4/curios/common/event/EventHandlerCurios.java b/src/main/java/top/theillusivec4/curios/common/event/EventHandlerCurios.java
@@ -304,16 +304,19 @@ public void onCurioTick(LivingEvent.LivingUpdateEvent evt) {
 
         for (int i = 0; i < stackHandler.getSlots(); i++) {
           ItemStack stack = stackHandler.getStackInSlot(i);
-          stack.inventoryTick(entitylivingbase.world, entitylivingbase, -1, false);
           LazyOptional<ICurio> currentCurio = CuriosAPI.getCurio(stack);
           final int index = i;
-          currentCurio.ifPresent(curio -> {
-            curio.onCurioTick(identifier, index, entitylivingbase);
 
-            if (entitylivingbase.world.isRemote) {
-              curio.onCurioAnimate(identifier, index, entitylivingbase);
-            }
-          });
+          if (!stack.isEmpty()) {
+            stack.inventoryTick(entitylivingbase.world, entitylivingbase, -1, false);
+            currentCurio.ifPresent(curio -> {
+              curio.onCurioTick(identifier, index, entitylivingbase);
+
+              if (entitylivingbase.world.isRemote) {
+                curio.onCurioAnimate(identifier, index, entitylivingbase);
+              }
+            });
+          }
 
           if (!entitylivingbase.world.isRemote) {
             ItemStack prevStack = stackHandler.getPreviousStackInSlot(i);