From 3f9f31c3ce43200f973179fcd117c38bc82d352e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 25 May 2019 10:45:24 +1000
Subject: [PATCH] SPIGOT-4982: Armor disappearing while breaking the armor
 stand

---
 nms-patches/EntityArmorStand.patch | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch
index cdbb8f82f2..d1e402d4dd 100644
--- a/nms-patches/EntityArmorStand.patch
+++ b/nms-patches/EntityArmorStand.patch
@@ -101,7 +101,7 @@
          } else {
              this.setHealth(f1);
          }
-@@ -474,7 +510,7 @@
+@@ -474,13 +510,13 @@
      }
  
      private void f(DamageSource damagesource) {
@@ -110,6 +110,13 @@
          this.g(damagesource);
      }
  
+     private void g(DamageSource damagesource) {
+         this.F();
+-        this.d(damagesource);
++        // this.d(damagesource); // CraftBukkit - moved down
+ 
+         ItemStack itemstack;
+         int i;
 @@ -488,7 +524,7 @@
          for (i = 0; i < this.handItems.size(); ++i) {
              itemstack = (ItemStack) this.handItems.get(i);
@@ -119,7 +126,7 @@
                  this.handItems.set(i, ItemStack.a);
              }
          }
-@@ -496,7 +532,7 @@
+@@ -496,10 +532,11 @@
          for (i = 0; i < this.armorItems.size(); ++i) {
              itemstack = (ItemStack) this.armorItems.get(i);
              if (!itemstack.isEmpty()) {
@@ -128,7 +135,11 @@
                  this.armorItems.set(i, ItemStack.a);
              }
          }
-@@ -602,6 +638,7 @@
++        this.d(damagesource); // CraftBukkit - moved from above
+ 
+     }
+ 
+@@ -602,6 +639,7 @@
  
      @Override
      public void killEntity() {