Updated Upstream (CraftBukkit) (#5607)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
e1a6197e SPIGOT-5565: Animals still spawn from chunk gen when spawn-animals=false

Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch

@@ -119,12 +119,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import net.minecraft.world.level.chunk.ChunkConverter;
  import net.minecraft.world.level.chunk.ChunkGenerator;
 @@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-                             // CraftBukkit start - these are spawned serialized (DefinedStructure) and we don't call an add event below at the moment due to ordering complexities
+                             if (chunk.needsDecoration) {
-                             boolean needsRemoval = false;
+                                 net.minecraft.server.dedicated.DedicatedServer server = this.world.getServer().getServer();
-                             if (chunk.needsDecoration && !this.world.getServer().getServer().getSpawnNPCs() && entity instanceof net.minecraft.world.entity.npc.NPC) {
+                                 if (!server.getSpawnNPCs() && entity instanceof net.minecraft.world.entity.npc.NPC) {
--                                entity.die();
+-                                    entity.die();
-+                                entity.dead = true; // Paper
++                                    entity.dead = true; // Paper
-                                 needsRemoval = true;
+                                     needsRemoval = true;
+                                 }
+ 
+                                 if (!server.getSpawnAnimals() && (entity instanceof net.minecraft.world.entity.animal.EntityAnimal || entity instanceof net.minecraft.world.entity.animal.EntityWaterAnimal)) {
+-                                    entity.die();
++                                    entity.dead = true; // Paper
+                                     needsRemoval = true;
+                                 }
                              }
 -
 -                            if (!(entity instanceof EntityHuman) && (needsRemoval || !this.world.addEntityChunk(entity))) {