SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
paper-server/nms-patches/EntityItemFrame.patch
View File

@@ -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);
}