From 02105ddde619601833a6fff8476f1ed7fd398aa5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 5 Aug 2019 20:31:38 -0700 Subject: [PATCH] Fix recursion in EntityFox (#2418) I changed a method call without looking at the implications. super.processDeath would re-invoke the unmapped method, whereas super.d would call the super method. --- Spigot-Server-Patches/Improve-death-events.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Improve-death-events.patch b/Spigot-Server-Patches/Improve-death-events.patch index eef654561c..dc4081e24e 100644 --- a/Spigot-Server-Patches/Improve-death-events.patch +++ b/Spigot-Server-Patches/Improve-death-events.patch @@ -61,7 +61,7 @@ index 627925e3ba..e516db2701 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 85231309fd..97059b8239 100644 +index 85231309fd..1da2f013fc 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -0,0 +0,0 @@ public class EntityFox extends EntityAnimal { @@ -74,7 +74,7 @@ index 85231309fd..97059b8239 100644 + ItemStack itemstack = this.getEquipment(EnumItemSlot.MAINHAND).cloneItemStack(); // Paper + + // Paper start - Cancellable death event -+ org.bukkit.event.entity.EntityDeathEvent deathEvent = super.processDeath(damagesource); ++ org.bukkit.event.entity.EntityDeathEvent deathEvent = super.d(damagesource); + + // Below is code to drop +