prevent fallbackItemCollector race condition on client thread (#8189)

mekanism · Aug 19, 2024 · 9574883 · 9574883
1 parent e82cc2d
commit 9574883
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java
@@ -90,7 +90,7 @@ public void onEntitySpawn(EntityJoinLevelEvent event) {
                 entity.discard();
                 event.setCanceled(true);
             }
-        } else if (fallbackItemCollector != null && event.getEntity() instanceof ItemEntity entity && fallbackItemCollector.test(entity.getItem())) {
+        } else if (!event.getLevel().isClientSide && fallbackItemCollector != null && event.getEntity() instanceof ItemEntity entity && fallbackItemCollector.test(entity.getItem())) {
             //If we have a fallback item collector active and the entity that is being added is an item,
             // try to let our fallback collector handle the item and keep track of it instead of actually adding it to the world
             entity.discard();