diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch
new file mode 100644
index 0000000000..9dc6ba254b
--- /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();