papermc/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch

23 lines
1 KiB
Diff
Raw Normal View History

From 5e96e206c4d525ade6786e7b85d7da4bbfbb8386 Mon Sep 17 00:00:00 2001
2019-12-24 00:36:24 +00:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 24 Dec 2019 00:35:42 +0000
Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f23bf8ce..24545b33 100644
2019-12-24 00:36:24 +00:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -645,7 +645,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2019-12-24 00:36:24 +00:00
this.releaseShoulderEntities();
// 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
2019-12-24 00:36:24 +00:00
--
2.25.1.windows.1
2019-12-24 00:36:24 +00:00