Make spawning more accurately track vanilla (#12627)

Author: Machine-Maker

paper-api/src/main/java/org/bukkit/World.java

@@ -2675,11 +2675,14 @@ default <T> void playEffect(@NotNull Location location, @NotNull Effect effect,
 
     /**
      * Sets the spawn flags for this.
+     * <p>Note that setting {@code false} for either only affects
+     * natural spawning. It doesn't affect spawn eggs, summon command, mobs
+     * spawned from structure generation, spawners, etc.</p>
      *
      * @param allowMonsters - if true, monsters are allowed to spawn in this
-     *     world.
+     *     world via natural spawning mechanisms.
      * @param allowAnimals - if true, animals are allowed to spawn in this
-     *     world.
+     *     world via natural spawning mechanisms.
      */
     public void setSpawnFlags(boolean allowMonsters, boolean allowAnimals);
 

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -32615,7 +32615,7 @@ index f2aa944dedf917f01d669a703a9b9f4f35af78c2..116efc09663cac3b0f4b8c157e93201e
          this.chunkType = chunkType;
          this.heightmapsAfter = heightmapsAfter;
 diff --git a/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java b/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java
-index 2f83f615fb358ef7e6ae915f0bdfbc500407c09a..06e560d9c1deda605e131d0d4da499f90118a3e1 100644
+index 98e85820ac5aad77a003be4b6f7a59346524ae81..d620862e95abf9f098bb53a76825883f2b1f4bbf 100644
 --- a/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java
 +++ b/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java
 @@ -193,7 +193,7 @@ public class ChunkStatusTasks {
@@ -32627,22 +32627,19 @@ index 2f83f615fb358ef7e6ae915f0bdfbc500407c09a..06e560d9c1deda605e131d0d4da499f9
                      }
                  });
                  generationChunkHolder.replaceProtoChunk(new ImposterProtoChunk(wrapped, false));
-@@ -209,7 +209,7 @@ public class ChunkStatusTasks {
+@@ -209,12 +209,12 @@ public class ChunkStatusTasks {
          }, worldGenContext.mainThreadExecutor());
      }
 
 -    public static void postLoadProtoChunk(ServerLevel level, ValueInput.ValueInputList input) {
 +    public static void postLoadProtoChunk(ServerLevel level, ValueInput.ValueInputList input, ChunkPos pos) { // Paper - rewrite chunk system - add ChunkPos param
          if (!input.isEmpty()) {
-             // CraftBukkit start - these are spawned serialized (DefinedStructure) and we don't call an add event below at the moment due to ordering complexities
+             // Paper start - duplicate uuid resolving
              level.addWorldGenChunkEntities(EntityType.loadEntitiesRecursive(input, level, EntitySpawnReason.LOAD).filter((entity) -> {
-@@ -221,7 +221,7 @@ public class ChunkStatusTasks {
-                 }
-                 checkDupeUUID(level, entity); // Paper - duplicate uuid resolving
-                 return !needsRemoval;
+                 return !checkDupeUUID(level, entity);
 -            }));
 +            }), pos); // Paper - rewrite chunk system
-             // CraftBukkit end
+             // Paper end - duplicate uuid resolving
          }
      }
 diff --git a/net/minecraft/world/level/chunk/status/ChunkStep.java b/net/minecraft/world/level/chunk/status/ChunkStep.java

paper-server/patches/sources/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java.patch

@@ -9,25 +9,18 @@
              worldGenContext.generator()
                  .createStructures(
                      serverLevel.registryAccess(),
-@@ -211,7 +_,58 @@
+@@ -211,7 +_,51 @@
 
      public static void postLoadProtoChunk(ServerLevel level, ValueInput.ValueInputList input) {
          if (!input.isEmpty()) {
 -            level.addWorldGenChunkEntities(EntityType.loadEntitiesRecursive(input, level, EntitySpawnReason.LOAD));
 -        }
 -    }
-+            // CraftBukkit start - these are spawned serialized (DefinedStructure) and we don't call an add event below at the moment due to ordering complexities
++            // Paper start - duplicate uuid resolving
 +            level.addWorldGenChunkEntities(EntityType.loadEntitiesRecursive(input, level, EntitySpawnReason.LOAD).filter((entity) -> {
-+                boolean needsRemoval = false;
-+                net.minecraft.server.dedicated.DedicatedServer server = level.getCraftServer().getServer();
-+                if (!level.getChunkSource().spawnFriendlies && (entity instanceof net.minecraft.world.entity.animal.Animal || entity instanceof net.minecraft.world.entity.animal.WaterAnimal)) {
-+                    entity.discard(null); // CraftBukkit - add Bukkit remove cause
-+                    needsRemoval = true;
-+                }
-+                checkDupeUUID(level, entity); // Paper - duplicate uuid resolving
-+                return !needsRemoval;
++                return !checkDupeUUID(level, entity);
 +            }));
-+            // CraftBukkit end
++            // Paper end - duplicate uuid resolving
 +        }
 +    }
 +

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -588,16 +588,6 @@ public static boolean doEntityAddEventCalling(Level world, Entity entity, SpawnR
 
         org.bukkit.event.Cancellable event = null;
         if (entity instanceof net.minecraft.world.entity.LivingEntity && !(entity instanceof ServerPlayer)) {
-            boolean isAnimal = entity instanceof Animal || entity instanceof WaterAnimal || entity instanceof AbstractGolem;
-            boolean isMonster = entity instanceof Monster || entity instanceof Ghast || entity instanceof Slime;
-
-            if (spawnReason != SpawnReason.CUSTOM) {
-                if (isAnimal && !world.getWorld().getAllowAnimals() || isMonster && !world.getWorld().getAllowMonsters()) {
-                    entity.discard(null); // Add Bukkit remove cause
-                    return false;
-                }
-            }
-
             event = CraftEventFactory.callCreatureSpawnEvent((net.minecraft.world.entity.LivingEntity) entity, spawnReason);
         } else if (entity instanceof ItemEntity) {
             event = CraftEventFactory.callItemSpawnEvent((ItemEntity) entity);