Add for 1.21.9/10, set events=false for later paper versions

dordsor21 · dordsor21 · commit 2e42c2dbc93c · 2025-11-30T19:50:30.000Z
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
@@ -677,7 +677,7 @@ protected <T extends Future<T>> T internalCall(
                                     entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
                                     entity.generation = false;
                                     if (PaperLib.isPaper()) {
-                                        if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
+                                        if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity, false)) {
                                             onError.run();
                                         }
                                         continue;
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
@@ -677,7 +677,7 @@ protected <T extends Future<T>> T internalCall(
                                     entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
                                     entity.generation = false;
                                     if (PaperLib.isPaper()) {
-                                        if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
+                                        if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity, false)) {
                                             onError.run();
                                         }
                                         continue;
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
@@ -683,7 +683,7 @@ protected <T extends Future<T>> T internalCall(
                                     entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
                                     entity.generation = false;
                                     if (PaperLib.isPaper()) {
-                                        if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
+                                        if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity, false)) {
                                             onError.run();
                                         }
                                         continue;
diff --git a/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_9/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_9/PaperweightAdapter.java
@@ -871,12 +871,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_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightFaweAdapter.java
@@ -336,7 +336,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_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightGetBlocks.java
@@ -332,11 +332,11 @@ public CompletableFuture<LevelChunk> ensureLoaded(ServerLevel nmsWorld) {
 
     @Override
     protected <T extends Future<T>> T internalCall(
-            IChunkSet set,
-            Runnable finalizer,
-            int copyKey,
-            LevelChunk nmsChunk,
-            ServerLevel nmsWorld
+            final IChunkSet set,
+            final Runnable finalizer,
+            final int copyKey,
+            final LevelChunk nmsChunk,
+            final ServerLevel nmsWorld
     ) throws Exception {
         PaperweightGetBlocks_Copy copy = createCopy ? new PaperweightGetBlocks_Copy(nmsChunk) : null;
         if (createCopy) {
@@ -672,15 +672,34 @@ protected <T extends Future<T>> T internalCall(
                                 entity.load(input);
                                 entity.absSnapTo(x, y, z, yaw, pitch);
                                 entity.setUUID(NbtUtils.uuid(nativeTag));
+                                Runnable onError = () -> LOGGER.warn(
+                                        "Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
+                                        id,
+                                        nmsWorld.getWorld().getName(),
+                                        x,
+                                        y,
+                                        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, false)) {
+                                            onError.run();
+                                        }
+                                        continue;
+                                    }
+                                    // Not paper
+                                    try {
+                                        PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
+                                        continue;
+                                    } catch (IllegalAccessException e) {
+                                        // Fallback
+                                        LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
+                                    }
+                                }
                                 if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
-                                    LOGGER.warn(
-                                            "Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
-                                            id,
-                                            nmsWorld.getWorld().getName(),
-                                            x,
-                                            y,
-                                            z
-                                    );
+                                    onError.run();
                                     // Unsuccessful create should not be saved to history
                                     iterator.remove();
                                 }
diff --git a/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightPlatformAdapter.java
@@ -635,10 +635,18 @@ static List<Entity> getEntities(LevelChunk chunk) {
         }
         try {
             //noinspection unchecked
-            return ((PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(chunk.level))).getEntities(chunk.getPos());
+            return getEntitySectionManager(chunk.level).getEntities(chunk.getPos());
         } catch (IllegalAccessException e) {
             throw new RuntimeException("Failed to lookup entities [PAPER=false]", e);
         }
     }
 
+    /**
+     * Spigot only
+     */
+    static PersistentEntitySectionManager<Entity> getEntitySectionManager(ServerLevel level) throws IllegalAccessException {
+        //noinspection unchecked
+        return (PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(level));
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ protected <T extends Future<T>> T internalCall(`
`677`	`677`	`entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;`
`678`	`678`	`entity.generation = false;`
`679`	`679`	`if (PaperLib.isPaper()) {`
`680`		`- if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {`
	`680`	`+ if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity, false)) {`
`681`	`681`	`onError.run();`
`682`	`682`	`}`
`683`	`683`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ protected <T extends Future<T>> T internalCall(`
`683`	`683`	`entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;`
`684`	`684`	`entity.generation = false;`
`685`	`685`	`if (PaperLib.isPaper()) {`
`686`		`- if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {`
	`686`	`+ if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity, false)) {`
`687`	`687`	`onError.run();`
`688`	`688`	`}`
`689`	`689`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -635,10 +635,18 @@ static List<Entity> getEntities(LevelChunk chunk) {`
`635`	`635`	`}`
`636`	`636`	`try {`
`637`	`637`	`//noinspection unchecked`
`638`		`- return ((PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(chunk.level))).getEntities(chunk.getPos());`
	`638`	`+ return getEntitySectionManager(chunk.level).getEntities(chunk.getPos());`
`639`	`639`	`} catch (IllegalAccessException e) {`
`640`	`640`	`throw new RuntimeException("Failed to lookup entities [PAPER=false]", e);`
`641`	`641`	`}`
`642`	`642`	`}`
`643`	`643`
	`644`	`+ /**`
	`645`	`+ * Spigot only`
	`646`	`+ */`
	`647`	`+ static PersistentEntitySectionManager<Entity> getEntitySectionManager(ServerLevel level) throws IllegalAccessException {`
	`648`	`+ //noinspection unchecked`
	`649`	`+ return (PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(level));`
	`650`	`+ }`
	`651`	`+`
`644`	`652`	`}`