Paper-Old/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch

From 15089fad66207986bd6e4c8d5c13e2703257c2f9 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Wed, 21 Aug 2019 23:57:32 +0500
Subject: [PATCH] only add passanger entities once from spawners


diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 41001b02a6..df494d37be 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract {
     }
 
     private void a(Entity entity) {
-        if (this.a().addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
+        if (entity.valid || this.a().addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit // Paper
             Iterator iterator = entity.getPassengers().iterator();
 
             while (iterator.hasNext()) {
-- 
2.25.1
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current 2020-04-02 23:07:06 +02:00			`From 15089fad66207986bd6e4c8d5c13e2703257c2f9 Mon Sep 17 00:00:00 2001`
fix double world add bug (#2486) 2019-09-02 18:46:04 +02:00			`From: kickash32 <kickash32@gmail.com>`
			`Date: Wed, 21 Aug 2019 23:57:32 +0500`
			`Subject: [PATCH] only add passanger entities once from spawners`


			`diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current 2020-04-02 23:07:06 +02:00			`index 41001b02a6..df494d37be 100644`
fix double world add bug (#2486) 2019-09-02 18:46:04 +02:00			`--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java`
			`+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes: fba9f487 Improve legacy conversion of some materials that changed post flattening b1ba8749 Move Bukkit.Aware loading/saving to correct location f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles 689f429c #634: Cross platform patch scripts ab85433d Add set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches 2020-02-21 18:52:20 +01:00			`@@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract {`
fix double world add bug (#2486) 2019-09-02 18:46:04 +02:00			`}`

			`private void a(Entity entity) {`
			`- if (this.a().addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit`
			`+ if (entity.valid \|\| this.a().addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit // Paper`
			`Iterator iterator = entity.getPassengers().iterator();`

			`while (iterator.hasNext()) {`
			`--`
Drop Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch This patch appears to be no longer relevant, and is seemingly a leading cause of datapack performance being horrific 2020-03-15 21:03:36 +01:00			`2.25.1`
fix double world add bug (#2486) 2019-09-02 18:46:04 +02:00