From 46226d6a036f0e494203718814c1cc513112051b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 24 Jan 2017 13:39:22 +1100
Subject: [PATCH] SPIGOT-3031: Pigs are not dropping their saddle

---
 nms-patches/EntityPig.patch | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/nms-patches/EntityPig.patch b/nms-patches/EntityPig.patch
index 1eed1c436f..eb84f4f2bc 100644
--- a/nms-patches/EntityPig.patch
+++ b/nms-patches/EntityPig.patch
@@ -9,7 +9,23 @@
  public class EntityPig extends EntityAnimal {
  
      private static final DataWatcherObject<Boolean> bw = DataWatcher.a(EntityPig.class, DataWatcherRegistry.h);
-@@ -156,6 +158,12 @@
+@@ -125,13 +127,14 @@
+     }
+ 
+     public void die(DamageSource damagesource) {
+-        super.die(damagesource);
++        // super.die(damagesource); // CraftBukkit - Moved to end
+         if (!this.world.isClientSide) {
+             if (this.hasSaddle()) {
+                 this.a(Items.SADDLE, 1);
+             }
+ 
+         }
++        super.die(damagesource); // CraftBukkit - Moved from above
+     }
+ 
+     @Nullable
+@@ -156,6 +159,12 @@
          if (!this.world.isClientSide && !this.dead) {
              EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
  
@@ -22,7 +38,7 @@
              entitypigzombie.setSlot(EnumItemSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
              entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
              entitypigzombie.setAI(this.hasAI());
-@@ -164,7 +172,8 @@
+@@ -164,7 +173,8 @@
                  entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
              }