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

23 lines
1.0 KiB
Diff
Raw Normal View History

From f69a886da46f2fe2badf02b451da3e405e2deaaa 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 69a4228908..e7bfbc3307 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
2019-12-24 00:36:24 +00:00