Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 7361a62e SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) 1dc91b15 Add specific notes about what is not API 2b05ef88 #484: Allow statistics to be accessed for offline players CraftBukkit Changes: f7d6ad53 SPIGOT-5603: Use LootContext#lootingModifier in CraftLootTable 5838285d SPIGOT-5657: BlockPlaceEvent not cancelling for tripwire hooks f325b9be SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) e25a2272 Fix some formatting in CraftHumanEntity 498540e0 Add Merchant slot delegate b2de47d5 SPIGOT-5621: Add missing container types for opening InventoryView aa3a2f27 #645: Allow statistics to be accessed for offline players 2122c0b1 #649: CraftBell should implement Bell
452 lines
21 KiB
Diff
452 lines
21 KiB
Diff
From ca7b8f78b8472dfa962351fd96f0265b5a49746b 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.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
|
|
index 6daa400d27..38fe29f8a2 100644
|
|
--- a/src/main/java/net/minecraft/server/CombatTracker.java
|
|
+++ b/src/main/java/net/minecraft/server/CombatTracker.java
|
|
@@ -175,6 +175,7 @@ public class CombatTracker {
|
|
this.h = null;
|
|
}
|
|
|
|
+ public void reset() { this.g(); } // Paper - OBFHELPER
|
|
public void g() {
|
|
int i = this.f ? 300 : 100;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index f54fc61aa5..fd78f647eb 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
return false;
|
|
}
|
|
|
|
+ public void runKillTrigger(Entity entity, int kills, DamageSource damageSource) { this.a(entity, kills, damageSource); } // Paper - OBFHELPER
|
|
public void a(Entity entity, int i, DamageSource damagesource) {
|
|
if (entity instanceof EntityPlayer) {
|
|
CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
|
|
@@ -2417,6 +2418,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
this.fallDistance = 0.0F;
|
|
}
|
|
|
|
+ public void onKill(EntityLiving entityLiving) { this.b(entityLiving); } // Paper - OBFHELPER
|
|
public void b(EntityLiving entityliving) {}
|
|
|
|
protected void k(double d0, double d1, double d2) {
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
index 42b9a339e9..8ad131e4fc 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
@@ -701,7 +701,8 @@ public class EntityArmorStand extends EntityLiving {
|
|
|
|
@Override
|
|
public void killEntity() {
|
|
- org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, drops); // CraftBukkit - call event
|
|
+ org.bukkit.event.entity.EntityDeathEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, drops); // CraftBukkit - call event // Paper - make cancellable
|
|
+ if (event.isCancelled()) return; // Paper - make cancellable
|
|
this.die();
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
|
|
index 2be6c7bde9..82a32d5dbf 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityFox.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityFox.java
|
|
@@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal {
|
|
}
|
|
|
|
@Override
|
|
- protected void d(DamageSource damagesource) {
|
|
- ItemStack itemstack = this.getEquipment(EnumItemSlot.MAINHAND);
|
|
+ protected org.bukkit.event.entity.EntityDeathEvent d(DamageSource damagesource) { // Paper
|
|
+ ItemStack itemstack = this.getEquipment(EnumItemSlot.MAINHAND).cloneItemStack(); // Paper
|
|
+
|
|
+ // Paper start - Cancellable death event
|
|
+ org.bukkit.event.entity.EntityDeathEvent deathEvent = super.d(damagesource);
|
|
+
|
|
+ // Below is code to drop
|
|
+
|
|
+ if (deathEvent == null || deathEvent.isCancelled()) {
|
|
+ return deathEvent;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
if (!itemstack.isEmpty()) {
|
|
this.a(itemstack);
|
|
this.setSlot(EnumItemSlot.MAINHAND, ItemStack.a);
|
|
}
|
|
|
|
- super.d(damagesource);
|
|
+ return deathEvent; // Paper
|
|
}
|
|
|
|
public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
|
|
index 80717ad9ac..53aac5bccd 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
|
|
@@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
|
|
this.a((IMaterial) Blocks.CHEST);
|
|
}
|
|
|
|
- this.setCarryingChest(false);
|
|
+ //this.setCarryingChest(false); // Paper - moved to post death logic
|
|
}
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
+ protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {
|
|
+ if (this.isCarryingChest() && (event == null || !event.isCancelled())) {
|
|
+ this.setCarryingChest(false);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void b(NBTTagCompound nbttagcompound) {
|
|
super.b(nbttagcompound);
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index fa097e0551..eed3e7c58e 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity {
|
|
protected float aT;
|
|
protected float aU;
|
|
protected float aV;
|
|
- protected int aW;
|
|
+ protected int aW; protected int getKillCount() { return this.aW; } // Paper - OBFHELPER
|
|
public float lastDamage;
|
|
protected boolean jumping;
|
|
public float aZ;
|
|
@@ -131,6 +131,7 @@ public abstract class EntityLiving extends Entity {
|
|
public boolean collides = true;
|
|
public boolean canPickUpLoot;
|
|
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() {
|
|
@@ -1139,13 +1140,17 @@ public abstract class EntityLiving extends Entity {
|
|
|
|
if (this.getHealth() <= 0.0F) {
|
|
if (!this.f(damagesource)) {
|
|
- SoundEffect soundeffect = this.getSoundDeath();
|
|
+ // Paper start - moved into CraftEventFactory event caller for cancellable death event
|
|
+ //SoundEffect soundeffect = this.getSoundDeath();
|
|
|
|
- if (flag1 && soundeffect != null) {
|
|
- this.a(soundeffect, this.getSoundVolume(), this.dn());
|
|
- }
|
|
+// if (flag1 && soundeffect != null) {
|
|
+// this.a(soundeffect, this.getSoundVolume(), this.dn());
|
|
+// }
|
|
+ this.silentDeath = !flag1; // mark entity as dying silently
|
|
+ // Paper end
|
|
|
|
this.die(damagesource);
|
|
+ this.silentDeath = false; // Paper - cancellable death event - reset to default
|
|
}
|
|
} else if (flag1) {
|
|
this.c(damagesource);
|
|
@@ -1283,6 +1288,7 @@ public abstract class EntityLiving extends Entity {
|
|
Entity entity = damagesource.getEntity();
|
|
EntityLiving entityliving = this.getKillingEntity();
|
|
|
|
+ /* // Paper - move down to make death event cancellable
|
|
if (this.aW >= 0 && entityliving != null) {
|
|
entityliving.a(this, this.aW, damagesource);
|
|
}
|
|
@@ -1294,16 +1300,36 @@ public abstract class EntityLiving extends Entity {
|
|
if (this.isSleeping()) {
|
|
this.entityWakeup();
|
|
}
|
|
+ */ // Paper
|
|
|
|
this.killed = true;
|
|
- this.getCombatTracker().g();
|
|
+ //this.getCombatTracker().g();
|
|
if (!this.world.isClientSide) {
|
|
- this.d(damagesource);
|
|
+ org.bukkit.event.entity.EntityDeathEvent deathEvent = this.d(damagesource);
|
|
+ if (deathEvent == null || !deathEvent.isCancelled()) {
|
|
+ if (this.getKillCount() >= 0 && entityliving != null) {
|
|
+ entityliving.runKillTrigger(this, this.getKillCount(), damagesource);
|
|
+ }
|
|
+ if (entity != null) {
|
|
+ entity.onKill(this);
|
|
+ }
|
|
+ if (this.isSleeping()) {
|
|
+ this.entityWakeup();
|
|
+ }
|
|
+ this.getCombatTracker().reset();
|
|
+ } else {
|
|
+ this.killed = false;
|
|
+ this.setHealth((float) deathEvent.getReviveHealth());
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
this.f(entityliving);
|
|
}
|
|
|
|
+ if (this.killed) { // Paper
|
|
this.world.broadcastEntityEffect(this, (byte) 3);
|
|
this.setPose(EntityPose.DYING);
|
|
+ } // Paper
|
|
}
|
|
}
|
|
|
|
@@ -1311,7 +1337,7 @@ public abstract class EntityLiving extends Entity {
|
|
if (!this.world.isClientSide) {
|
|
boolean flag = false;
|
|
|
|
- if (entityliving instanceof EntityWither) {
|
|
+ if (this.killed && entityliving instanceof EntityWither) { // Paper
|
|
if (this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
|
|
BlockPosition blockposition = new BlockPosition(this);
|
|
IBlockData iblockdata = Blocks.WITHER_ROSE.getBlockData();
|
|
@@ -1332,7 +1358,8 @@ public abstract class EntityLiving extends Entity {
|
|
}
|
|
}
|
|
|
|
- protected void d(DamageSource damagesource) {
|
|
+ protected org.bukkit.event.entity.EntityDeathEvent processDeath(DamageSource damagesource) { return d(damagesource); } // Paper - OBFHELPER
|
|
+ protected org.bukkit.event.entity.EntityDeathEvent d(DamageSource damagesource) { // Paper
|
|
Entity entity = damagesource.getEntity();
|
|
int i;
|
|
|
|
@@ -1345,22 +1372,26 @@ public abstract class EntityLiving extends Entity {
|
|
boolean flag = this.lastDamageByPlayerTime > 0;
|
|
|
|
this.dropInventory(); // CraftBukkit - from below
|
|
+ org.bukkit.event.entity.EntityDeathEvent deathEvent; // Paper
|
|
if (this.isDropExperience() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
|
|
this.a(damagesource, flag);
|
|
this.dropDeathLoot(damagesource, i, flag);
|
|
// CraftBukkit start - Call death event
|
|
- CraftEventFactory.callEntityDeathEvent(this, this.drops);
|
|
- this.drops = new ArrayList<org.bukkit.inventory.ItemStack>();
|
|
+ deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
|
|
} else {
|
|
- CraftEventFactory.callEntityDeathEvent(this);
|
|
+ deathEvent = CraftEventFactory.callEntityDeathEvent(this); // Paper
|
|
// CraftBukkit end
|
|
}
|
|
+ this.postDeathDropItems(deathEvent); // Paper
|
|
+ this.drops = new ArrayList<>(); // Paper
|
|
|
|
// this.dropInventory();// CraftBukkit - moved up
|
|
this.dropExperience();
|
|
+ return deathEvent; // Paper
|
|
}
|
|
|
|
protected void dropInventory() {}
|
|
+ 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
|
|
|
|
// CraftBukkit start
|
|
public int getExpReward() {
|
|
@@ -1439,6 +1470,7 @@ public abstract class EntityLiving extends Entity {
|
|
return SoundEffects.ENTITY_GENERIC_HURT;
|
|
}
|
|
|
|
+ public final SoundEffect getDeathSoundEffect() { return this.getSoundDeath(); } // Paper - OBFHELPER
|
|
@Nullable
|
|
protected SoundEffect getSoundDeath() {
|
|
return SoundEffects.ENTITY_GENERIC_DEATH;
|
|
@@ -1921,10 +1953,12 @@ public abstract class EntityLiving extends Entity {
|
|
|
|
}
|
|
|
|
+ public final float getDeathSoundVolume() { return this.getSoundVolume(); } // Paper - OBFHELPER
|
|
protected float getSoundVolume() {
|
|
return 1.0F;
|
|
}
|
|
|
|
+ public float getSoundPitch() { return dn();} // Paper - OBFHELPER
|
|
protected float dn() {
|
|
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index f849dba215..4b40ffa978 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -76,6 +76,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
public int ping;
|
|
public boolean viewingCredits;
|
|
private int containerUpdateDelay; // Paper
|
|
+ // Paper start - cancellable death event
|
|
+ public boolean queueHealthUpdatePacket = false;
|
|
+ public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
|
|
+ // Paper end
|
|
|
|
// CraftBukkit start
|
|
public String displayName;
|
|
@@ -539,6 +543,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
|
|
String deathmessage = defaultMessage.getString();
|
|
org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
|
|
+ // 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;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
// SPIGOT-943 - only call if they have an inventory open
|
|
if (this.activeContainer != this.defaultContainer) {
|
|
@@ -677,8 +690,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
}
|
|
}
|
|
}
|
|
-
|
|
- return super.damageEntity(damagesource, f);
|
|
+ // Paper start - cancellable death events
|
|
+ //return super.damageEntity(damagesource, f);
|
|
+ this.queueHealthUpdatePacket = true;
|
|
+ boolean damaged = super.damageEntity(damagesource, f);
|
|
+ this.queueHealthUpdatePacket = false;
|
|
+ if (this.queuedHealthUpdatePacket != null) {
|
|
+ this.playerConnection.sendPacket(this.queuedHealthUpdatePacket);
|
|
+ this.queuedHealthUpdatePacket = null;
|
|
+ }
|
|
+ return damaged;
|
|
+ // Paper end
|
|
}
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
|
index 90fdf89c81..b761a41dcd 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
|
@@ -821,6 +821,22 @@ public enum CraftSound {
|
|
WEATHER_RAIN_ABOVE("weather.rain.above");
|
|
private final String minecraftKey;
|
|
|
|
+ // Paper start - cancellable death event
|
|
+ public static CraftSound getBySoundEffect(final SoundEffect effect) {
|
|
+ MinecraftKey key = IRegistry.SOUND_EVENT.getKey(effect);
|
|
+ Preconditions.checkArgument(key != null, "Key for sound effect %s not found?", effect.toString());
|
|
+
|
|
+ return valueOf(key.getKey().replace('.', '_').toUpperCase(java.util.Locale.ENGLISH));
|
|
+ }
|
|
+
|
|
+ public static Sound getSoundByEffect(final SoundEffect effect) {
|
|
+ return Sound.valueOf(getBySoundEffect(effect).name());
|
|
+ }
|
|
+
|
|
+ public static SoundEffect getSoundEffect(final Sound sound) {
|
|
+ return getSoundEffect(getSound(sound));
|
|
+ }
|
|
+ // Paper end
|
|
CraftSound(String minecraftKey) {
|
|
this.minecraftKey = minecraftKey;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index c7bd3015a8..823dba0143 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1698,7 +1698,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
}
|
|
|
|
public void sendHealthUpdate() {
|
|
- getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateHealth(getScaledHealth(), getHandle().getFoodData().getFoodLevel(), getHandle().getFoodData().getSaturationLevel()));
|
|
+ // Paper start - cancellable death event
|
|
+ //getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateHealth(getScaledHealth(), getHandle().getFoodData().getFoodLevel(), getHandle().getFoodData().getSaturationLevel()));
|
|
+ PacketPlayOutUpdateHealth packet = new PacketPlayOutUpdateHealth(getScaledHealth(), getHandle().getFoodData().getFoodLevel(), getHandle().getFoodData().getSaturationLevel());
|
|
+ if (this.getHandle().queueHealthUpdatePacket) {
|
|
+ this.getHandle().queuedHealthUpdatePacket = packet;
|
|
+ } else {
|
|
+ this.getHandle().playerConnection.sendPacket(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 f006b441ad..39ce40bd58 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -749,9 +749,16 @@ public class CraftEventFactory {
|
|
public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
|
|
CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
|
|
EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
|
|
+ populateFields(victim, event); // Paper - make cancellable
|
|
CraftWorld world = (CraftWorld) entity.getWorld();
|
|
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()) {
|
|
@@ -767,8 +774,15 @@ public class CraftEventFactory {
|
|
CraftPlayer entity = victim.getBukkitEntity();
|
|
PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
|
|
event.setKeepInventory(keepInventory);
|
|
+ populateFields(victim, event); // Paper - make cancellable
|
|
org.bukkit.World world = entity.getWorld();
|
|
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();
|
|
@@ -785,6 +799,31 @@ public class CraftEventFactory {
|
|
return event;
|
|
}
|
|
|
|
+ // Paper start - helper methods for making death event cancellable
|
|
+ // Add information to death event
|
|
+ private static void populateFields(EntityLiving victim, EntityDeathEvent event) {
|
|
+ event.setReviveHealth(event.getEntity().getAttribute(org.bukkit.attribute.Attribute.GENERIC_MAX_HEALTH).getValue());
|
|
+ event.setShouldPlayDeathSound(!victim.silentDeath && !victim.isSilent());
|
|
+ net.minecraft.server.SoundEffect soundEffect = victim.getDeathSoundEffect();
|
|
+ event.setDeathSound(soundEffect != null ? org.bukkit.craftbukkit.CraftSound.getSoundByEffect(soundEffect) : null);
|
|
+ event.setDeathSoundCategory(org.bukkit.SoundCategory.valueOf(victim.getSoundCategory().name()));
|
|
+ event.setDeathSoundVolume(victim.getDeathSoundVolume());
|
|
+ event.setDeathSoundPitch(victim.getSoundPitch());
|
|
+ }
|
|
+
|
|
+ // Play death sound manually
|
|
+ private static void playDeathSound(EntityLiving victim, EntityDeathEvent event) {
|
|
+ if (event.shouldPlayDeathSound() && event.getDeathSound() != null && event.getDeathSoundCategory() != null) {
|
|
+ EntityHuman source = victim instanceof EntityHuman ? (EntityHuman) victim : null;
|
|
+ double x = event.getEntity().getLocation().getX();
|
|
+ double y = event.getEntity().getLocation().getY();
|
|
+ double z = event.getEntity().getLocation().getZ();
|
|
+ net.minecraft.server.SoundEffect soundEffect = org.bukkit.craftbukkit.CraftSound.getSoundEffect(event.getDeathSound());
|
|
+ net.minecraft.server.SoundCategory soundCategory = net.minecraft.server.SoundCategory.valueOf(event.getDeathSoundCategory().name());
|
|
+ victim.world.sendSoundEffect(source, x, y, z, soundEffect, soundCategory, event.getDeathSoundVolume(), event.getDeathSoundPitch());
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
/**
|
|
* Server methods
|
|
*/
|
|
--
|
|
2.25.1
|
|
|