From 5064606627f1deed7b6ab82580144d88c05b4bcf Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 4 Jul 2020 19:54:39 -0600 Subject: [PATCH] Incorrect spawn reason for monsters from spawner - Fixes #3708 (#3764) --- .../Entity-getEntitySpawnReason.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch index 1aa9b01187..7dc4b1a3e8 100644 --- a/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch @@ -58,6 +58,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // Paper end } catch (Throwable throwable) { +diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java ++++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +@@ -0,0 +0,0 @@ public abstract class MobSpawnerAbstract { + // Spigot End + } + entity.spawnedViaMobSpawner = true; // Paper ++ entity.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER; // Paper + // Spigot Start + flag = true; // Paper + if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java