Fix double dropping xp now that Spigot fixed it
This commit is contained in:
parent
4ed5ab7c79
commit
92933b162c
1 changed files with 10 additions and 9 deletions
|
@ -1,21 +1,22 @@
|
|||
From 7bf33f402e0d3e1fd6adb9e95394ff4243df91e9 Mon Sep 17 00:00:00 2001
|
||||
From 8caf4eff00e70bc61e956352d3547a6a231b89a5 Mon Sep 17 00:00:00 2001
|
||||
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 f28de40a7..0888f268f 100644
|
||||
index f28de40a7..1ec29f157 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -651,6 +651,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
}
|
||||
@@ -639,7 +639,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
||||
this.setSpectatorTarget(this); // Remove spectated target
|
||||
+ if (event.shouldDropExperience()) this.dropExperience(); // Paper - drop experience
|
||||
// CraftBukkit end
|
||||
|
||||
// CraftBukkit - Get our scores instead
|
||||
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
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
|
Loading…
Reference in a new issue