summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-05 23:42:08 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-05 23:42:08 +0000
commitadc129ab3df608e546d4f5ea0c9a271387b31180 (patch)
tree4ef9a494cc6d0f23cbb70572e14305e22e1e3242 /nms-patches
parentcc2b09de09517e185d45dcfe9ec461796fd6523f (diff)
downloadcraftbukkit-adc129ab3df608e546d4f5ea0c9a271387b31180.tar
craftbukkit-adc129ab3df608e546d4f5ea0c9a271387b31180.tar.gz
craftbukkit-adc129ab3df608e546d4f5ea0c9a271387b31180.tar.lz
craftbukkit-adc129ab3df608e546d4f5ea0c9a271387b31180.tar.xz
craftbukkit-adc129ab3df608e546d4f5ea0c9a271387b31180.zip
Readd missed diff in EntityEnderCrystal
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityEnderCrystal.patch16
1 files changed, 13 insertions, 3 deletions
diff --git a/nms-patches/EntityEnderCrystal.patch b/nms-patches/EntityEnderCrystal.patch
index 5a165ce2..3a95eb74 100644
--- a/nms-patches/EntityEnderCrystal.patch
+++ b/nms-patches/EntityEnderCrystal.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityEnderCrystal.java 2014-11-28 17:43:43.081707435 +0000
-+++ src/main/java/net/minecraft/server/EntityEnderCrystal.java 2014-11-28 17:38:19.000000000 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/EntityEnderCrystal.java 2014-12-05 23:41:59.577572184 +0000
++++ src/main/java/net/minecraft/server/EntityEnderCrystal.java 2014-12-05 23:41:54.069572306 +0000
@@ -1,5 +1,10 @@
package net.minecraft.server;
@@ -24,7 +24,17 @@
}
}
-@@ -54,7 +63,15 @@
+@@ -50,11 +59,25 @@
+ return false;
+ } else {
+ if (!this.dead && !this.world.isStatic) {
++ // CraftBukkit start - All non-living entities need this
++ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
++ return false;
++ }
++ // CraftBukkit end
++
+ this.b = 0;
if (this.b <= 0) {
this.die();
if (!this.world.isStatic) {