To account for Forge events cancelling entity spawning, we remove rea…

…cting to the return value of Level#addFreshEntity
AppliedEnergistics · Oct 1, 2023 · a749b44 · a749b44
1 parent 88cfab6
commit a749b44
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/src/main/java/appeng/parts/automation/ItemPlacementStrategy.java b/src/main/java/appeng/parts/automation/ItemPlacementStrategy.java
@@ -76,11 +76,7 @@ public final long placeInWorld(AEKey what, long amount, Actionable type, boolean
 
                     if (type == Actionable.MODULATE) {
                         is.setCount(maxStorage);
-                        if (!spawnItemEntity(level, host, side, is)) {
-                            // revert in case something prevents spawning.
-                            worked = false;
-                        }
-
+                        spawnItemEntity(level, host, side, is);
                     }
                 }
             } else {
@@ -123,7 +119,7 @@ public final long placeInWorld(AEKey what, long amount, Actionable type, boolean
         return 0;
     }
 
-    private static boolean spawnItemEntity(Level level, BlockEntity te, Direction side, ItemStack is) {
+    private static void spawnItemEntity(Level level, BlockEntity te, Direction side, ItemStack is) {
         // The center of the block the plane is located in
         final var centerX = te.getBlockPos().getX() + .5;
         final double centerY = te.getBlockPos().getY();
@@ -166,12 +162,11 @@ private static boolean spawnItemEntity(Level level, BlockEntity te, Direction si
         entity.setPos(absoluteX, absoluteY, absoluteZ);
         entity.setDeltaMovement(side.getStepX() * .1, side.getStepY() * 0.1, side.getStepZ() * 0.1);
 
-        // Try to spawn it and destroy it in case it's not possible
-        if (!level.addFreshEntity(entity)) {
-            entity.discard();
-            return false;
-        }
-        return true;
+        // NOTE: Vanilla generally ignores the return-value of this method when spawning items into the world
+        // Forge will return false when the embedded event is canceled, but the event canceller is responsible
+        // for cleaning up the entity in that case, so we should always assume our spawning was successful,
+        // and consume items...
+        level.addFreshEntity(entity);
     }
 
     private int countEntitesAround(Level level, BlockPos pos) {