Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 09:27:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix recursion in EntityFox (#2418)

Browse Source 
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.
This commit is contained in:
Spottedleaf 2019-08-05 20:31:38 -07:00 committed by Shane Freeder
parent 7c640a1ae2
commit b6c32b2a15
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0300-Improve-death-events.patch
View File

@ -1,4 +1,4 @@
From 5d6dc2bb82c80b978eaccdeb9e69dbf34d723805 Mon Sep 17 00:00:00 2001 From 11a05d88ac3b775120ee4c8319d2c249400e45f2 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv> From: Phoenix616 <mail@moep.tv>
Date: Tue, 21 Aug 2018 01:39:35 +0100 Date: Tue, 21 Aug 2018 01:39:35 +0100
Subject: [PATCH] Improve death events Subject: [PATCH] Improve death events
@ -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 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 --- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal { @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
@ -74,7 +74,7 @@ index 85231309fd..97059b8239 100644
+ ItemStack itemstack = this.getEquipment(EnumItemSlot.MAINHAND).cloneItemStack(); // Paper + ItemStack itemstack = this.getEquipment(EnumItemSlot.MAINHAND).cloneItemStack(); // Paper
+ +
+ // Paper start - Cancellable death event + // 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 + // Below is code to drop
+ +