summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2014-08-02 16:03:50 -0500
committerfeildmaster <admin@feildmaster.com>2014-08-02 16:12:03 -0500
commit971329c42b2a4242da1f5789ce6759c810779a6f (patch)
treee48473fc8ea08e0ecb30d95272622502c1cbc5bf /src/main/java/net/minecraft
parent594d7cb8c91943eeb0f2508a4e7b2c128d310f09 (diff)
downloadcraftbukkit-971329c42b2a4242da1f5789ce6759c810779a6f.tar
craftbukkit-971329c42b2a4242da1f5789ce6759c810779a6f.tar.gz
craftbukkit-971329c42b2a4242da1f5789ce6759c810779a6f.tar.lz
craftbukkit-971329c42b2a4242da1f5789ce6759c810779a6f.tar.xz
craftbukkit-971329c42b2a4242da1f5789ce6759c810779a6f.zip
Fix removal of items from Item Frames. Fixes BUKKIT-5736
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/EntityItemFrame.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
index 1edb6d31..d1d73f91 100644
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
@@ -24,7 +24,7 @@ public class EntityItemFrame extends EntityHanging {
} else if (this.getItem() != null) {
if (!this.world.isStatic) {
// CraftBukkit start - fire EntityDamageEvent
- if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f) || this.dead) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, false) || this.dead) {
return true;
}
// CraftBukkit end