aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0243-Improve-death-events.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0243-Improve-death-events.patch')
-rw-r--r--patches/server/0243-Improve-death-events.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0243-Improve-death-events.patch b/patches/server/0243-Improve-death-events.patch
index 87014faf23..cd1e402af3 100644
--- a/patches/server/0243-Improve-death-events.patch
+++ b/patches/server/0243-Improve-death-events.patch
@@ -446,7 +446,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b
index d63cf5933fdcff6d71c7ddbfed3640acd1646b70..1f4c686e92e7449556ee5067553ed4473ba2f50e 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -901,9 +901,16 @@ public class CraftEventFactory {
+@@ -903,9 +903,16 @@ public class CraftEventFactory {
CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource);
EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, drops, victim.getExpReward(damageSource.getEntity()));
@@ -463,7 +463,7 @@ index d63cf5933fdcff6d71c7ddbfed3640acd1646b70..1f4c686e92e7449556ee5067553ed447
victim.expToDrop = event.getDroppedExp();
for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -921,7 +928,14 @@ public class CraftEventFactory {
+@@ -923,7 +930,14 @@ public class CraftEventFactory {
PlayerDeathEvent event = new PlayerDeathEvent(entity, bukkitDamageSource, drops, victim.getExpReward(damageSource.getEntity()), 0, deathMessage);
event.setKeepInventory(keepInventory);
event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
@@ -478,7 +478,7 @@ index d63cf5933fdcff6d71c7ddbfed3640acd1646b70..1f4c686e92e7449556ee5067553ed447
victim.keepLevel = event.getKeepLevel();
victim.newLevel = event.getNewLevel();
-@@ -944,6 +958,31 @@ public class CraftEventFactory {
+@@ -946,6 +960,31 @@ public class CraftEventFactory {
return event;
}