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

23 lines
1023 B
Diff
Raw Normal View History

2020-01-18 17:58:05 +00:00
From 49358ef040460f25448876b8f2a3027c6eddb06c 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-01-18 17:58:05 +00:00
index 07d7ac56e..9a61dda82 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
@@ -639,7 +639,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
--
2020-01-18 17:58:05 +00:00
2.25.0
2019-12-24 00:36:24 +00:00