2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/EntityItemFrame.java
|
|
|
|
+++ b/net/minecraft/server/EntityItemFrame.java
|
2018-12-06 00:00:00 +01:00
|
|
|
@@ -95,6 +95,11 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
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) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // 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);
|
|
|
|
}
|
2018-12-06 00:00:00 +01:00
|
|
|
@@ -168,6 +173,12 @@
|
2018-09-11 09:09:10 +02:00
|
|
|
}
|
|
|
|
|
2018-10-22 21:00:00 +02:00
|
|
|
public void setItem(ItemStack itemstack, boolean flag) {
|
2018-09-11 09:09:10 +02:00
|
|
|
+ // 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);
|
2018-12-06 00:00:00 +01:00
|
|
|
@@ -175,7 +186,7 @@
|
2018-09-11 09:09:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|