testserver/Spigot-Server-Patches/0396-PlayerDeathEvent-shoul...

20 lines
1.0 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 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 e82d4b4ef55f981ea653e53424a5a8c746fa70d3..04e402275de6797dcd25d2497faf6a258dc26112 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
@@ -692,7 +692,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.eV();
2020-06-25 23:38:24 +00:00
}
// 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