PaperMC/nms-patches/EntityItemFrame.patch

37 lines
1.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityItemFrame.java
+++ b/net/minecraft/server/EntityItemFrame.java
2019-04-23 04:00:00 +02:00
@@ -108,6 +108,11 @@
return false;
2016-11-17 02:41:03 +01:00
} else if (!damagesource.isExplosion() && !this.getItem().isEmpty()) {
2015-02-26 23:41:06 +01:00
if (!this.world.isClientSide) {
+ // CraftBukkit start - fire EntityDamageEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, false) || this.dead) {
+ return true;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
this.b(damagesource.getEntity(), false);
2018-07-15 02:00:00 +02:00
this.a(SoundEffects.ENTITY_ITEM_FRAME_REMOVE_ITEM, 1.0F, 1.0F);
}
2019-04-23 04:00:00 +02:00
@@ -193,6 +198,12 @@
}
2018-10-22 21:00:00 +02:00
public void setItem(ItemStack itemstack, boolean flag) {
+ // CraftBukkit start
+ this.setItem(itemstack, flag, true);
+ }
+
+ public void setItem(ItemStack itemstack, boolean flag, boolean playSound) {
+ // CraftBukkit end
if (!itemstack.isEmpty()) {
itemstack = itemstack.cloneItemStack();
itemstack.setCount(1);
2019-04-23 04:00:00 +02:00
@@ -200,7 +211,7 @@
}
2019-04-23 04:00:00 +02:00
this.getDataWatcher().set(EntityItemFrame.ITEM, itemstack);
- if (!itemstack.isEmpty()) {
+ if (!itemstack.isEmpty() && playSound) { // CraftBukkit
this.a(SoundEffects.ENTITY_ITEM_FRAME_ADD_ITEM, 1.0F, 1.0F);
}