diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
| commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
| tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/EntityItemFrame.patch | |
| parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
| download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip | |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/EntityItemFrame.patch')
| -rw-r--r-- | nms-patches/EntityItemFrame.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nms-patches/EntityItemFrame.patch b/nms-patches/EntityItemFrame.patch index 753d8ff6..05b65d95 100644 --- a/nms-patches/EntityItemFrame.patch +++ b/nms-patches/EntityItemFrame.patch @@ -1,15 +1,14 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityItemFrame.java 2014-11-28 17:43:43.113707435 +0000 -+++ src/main/java/net/minecraft/server/EntityItemFrame.java 2014-11-28 17:38:20.000000000 +0000 -@@ -27,6 +27,12 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/EntityItemFrame.java 2015-02-26 22:40:22.583608139 +0000 ++++ src/main/java/net/minecraft/server/EntityItemFrame.java 2015-02-26 22:40:22.587608139 +0000 +@@ -27,6 +27,11 @@ return false; } else if (!damagesource.isExplosion() && this.getItem() != null) { - if (!this.world.isStatic) { + if (!this.world.isClientSide) { + // CraftBukkit start - fire EntityDamageEvent + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, false) || this.dead) { + return true; + } + // CraftBukkit end -+ this.a(damagesource.getEntity(), false); this.setItem((ItemStack) null); } |