mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 22:14:40 +01:00
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
index a0c426afaa7a18f7596d56699f02dcd665f7aa9d..f5212a7ec0f2dd27fb1c06e0dfc37f2aff595fde 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
@@ -822,7 +822,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
|
this.eW();
|
||
|
|
}
|
||
|
|
// 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
|