Fix duplicated BlockPistonRetractEvent call (#7111)

1 files changed, 19 insertions, 0 deletions

diff --git a/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch
new file mode 100644
index 0000000000..c4f047485d
--- /dev/null
+++ b/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Tue, 24 Dec 2019 00:35:42 +0000
+Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index ea73914ec8fb877de3f34cf7d5a0d60d547733fe..b193f8dfbe7b61c919ad5eb452d29885982e25e4 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -884,7 +884,7 @@ public class ServerPlayer extends Player {
+             this.tellNeutralMobsThatIDied();
+         }
+         // SPIGOT-5478 must be called manually now
+-        this.dropExperience();
++        if (event.shouldDropExperience()) this.dropExperience(); // Paper - tie to event
+         // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
+         if (!event.getKeepInventory()) {
+             // Paper start - replace logic