summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-11-29 16:05:55 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-11-29 16:05:55 +0000
commit939f76458e744cd4170d2944dd7c9b05ace721d2 (patch)
treec7dbeea44989581094c4b7511edcd586c208447a /nms-patches
parentf498585eccfc5af8574c121504d482b04c960184 (diff)
downloadcraftbukkit-939f76458e744cd4170d2944dd7c9b05ace721d2.tar
craftbukkit-939f76458e744cd4170d2944dd7c9b05ace721d2.tar.gz
craftbukkit-939f76458e744cd4170d2944dd7c9b05ace721d2.tar.lz
craftbukkit-939f76458e744cd4170d2944dd7c9b05ace721d2.tar.xz
craftbukkit-939f76458e744cd4170d2944dd7c9b05ace721d2.zip
Fire EntityDamageEvent for armor stands
Somewhat of a lazy way of doing it but it will do for now
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityArmorStand.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch
new file mode 100644
index 00000000..9dc6ba25
--- /dev/null
+++ b/nms-patches/EntityArmorStand.patch
@@ -0,0 +1,14 @@
+--- ../work/decompile-8eb82bde//net/minecraft/server/EntityArmorStand.java 2014-11-29 16:03:15.597435308 +0000
++++ src/main/java/net/minecraft/server/EntityArmorStand.java 2014-11-29 16:02:17.625436595 +0000
+@@ -343,6 +343,11 @@
+ }
+
+ public boolean damageEntity(DamageSource damagesource, float f) {
++ // CraftBukkit start
++ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
++ return false;
++ }
++ // CraftBukkit end
+ if (!this.world.isStatic && !this.h) {
+ if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
+ this.die();