Fix item_handler_automation capability getting ignored in certain cases

neoforged · May 23, 2024 · d9276f0 · d9276f0
1 parent 7c6475b
commit d9276f0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/net/neoforged/neoforge/items/VanillaInventoryCodeHooks.java b/src/main/java/net/neoforged/neoforge/items/VanillaInventoryCodeHooks.java
@@ -209,8 +209,13 @@ private static Optional<Pair<IItemHandler, Object>> getItemHandlerAt(Level world
         // Note: the isAlive check matches what vanilla does for hoppers in EntitySelector.CONTAINER_ENTITY_SELECTOR
         List<Entity> list = worldIn.getEntities((Entity) null, new AABB(x - 0.5D, y - 0.5D, z - 0.5D, x + 0.5D, y + 0.5D, z + 0.5D), EntitySelector.ENTITY_STILL_ALIVE);
         if (!list.isEmpty()) {
-            var entity = list.get(worldIn.random.nextInt(list.size()));
-            var entityCap = entity.getCapability(Capabilities.ItemHandler.ENTITY_AUTOMATION, side);
+            Entity entity;
+            IItemHandler entityCap;
+            do {
+                entity = list.remove(worldIn.random.nextInt(list.size()));
+                entityCap = entity.getCapability(Capabilities.ItemHandler.ENTITY_AUTOMATION, side);
+            }
+            while (entityCap != null && !list.isEmpty());
             if (entityCap != null)
                 return Optional.of(ImmutablePair.of(entityCap, entity));
         }