17 lines
668 B
Diff
17 lines
668 B
Diff
|
--- ../src-base/minecraft/net/minecraft/entity/item/EntityItemFrame.java
|
||
|
|
+++ ../src-work/minecraft/net/minecraft/entity/item/EntityItemFrame.java
|
||
|
|
@@ -45,6 +45,13 @@
|
||
|
|
{
|
||
|
|
if (!this.worldObj.isRemote)
|
||
|
|
{
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, p_70097_1_, p_70097_2_) || this.isDead)
|
||
|
|
+ {
|
||
|
|
+ return true;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
+
|
||
|
|
this.func_146065_b(p_70097_1_.getEntity(), false);
|
||
|
|
this.setDisplayedItem((ItemStack)null);
|
||
|
|
}
|