geforkt von Mirrors/Paper
37 Zeilen
1.4 KiB
Diff
37 Zeilen
1.4 KiB
Diff
--- a/net/minecraft/server/EntityItemFrame.java
|
|
+++ b/net/minecraft/server/EntityItemFrame.java
|
|
@@ -97,6 +97,11 @@
|
|
return false;
|
|
} else if (!damagesource.isExplosion() && !this.getItem().isEmpty()) {
|
|
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
|
|
this.b(damagesource.getEntity(), false);
|
|
this.a(SoundEffects.ENTITY_ITEM_FRAME_REMOVE_ITEM, 1.0F, 1.0F);
|
|
}
|
|
@@ -170,6 +175,12 @@
|
|
}
|
|
|
|
private 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);
|
|
@@ -177,7 +188,7 @@
|
|
}
|
|
|
|
this.getDataWatcher().set(EntityItemFrame.e, itemstack);
|
|
- if (!itemstack.isEmpty()) {
|
|
+ if (!itemstack.isEmpty() && playSound) { // CraftBukkit
|
|
this.a(SoundEffects.ENTITY_ITEM_FRAME_ADD_ITEM, 1.0F, 1.0F);
|
|
}
|
|
|