diff options
| author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2014-03-20 22:26:30 -0600 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2014-03-21 23:56:34 -0400 |
| commit | 385ace970ee7b7912419d601b8a0867c4c2794df (patch) | |
| tree | 2549da069930b488940f8a99833c396ffc7e36d1 /src/main/java/net/minecraft/server/EntityItemFrame.java | |
| parent | afb3511a4a5a63007217f2dbbbbc753f3bee0aed (diff) | |
| download | craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.gz craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.lz craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.xz craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.zip | |
Update CraftBukkit to Minecraft 1.7.5
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityItemFrame.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityItemFrame.java | 4 |
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); |