509 Zeilen
27 KiB
Diff
509 Zeilen
27 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Phoenix616 <mail@moep.tv>
|
|
Date: Tue, 21 Aug 2018 01:39:35 +0100
|
|
Subject: [PATCH] Improve death events
|
|
|
|
This adds the ability to cancel the death events and to modify the sound
|
|
an entity makes when dying. (In cases were no sound should it will be
|
|
called with shouldPlaySound set to false allowing unsilencing of silent
|
|
entities)
|
|
|
|
It makes handling of entity deaths a lot nicer as you no longer need
|
|
to listen on the damage event and calculate if the entity dies yourself
|
|
to cancel the death which has the benefit of also receiving the dropped
|
|
items and experience which is otherwise only properly possible by using
|
|
internal code.
|
|
|
|
== AT ==
|
|
public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sounds/SoundEvent;
|
|
public net.minecraft.world.entity.LivingEntity getSoundVolume()F
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
index 0a5aeb9b50dfec3b791040348f6a9e929ef8e59c..6c3569435cdfcf28acaa7b2dac8664dd14e3e6c2 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -294,6 +294,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
|
private int containerCounter;
|
|
public boolean wonGame;
|
|
private int containerUpdateDelay; // Paper - Configurable container update tick rate
|
|
+ // Paper start - cancellable death event
|
|
+ public boolean queueHealthUpdatePacket;
|
|
+ public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
|
|
+ // Paper end - cancellable death event
|
|
|
|
// CraftBukkit start
|
|
public CraftPlayer.TransferCookieConnection transferCookieConnection;
|
|
@@ -1151,7 +1155,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
|
|
|
@Override
|
|
public void die(DamageSource damageSource) {
|
|
- this.gameEvent(GameEvent.ENTITY_DIE);
|
|
+ // this.gameEvent(GameEvent.ENTITY_DIE); // Paper - move below event cancellation check
|
|
boolean flag = this.serverLevel().getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES);
|
|
// CraftBukkit start - fire PlayerDeathEvent
|
|
if (this.isRemoved()) {
|
|
@@ -1179,6 +1183,16 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
|
String deathmessage = defaultMessage.getString();
|
|
this.keepLevel = keepInventory; // SPIGOT-2222: pre-set keepLevel
|
|
org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, damageSource, loot, PaperAdventure.asAdventure(defaultMessage), keepInventory); // Paper - Adventure
|
|
+ // Paper start - cancellable death event
|
|
+ if (event.isCancelled()) {
|
|
+ // make compatible with plugins that might have already set the health in an event listener
|
|
+ if (this.getHealth() <= 0) {
|
|
+ this.setHealth((float) event.getReviveHealth());
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+ this.gameEvent(GameEvent.ENTITY_DIE); // moved from the top of this method
|
|
+ // Paper end
|
|
|
|
// SPIGOT-943 - only call if they have an inventory open
|
|
if (this.containerMenu != this.inventoryMenu) {
|
|
@@ -1323,7 +1337,17 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
|
}
|
|
}
|
|
|
|
- return super.hurtServer(world, source, amount);
|
|
+ // Paper start - cancellable death events
|
|
+ // return super.hurtServer(world, source, amount);
|
|
+ this.queueHealthUpdatePacket = true;
|
|
+ boolean damaged = super.hurtServer(world, source, amount);
|
|
+ this.queueHealthUpdatePacket = false;
|
|
+ if (this.queuedHealthUpdatePacket != null) {
|
|
+ this.connection.send(this.queuedHealthUpdatePacket);
|
|
+ this.queuedHealthUpdatePacket = null;
|
|
+ }
|
|
+ return damaged;
|
|
+ // Paper end - cancellable death events
|
|
}
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 6924772818d10654f7f25028bb08fd807689c8a1..4250056b003588e6e57efdf9d4276216009adb71 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -293,6 +293,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
public Set<UUID> collidableExemptions = new HashSet<>();
|
|
public boolean bukkitPickUpLoot;
|
|
public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
|
|
+ public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
|
|
|
|
@Override
|
|
public float getBukkitYaw() {
|
|
@@ -1540,11 +1541,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
|
|
if (this.isDeadOrDying()) {
|
|
if (!this.checkTotemDeathProtection(source)) {
|
|
- if (flag1) {
|
|
- this.makeSound(this.getDeathSound());
|
|
- }
|
|
+ // Paper start - moved into CraftEventFactory event caller for cancellable death event
|
|
+ this.silentDeath = !flag1; // mark entity as dying silently
|
|
+ // Paper end
|
|
|
|
this.die(source);
|
|
+ this.silentDeath = false; // Paper - cancellable death event - reset to default
|
|
}
|
|
} else if (flag1) {
|
|
this.playHurtSound(source);
|
|
@@ -1749,6 +1751,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
Entity entity = damageSource.getEntity();
|
|
LivingEntity entityliving = this.getKillCredit();
|
|
|
|
+ /* // Paper - move down to make death event cancellable - this is the awardKillScore below
|
|
if (entityliving != null) {
|
|
entityliving.awardKillScore(this, damageSource);
|
|
}
|
|
@@ -1760,24 +1763,59 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (!this.level().isClientSide && this.hasCustomName()) {
|
|
if (org.spigotmc.SpigotConfig.logNamedDeaths) LivingEntity.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); // Spigot
|
|
}
|
|
+ */ // Paper - move down to make death event cancellable - this is the awardKillScore below
|
|
|
|
this.dead = true;
|
|
- this.getCombatTracker().recheckStatus();
|
|
+ // Paper - moved into if below
|
|
Level world = this.level();
|
|
|
|
if (world instanceof ServerLevel) {
|
|
ServerLevel worldserver = (ServerLevel) world;
|
|
+ // Paper - move below into if for onKill
|
|
+
|
|
+ // Paper start
|
|
+ org.bukkit.event.entity.EntityDeathEvent deathEvent = this.dropAllDeathLoot(worldserver, damageSource);
|
|
+ if (deathEvent == null || !deathEvent.isCancelled()) {
|
|
+ if (entityliving != null) {
|
|
+ entityliving.awardKillScore(this, damageSource);
|
|
+ }
|
|
+ // Paper start - clear equipment if event is not cancelled
|
|
+ if (this instanceof Mob) {
|
|
+ for (EquipmentSlot slot : this.clearedEquipmentSlots) {
|
|
+ this.setItemSlot(slot, ItemStack.EMPTY);
|
|
+ }
|
|
+ this.clearedEquipmentSlots.clear();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
+ if (this.isSleeping()) {
|
|
+ this.stopSleeping();
|
|
+ }
|
|
|
|
- if (entity == null || entity.killedEntity(worldserver, this)) {
|
|
+ if (!this.level().isClientSide && this.hasCustomName()) {
|
|
+ if (org.spigotmc.SpigotConfig.logNamedDeaths) LivingEntity.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); // Spigot
|
|
+ }
|
|
+
|
|
+ this.getCombatTracker().recheckStatus();
|
|
+ if (entity != null) {
|
|
+ entity.killedEntity((ServerLevel) this.level(), this);
|
|
+ }
|
|
this.gameEvent(GameEvent.ENTITY_DIE);
|
|
- this.dropAllDeathLoot(worldserver, damageSource);
|
|
+ } else {
|
|
+ this.dead = false;
|
|
+ this.setHealth((float) deathEvent.getReviveHealth());
|
|
+ }
|
|
+ // Paper end
|
|
this.createWitherRose(entityliving);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ if (this.dead) { // Paper
|
|
this.level().broadcastEntityEvent(this, (byte) 3);
|
|
- }
|
|
|
|
this.setPose(Pose.DYING);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|
|
@@ -1787,7 +1825,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (world instanceof ServerLevel worldserver) {
|
|
boolean flag = false;
|
|
|
|
- if (adversary instanceof WitherBoss) {
|
|
+ if (this.dead && adversary instanceof WitherBoss) { // Paper
|
|
if (worldserver.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
|
|
BlockPos blockposition = this.blockPosition();
|
|
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
|
|
@@ -1816,24 +1854,37 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
}
|
|
|
|
- protected void dropAllDeathLoot(ServerLevel world, DamageSource damageSource) {
|
|
+ // Paper start
|
|
+ protected boolean clearEquipmentSlots = true;
|
|
+ protected Set<EquipmentSlot> clearedEquipmentSlots = new java.util.HashSet<>();
|
|
+ protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(ServerLevel world, DamageSource damageSource) {
|
|
+ // Paper end
|
|
boolean flag = this.lastHurtByPlayerTime > 0;
|
|
|
|
this.dropEquipment(world); // CraftBukkit - from below
|
|
if (this.shouldDropLoot() && world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
|
|
this.dropFromLootTable(world, damageSource, flag);
|
|
+ // Paper start
|
|
+ final boolean prev = this.clearEquipmentSlots;
|
|
+ this.clearEquipmentSlots = false;
|
|
+ this.clearedEquipmentSlots.clear();
|
|
+ // Paper end
|
|
this.dropCustomDeathLoot(world, damageSource, flag);
|
|
+ this.clearEquipmentSlots = prev; // Paper
|
|
}
|
|
// CraftBukkit start - Call death event
|
|
- CraftEventFactory.callEntityDeathEvent(this, damageSource, this.drops);
|
|
+ org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, damageSource, this.drops); // Paper
|
|
+ this.postDeathDropItems(deathEvent); // Paper
|
|
this.drops = new ArrayList<>();
|
|
// CraftBukkit end
|
|
|
|
// this.dropEquipment(worldserver);// CraftBukkit - moved up
|
|
this.dropExperience(world, damageSource.getEntity());
|
|
+ return deathEvent; // Paper
|
|
}
|
|
|
|
protected void dropEquipment(ServerLevel world) {}
|
|
+ protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled
|
|
|
|
public int getExpReward(ServerLevel worldserver, @Nullable Entity entity) { // CraftBukkit
|
|
if (!this.wasExperienceConsumed() && (this.isAlwaysExperienceDropper() || this.lastHurtByPlayerTime > 0 && this.shouldDropExperience() && worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT))) {
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
index 6d1f840a328a2081a59aab923595450eb54f685c..b3c27cdf7d336404403fe09553080835f2d3de49 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
@@ -1117,6 +1117,12 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
+ protected boolean shouldSkipLoot(EquipmentSlot slot) { // method to avoid to fallback into the global mob loot logic (i.e fox)
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
protected void dropCustomDeathLoot(ServerLevel world, DamageSource source, boolean causedByPlayer) {
|
|
super.dropCustomDeathLoot(world, source, causedByPlayer);
|
|
@@ -1124,6 +1130,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
|
|
|
while (iterator.hasNext()) {
|
|
EquipmentSlot enumitemslot = (EquipmentSlot) iterator.next();
|
|
+ if (this.shouldSkipLoot(enumitemslot)) continue; // Paper
|
|
ItemStack itemstack = this.getItemBySlot(enumitemslot);
|
|
float f = this.getEquipmentDropChance(enumitemslot);
|
|
|
|
@@ -1148,7 +1155,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
|
}
|
|
|
|
this.spawnAtLocation(world, itemstack);
|
|
+ if (this.clearEquipmentSlots) { // Paper
|
|
this.setItemSlot(enumitemslot, ItemStack.EMPTY);
|
|
+ // Paper start
|
|
+ } else {
|
|
+ this.clearedEquipmentSlots.add(enumitemslot);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
|
index 81bb457ddebcf06e14c772c5c5df584e43766e58..273ca38677223c28025629144c39e9e415145f70 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
|
@@ -689,16 +689,38 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
|
|
return this.getTrustedUUIDs().contains(uuid);
|
|
}
|
|
|
|
+ // Paper start - handle the bitten item separately like vanilla
|
|
@Override
|
|
- protected void dropAllDeathLoot(ServerLevel world, DamageSource damageSource) {
|
|
+ protected boolean shouldSkipLoot(EquipmentSlot slot) {
|
|
+ return slot == EquipmentSlot.MAINHAND;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
+ @Override
|
|
+ // Paper start - Cancellable death event
|
|
+ protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(ServerLevel world, DamageSource damageSource) {
|
|
ItemStack itemstack = this.getItemBySlot(EquipmentSlot.MAINHAND);
|
|
|
|
- if (!itemstack.isEmpty()) {
|
|
+ boolean releaseMouth = false;
|
|
+ if (!itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Fix MC-153010
|
|
this.spawnAtLocation(world, itemstack);
|
|
+ releaseMouth = true;
|
|
+ }
|
|
+
|
|
+ org.bukkit.event.entity.EntityDeathEvent deathEvent = super.dropAllDeathLoot(world, damageSource);
|
|
+
|
|
+ // Below is code to drop
|
|
+
|
|
+ if (deathEvent == null || deathEvent.isCancelled()) {
|
|
+ return deathEvent;
|
|
+ }
|
|
+
|
|
+ if (releaseMouth) {
|
|
+ // Paper end - Cancellable death event
|
|
this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
|
|
}
|
|
|
|
- super.dropAllDeathLoot(world, damageSource);
|
|
+ return deathEvent; // Paper - Cancellable death event
|
|
}
|
|
|
|
public static boolean isPathClear(Fox fox, LivingEntity chasedEntity) {
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
|
|
index dd7ef4c873d5e06eb5be3abc8049bf8acbd5a3fb..112b82ba7709b36e996e2f984c72ce40ca718720 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
|
|
@@ -69,9 +69,16 @@ public abstract class AbstractChestedHorse extends AbstractHorse {
|
|
super.dropEquipment(world);
|
|
if (this.hasChest()) {
|
|
this.spawnAtLocation(world, Blocks.CHEST);
|
|
+ //this.setChest(false); // Paper - moved to post death logic
|
|
+ }
|
|
+ }
|
|
+ // Paper start
|
|
+ protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {
|
|
+ if (this.hasChest() && (event == null || !event.isCancelled())) {
|
|
this.setChest(false);
|
|
}
|
|
}
|
|
+ // Paper end
|
|
|
|
@Override
|
|
public void addAdditionalSaveData(CompoundTag nbt) {
|
|
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
|
|
index 2caba38a50b7ea535337a3540aa5272d4a9f1878..e20565cf256aacd012a1722c5ebbf9016bc82e42 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
|
|
@@ -506,8 +506,10 @@ public class ArmorStand extends LivingEntity {
|
|
}
|
|
// CraftBukkit end
|
|
if (source.is(DamageTypeTags.IS_EXPLOSION)) {
|
|
- this.brokenByAnything(world, source);
|
|
- this.kill(world, source); // CraftBukkit
|
|
+ // Paper start - avoid duplicate event call
|
|
+ org.bukkit.event.entity.EntityDeathEvent event = this.brokenByAnything(world, source);
|
|
+ if (!event.isCancelled()) this.kill(source, false); // CraftBukkit
|
|
+ // Paper end
|
|
return false;
|
|
} else if (source.is(DamageTypeTags.IGNITES_ARMOR_STANDS)) {
|
|
if (this.isOnFire()) {
|
|
@@ -550,9 +552,9 @@ public class ArmorStand extends LivingEntity {
|
|
this.gameEvent(GameEvent.ENTITY_DAMAGE, source.getEntity());
|
|
this.lastHit = i;
|
|
} else {
|
|
- this.brokenByPlayer(world, source);
|
|
+ org.bukkit.event.entity.EntityDeathEvent event = this.brokenByPlayer(world, source); // Paper
|
|
this.showBreakingParticles();
|
|
- this.discard(EntityRemoveEvent.Cause.DEATH); // CraftBukkit - SPIGOT-4890: remain as this.discard() since above damagesource method will call death event
|
|
+ if (!event.isCancelled()) this.kill(source, false); // Paper - we still need to kill to follow vanilla logic (emit the game event etc...)
|
|
}
|
|
|
|
return true;
|
|
@@ -602,7 +604,10 @@ public class ArmorStand extends LivingEntity {
|
|
f1 -= amount;
|
|
if (f1 <= 0.5F) {
|
|
this.brokenByAnything(world, damageSource);
|
|
- this.kill(world, damageSource); // CraftBukkit
|
|
+ // Paper start - avoid duplicate event call
|
|
+ org.bukkit.event.entity.EntityDeathEvent event = this.brokenByAnything(world, damageSource);
|
|
+ if (!event.isCancelled()) this.kill(damageSource, false); // CraftBukkit
|
|
+ // Paper end
|
|
} else {
|
|
this.setHealth(f1);
|
|
this.gameEvent(GameEvent.ENTITY_DAMAGE, damageSource.getEntity());
|
|
@@ -610,15 +615,15 @@ public class ArmorStand extends LivingEntity {
|
|
|
|
}
|
|
|
|
- private void brokenByPlayer(ServerLevel world, DamageSource damageSource) {
|
|
+ private org.bukkit.event.entity.EntityDeathEvent brokenByPlayer(ServerLevel world, DamageSource damageSource) { // Paper
|
|
ItemStack itemstack = new ItemStack(Items.ARMOR_STAND);
|
|
|
|
itemstack.set(DataComponents.CUSTOM_NAME, this.getCustomName());
|
|
this.drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack)); // CraftBukkit - add to drops
|
|
- this.brokenByAnything(world, damageSource);
|
|
+ return this.brokenByAnything(world, damageSource); // Paper
|
|
}
|
|
|
|
- private void brokenByAnything(ServerLevel world, DamageSource damageSource) {
|
|
+ private org.bukkit.event.entity.EntityDeathEvent brokenByAnything(ServerLevel world, DamageSource damageSource) { // Paper
|
|
this.playBrokenSound();
|
|
// this.dropAllDeathLoot(worldserver, damagesource); // CraftBukkit - moved down
|
|
|
|
@@ -640,7 +645,7 @@ public class ArmorStand extends LivingEntity {
|
|
this.armorItems.set(i, ItemStack.EMPTY);
|
|
}
|
|
}
|
|
- this.dropAllDeathLoot(world, damageSource); // CraftBukkit - moved from above
|
|
+ return this.dropAllDeathLoot(world, damageSource); // CraftBukkit - moved from above // Paper
|
|
|
|
}
|
|
|
|
@@ -767,7 +772,15 @@ public class ArmorStand extends LivingEntity {
|
|
}
|
|
|
|
public void kill(ServerLevel worldserver, DamageSource damageSource) {
|
|
- org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, (damageSource == null ? this.damageSources().genericKill() : damageSource), this.drops); // CraftBukkit - call event
|
|
+ // Paper start - make cancellable
|
|
+ this.kill(damageSource, true);
|
|
+ }
|
|
+ public void kill(DamageSource damageSource, boolean callEvent) {
|
|
+ if (callEvent) {
|
|
+ org.bukkit.event.entity.EntityDeathEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, (damageSource == null ? this.damageSources().genericKill() : damageSource), this.drops); // CraftBukkit - call event
|
|
+ if (event.isCancelled()) return;
|
|
+ }
|
|
+ // Paper end
|
|
this.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
|
|
// CraftBukkit end
|
|
this.gameEvent(GameEvent.ENTITY_DIE);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index c9c4696b17917fab03e8e6837a232f08290b05fe..63cc339b42c47879401628c8d0e0f62bd7dd76b4 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2517,7 +2517,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
@Override
|
|
public void sendHealthUpdate() {
|
|
FoodData foodData = this.getHandle().getFoodData();
|
|
- this.sendHealthUpdate(this.getScaledHealth(), foodData.getFoodLevel(), foodData.getSaturationLevel());
|
|
+ // Paper start - cancellable death event
|
|
+ ClientboundSetHealthPacket packet = new ClientboundSetHealthPacket(this.getScaledHealth(), foodData.getFoodLevel(), foodData.getSaturationLevel());
|
|
+ if (this.getHandle().queueHealthUpdatePacket) {
|
|
+ this.getHandle().queuedHealthUpdatePacket = packet;
|
|
+ } else {
|
|
+ this.getHandle().connection.send(packet);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
|
|
public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 474f330f381aa74e9f2fd0accdbaf2617ec1c557..b537b3ac2ed238c01ec76ccc7941a09bfc959c10 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -902,8 +902,15 @@ public class CraftEventFactory {
|
|
CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource);
|
|
CraftWorld world = (CraftWorld) entity.getWorld();
|
|
EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, drops, victim.getExpReward(world.getHandle(), damageSource.getEntity()));
|
|
+ populateFields(victim, event); // Paper - make cancellable
|
|
Bukkit.getServer().getPluginManager().callEvent(event);
|
|
|
|
+ // Paper start - make cancellable
|
|
+ if (event.isCancelled()) {
|
|
+ return event;
|
|
+ }
|
|
+ playDeathSound(victim, event);
|
|
+ // Paper end
|
|
victim.expToDrop = event.getDroppedExp();
|
|
|
|
for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
|
|
@@ -921,7 +928,14 @@ public class CraftEventFactory {
|
|
PlayerDeathEvent event = new PlayerDeathEvent(entity, bukkitDamageSource, drops, victim.getExpReward(victim.serverLevel(), damageSource.getEntity()), 0, deathMessage);
|
|
event.setKeepInventory(keepInventory);
|
|
event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
|
|
+ populateFields(victim, event); // Paper - make cancellable
|
|
Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ // Paper start - make cancellable
|
|
+ if (event.isCancelled()) {
|
|
+ return event;
|
|
+ }
|
|
+ playDeathSound(victim, event);
|
|
+ // Paper end
|
|
|
|
victim.keepLevel = event.getKeepLevel();
|
|
victim.newLevel = event.getNewLevel();
|
|
@@ -944,6 +958,31 @@ public class CraftEventFactory {
|
|
return event;
|
|
}
|
|
|
|
+ // Paper start - helper methods for making death event cancellable
|
|
+ // Add information to death event
|
|
+ private static void populateFields(net.minecraft.world.entity.LivingEntity victim, EntityDeathEvent event) {
|
|
+ event.setReviveHealth(event.getEntity().getAttribute(org.bukkit.attribute.Attribute.MAX_HEALTH).getValue());
|
|
+ event.setShouldPlayDeathSound(!victim.silentDeath && !victim.isSilent());
|
|
+ net.minecraft.sounds.SoundEvent soundEffect = victim.getDeathSound();
|
|
+ event.setDeathSound(soundEffect != null ? org.bukkit.craftbukkit.CraftSound.minecraftToBukkit(soundEffect) : null);
|
|
+ event.setDeathSoundCategory(org.bukkit.SoundCategory.valueOf(victim.getSoundSource().name()));
|
|
+ event.setDeathSoundVolume(victim.getSoundVolume());
|
|
+ event.setDeathSoundPitch(victim.getVoicePitch());
|
|
+ }
|
|
+
|
|
+ // Play death sound manually
|
|
+ private static void playDeathSound(net.minecraft.world.entity.LivingEntity victim, EntityDeathEvent event) {
|
|
+ if (event.shouldPlayDeathSound() && event.getDeathSound() != null && event.getDeathSoundCategory() != null) {
|
|
+ net.minecraft.world.entity.player.Player source = victim instanceof net.minecraft.world.entity.player.Player ? (net.minecraft.world.entity.player.Player) victim : null;
|
|
+ double x = event.getEntity().getLocation().getX();
|
|
+ double y = event.getEntity().getLocation().getY();
|
|
+ double z = event.getEntity().getLocation().getZ();
|
|
+ net.minecraft.sounds.SoundEvent soundEffect = org.bukkit.craftbukkit.CraftSound.bukkitToMinecraft(event.getDeathSound());
|
|
+ net.minecraft.sounds.SoundSource soundCategory = net.minecraft.sounds.SoundSource.valueOf(event.getDeathSoundCategory().name());
|
|
+ victim.level().playSound(source, x, y, z, soundEffect, soundCategory, event.getDeathSoundVolume(), event.getDeathSoundPitch());
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
/**
|
|
* Server methods
|
|
*/
|