summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityItemFrame.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityItemFrame.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityItemFrame.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
index 12d05064..8d39f5f4 100644
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
@@ -23,7 +23,7 @@ public class EntityItemFrame extends EntityHanging {
return false;
} else if (this.getItem() != null) {
if (!this.world.isStatic) {
- // CraftBukkit start
+ // CraftBukkit start - fire EntityDamageEvent
org.bukkit.event.entity.EntityDamageEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.handleEntityDamageEvent(this, damagesource, f);
if ((event != null && event.isCancelled()) || this.dead) {
return true;
@@ -136,7 +136,7 @@ public class EntityItemFrame extends EntityHanging {
public boolean c(EntityHuman entityhuman) {
if (this.getItem() == null) {
- ItemStack itemstack = entityhuman.be();
+ ItemStack itemstack = entityhuman.bd();
if (itemstack != null && !this.world.isStatic) {
this.setItem(itemstack);