Skip to content

Commit 9574883

Browse files
committed
prevent fallbackItemCollector race condition on client thread (#8189)
1 parent e82cc2d commit 9574883

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/main/java/mekanism/common/CommonWorldTickHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void onEntitySpawn(EntityJoinLevelEvent event) {
9090
entity.discard();
9191
event.setCanceled(true);
9292
}
93-
} else if (fallbackItemCollector != null && event.getEntity() instanceof ItemEntity entity && fallbackItemCollector.test(entity.getItem())) {
93+
} else if (!event.getLevel().isClientSide && fallbackItemCollector != null && event.getEntity() instanceof ItemEntity entity && fallbackItemCollector.test(entity.getItem())) {
9494
//If we have a fallback item collector active and the entity that is being added is an item,
9595
// try to let our fallback collector handle the item and keep track of it instead of actually adding it to the world
9696
entity.discard();

0 commit comments

Comments
 (0)