2020-01-28 01:16:53 +01:00
|
|
|
From 9e075ab344d25cb7cec6f3afc5a76cc2970280d1 Mon Sep 17 00:00:00 2001
|
2019-12-24 01:36:24 +01: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-28 01:16:53 +01:00
|
|
|
index 4ca28c8b64..15230a834c 100644
|
2019-12-24 01:36:24 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2020-01-28 01:16:53 +01:00
|
|
|
@@ -643,7 +643,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2019-12-24 01:36:24 +01:00
|
|
|
|
2019-12-27 04:28:02 +01: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 01:36:24 +01:00
|
|
|
--
|
2020-01-22 03:02:07 +01:00
|
|
|
2.25.0.windows.1
|
2019-12-24 01:36:24 +01:00
|
|
|
|