2020-05-06 09:48:49 +00:00
|
|
|
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
|
2020-06-26 12:04:38 +00:00
|
|
|
index 55675fafaaadd3739e51bccce1c66ffab2d2d5c2..ce3ed590f96312e18d631afee40f3821dad986ae 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
|
2020-06-26 12:04:38 +00:00
|
|
|
@@ -685,7 +685,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2020-06-25 23:38:24 +00:00
|
|
|
this.eW();
|
|
|
|
|
}
|
2019-12-27 03:28:02 +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
|
