Adjustments

dordsor21 · dordsor21 · commit 57753dd46a26 · 2025-08-09T08:57:38.000+01:00
diff --git a/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
@@ -863,7 +863,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
             //FAWE end
     );
 
diff --git a/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java
@@ -309,7 +309,8 @@ public BaseBlock getFullBlock(final Location location) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java
@@ -690,16 +690,18 @@ protected <T extends Future<T>> T internalCall(
                                         z
                                 );
                                 if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
+                                    entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
+                                    entity.generation = false;
                                     if (PaperLib.isPaper()) {
                                         if (!nmsWorld.getEntityLookup().addNewEntity(entity)) {
                                             onError.run();
                                         }
-                                        return;
+                                        continue;
                                     }
                                     // Not paper
                                     try {
                                         PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
-                                        return;
+                                        continue;
                                     } catch (IllegalAccessException e) {
                                         // Fallback
                                         LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
diff --git a/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R3/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R3/PaperweightAdapter.java
@@ -862,7 +862,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
             //FAWE end
     );
 
diff --git a/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java
@@ -308,7 +308,8 @@ public BaseBlock getFullBlock(final Location location) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java
@@ -691,16 +691,18 @@ protected <T extends Future<T>> T internalCall(
                                         z
                                 );
                                 if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
+                                    entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
+                                    entity.generation = false;
                                     if (PaperLib.isPaper()) {
                                         if (!nmsWorld.getEntityLookup().addNewEntity(entity)) {
                                             onError.run();
                                         }
-                                        return;
+                                        continue;
                                     }
                                     // Not paper
                                     try {
                                         PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
-                                        return;
+                                        continue;
                                     } catch (IllegalAccessException e) {
                                         // Fallback
                                         LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
diff --git a/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java
@@ -886,7 +886,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
             //FAWE end
     );
 
diff --git a/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java
@@ -317,7 +317,8 @@ public BaseBlock getFullBlock(final Location location) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java
@@ -692,16 +692,18 @@ protected <T extends Future<T>> T internalCall(
                                         z
                                 );
                                 if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
+                                    entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
+                                    entity.generation = false;
                                     if (PaperLib.isPaper()) {
                                         if (!nmsWorld.getEntityLookup().addNewEntity(entity)) {
                                             onError.run();
                                         }
-                                        return;
+                                        continue;
                                     }
                                     // Not paper
                                     try {
                                         PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
-                                        return;
+                                        continue;
                                     } catch (IllegalAccessException e) {
                                         // Fallback
                                         LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
diff --git a/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_R1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_R1/PaperweightAdapter.java
@@ -887,7 +887,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
             //FAWE end
     );
 
diff --git a/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightFaweAdapter.java
@@ -317,7 +317,8 @@ public BaseBlock getFullBlock(final Location location) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java
@@ -689,16 +689,18 @@ protected <T extends Future<T>> T internalCall(
                                         z
                                 );
                                 if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
+                                    entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
+                                    entity.generation = false;
                                     if (PaperLib.isPaper()) {
                                         if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
                                             onError.run();
                                         }
-                                        return;
+                                        continue;
                                     }
                                     // Not paper
                                     try {
                                         PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
-                                        return;
+                                        continue;
                                     } catch (IllegalAccessException e) {
                                         // Fallback
                                         LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_4/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_4/PaperweightAdapter.java
@@ -843,7 +843,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
             //FAWE end
     );
 
diff --git a/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightFaweAdapter.java
@@ -303,7 +303,8 @@ public BaseBlock getFullBlock(final Location location) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightGetBlocks.java
@@ -685,16 +685,18 @@ protected <T extends Future<T>> T internalCall(
                                         z
                                 );
                                 if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
+                                    entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
+                                    entity.generation = false;
                                     if (PaperLib.isPaper()) {
                                         if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
                                             onError.run();
                                         }
-                                        return;
+                                        continue;
                                     }
                                     // Not paper
                                     try {
                                         PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
-                                        return;
+                                        continue;
                                     } catch (IllegalAccessException e) {
                                         // Fallback
                                         LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_5/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_5/PaperweightAdapter.java
@@ -832,12 +832,13 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
     }
 
     private static final Set<SideEffect> SUPPORTED_SIDE_EFFECTS = Sets.immutableEnumSet(
-        SideEffect.NEIGHBORS,
+        //FAWE start - FAWE-supported side effects
+        SideEffect.HISTORY,
+        SideEffect.HEIGHTMAPS,
         SideEffect.LIGHTING,
-        SideEffect.VALIDATION,
-        SideEffect.ENTITY_AI,
-        SideEffect.EVENTS,
-        SideEffect.UPDATE
+        SideEffect.NEIGHBORS,
+        SideEffect.ENTITY_EVENTS
+        //FAWE end
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightFaweAdapter.java
@@ -300,10 +300,11 @@ public BaseBlock getFullBlock(final Location location) {
     }
 
     private static final Set<SideEffect> SUPPORTED_SIDE_EFFECTS = Sets.immutableEnumSet(
-            SideEffect.HISTORY,
-            SideEffect.HEIGHTMAPS,
-            SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+        SideEffect.HISTORY,
+        SideEffect.HEIGHTMAPS,
+        SideEffect.LIGHTING,
+        SideEffect.NEIGHBORS,
+        SideEffect.ENTITY_EVENTS
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightGetBlocks.java
@@ -685,16 +685,18 @@ protected <T extends Future<T>> T internalCall(
                                         z
                                 );
                                 if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
+                                    entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
+                                    entity.generation = false;
                                     if (PaperLib.isPaper()) {
                                         if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
                                             onError.run();
                                         }
-                                        return;
+                                        continue;
                                     }
                                     // Not paper
                                     try {
                                         PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
-                                        return;
+                                        continue;
                                     } catch (IllegalAccessException e) {
                                         // Fallback
                                         LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_6/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_6/PaperweightAdapter.java
@@ -861,12 +861,13 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
     }
 
     private static final Set<SideEffect> SUPPORTED_SIDE_EFFECTS = Sets.immutableEnumSet(
-        SideEffect.NEIGHBORS,
+        //FAWE start - FAWE-supported side effects
+        SideEffect.HISTORY,
+        SideEffect.HEIGHTMAPS,
         SideEffect.LIGHTING,
-        SideEffect.VALIDATION,
-        SideEffect.ENTITY_AI,
-        SideEffect.EVENTS,
-        SideEffect.UPDATE
+        SideEffect.NEIGHBORS,
+        SideEffect.ENTITY_EVENTS
+        //FAWE end
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightFaweAdapter.java
@@ -313,7 +313,8 @@ public BaseBlock getFullBlock(final Location location) {
             SideEffect.HISTORY,
             SideEffect.HEIGHTMAPS,
             SideEffect.LIGHTING,
-            SideEffect.NEIGHBORS
+            SideEffect.NEIGHBORS,
+            SideEffect.ENTITY_EVENTS
     );
 
     @Override
diff --git a/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightGetBlocks.java
@@ -691,16 +691,18 @@ protected <T extends Future<T>> T internalCall(
                                         z
                                 );
                                 if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
+                                    entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
+                                    entity.generation = false;
                                     if (PaperLib.isPaper()) {
                                         if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
                                             onError.run();
                                         }
-                                        return;
+                                        continue;
                                     }
                                     // Not paper
                                     try {
                                         PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
-                                        return;
+                                        continue;
                                     } catch (IllegalAccessException e) {
                                         // Fallback
                                         LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java
@@ -200,7 +200,7 @@ public FaweLimit getLimit(Actor actor) {
                 }
                 limit.UNIVERSAL_DISALLOWED_BLOCKS &= newLimit.UNIVERSAL_DISALLOWED_BLOCKS;
                 limit.ALLOW_LEGACY &= newLimit.ALLOW_LEGACY;
-                limit.SKIP_ENTITY_SPAWN_EVENTS |= newLimit.SKIP_ENTITY_SPAWN_EVENTS;
+                limit.SKIP_ENTITY_SPAWN_EVENTS |= newLimit.SKIP_CREATURE_SPAWN_EVENTS;
 
                 if (limit.DISALLOWED_BLOCKS == null) {
                     limit.DISALLOWED_BLOCKS = newLimit.DISALLOWED_BLOCKS.isEmpty() ? Collections.emptySet() : new HashSet<>(
@@ -464,11 +464,11 @@ public static class LIMITS extends ConfigBlock {
         })
         public boolean ALLOW_LEGACY = true;
         @Comment({
-                "If sending entity spawn events should be skipped upon creation.",
+                "If sending creature spawn events should be skipped upon creation.",
                 " - Will not work when setting entities directly to a world, rather than using an EditSession(Builder)",
                 " - Setting fast-placement to false forces writing directly to the world (for example)."
         })
-        public boolean SKIP_ENTITY_SPAWN_EVENTS = true;
+        public boolean SKIP_CREATURE_SPAWN_EVENTS = false;
         @Comment({
                 "List of blocks to deny use of. Can be either an entire block type or a block with a specific property value.",
                 "Where block properties are specified, any blockstate with the property will be disallowed (e.g. all directions",
@@ -866,6 +866,11 @@ public static class GENERAL {
         })
         public boolean LIMIT_UNLIMITED_CONFIRMS = true;
 
+        @Comment({
+                "If unlimited limits should skip sending creature spawn events. Using //fast will still disable spawn events."
+        })
+        public boolean LIMIT_UNLIMITED_SKIPS_CREATURE_SPAWN_EVENTS = true;
+
     }
 
 }
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/limit/FaweLimit.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/limit/FaweLimit.java
@@ -132,6 +132,7 @@ public void THROW_MAX_ENTITIES(int amt) {
         MAX.STRIP_NBT = Collections.emptySet();
         MAX.UNIVERSAL_DISALLOWED_BLOCKS = false;
         MAX.ALLOW_LEGACY = true;
+        MAX.SKIP_ENTITY_SPAWN_EVENTS = Settings.settings().GENERAL.LIMIT_UNLIMITED_SKIPS_CREATURE_SPAWN_EVENTS;
         MAX.DISALLOWED_BLOCKS = Collections.emptySet();
         MAX.REMAP_PROPERTIES = Collections.emptySet();
         MAX.MAX_RADIUS = Integer.MAX_VALUE;
@@ -289,7 +290,7 @@ public boolean isUnlimited() {
                 && (STRIP_NBT == null || STRIP_NBT.isEmpty())
                 // && !UNIVERSAL_DISALLOWED_BLOCKS --> do not include this, it effectively has no relevance
                 && ALLOW_LEGACY
-                && SKIP_ENTITY_SPAWN_EVENTS
+                // && SKIP_ENTITY_SPAWN_EVENTS --> do not include as it can be false for unlimited anyway
                 && (DISALLOWED_BLOCKS == null || DISALLOWED_BLOCKS.isEmpty())
                 && (REMAP_PROPERTIES == null || REMAP_PROPERTIES.isEmpty())
                 && MAX_RADIUS == Integer.MAX_VALUE
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java
@@ -463,17 +463,21 @@ public EditSessionBuilder compile() {
             // Keep heightmaps to maintain behaviour
             sideEffectSet = fastMode ? SideEffectSet.none().with(SideEffect.HEIGHTMAPS) : SideEffectSet.defaults();
         }
-        sideEffectSet = sideEffectSet.with(
-                SideEffect.ENTITY_EVENTS,
-                fastMode || limit.SKIP_ENTITY_SPAWN_EVENTS ? SideEffect.State.OFF : SideEffect.State.ON
-        );
+        if (!fastMode && actor != null) {
+            sideEffectSet = sideEffectSet.with(
+                    SideEffect.ENTITY_EVENTS,
+                    limit.SKIP_ENTITY_SPAWN_EVENTS ? SideEffect.State.OFF : SideEffect.State.ON
+            );
+        }
         if (checkMemory == null) {
             checkMemory = actor != null && !this.fastMode;
         }
         if (checkMemory) {
             if (MemUtil.isMemoryLimitedSlow()) {
-                if (Permission.hasPermission(actor, "worldedit.fast")) {
+                if (actor != null && Permission.hasPermission(actor, "worldedit.fast")) {
                     actor.print(Caption.of("fawe.info.worldedit.oom.admin"));
+                } else {
+                    LOGGER.warn("Low memory");
                 }
                 throw FaweCache.LOW_MEMORY;
             }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffect.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffect.java
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java
