From dac2a4a6ae4dcc26ffac0e6d5bc883ce98a676d2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 28 Jan 2018 09:44:16 +1100
Subject: [PATCH] SPIGOT-3784: Reset horse chests after event

---
 nms-patches/EntityHorseChestedAbstract.patch | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nms-patches/EntityHorseChestedAbstract.patch b/nms-patches/EntityHorseChestedAbstract.patch
index 99c2c11ae8..2e49b194b3 100644
--- a/nms-patches/EntityHorseChestedAbstract.patch
+++ b/nms-patches/EntityHorseChestedAbstract.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/EntityHorseChestedAbstract.java
 +++ b/net/minecraft/server/EntityHorseChestedAbstract.java
-@@ -43,7 +43,7 @@
+@@ -43,14 +43,18 @@
      }
  
      public void die(DamageSource damagesource) {
@@ -9,11 +9,15 @@
          if (this.isCarryingChest()) {
              if (!this.world.isClientSide) {
                  this.a(Item.getItemOf(Blocks.CHEST), 1);
-@@ -51,6 +51,7 @@
+             }
  
-             this.setCarryingChest(false);
+-            this.setCarryingChest(false);
++            // this.setCarryingChest(false); // CraftBukkit - moved down
          }
-+        super.die(damagesource); // CraftBukkit
++        // CraftBukkit start
++        super.die(damagesource);
++        this.setCarryingChest(false);
++        // CraftBukkit end
  
      }