From 006e47f1472843c961e937b8855b0479e12c3a79 Mon Sep 17 00:00:00 2001
From: jmp <jasonpenilla2@me.com>
Date: Fri, 12 Feb 2021 23:36:52 -0800
Subject: [PATCH] Fix #167 `persistent-droppable-entity-display-names` renames
 lead on named mobs

---
 ...mes-from-item-forms-of-entities-to-e.patch | 34 -------------------
 ...40-Changeable-Mob-Left-Handed-Chance.patch |  2 +-
 ...oggle-for-water-sensitive-mob-damage.patch |  2 +-
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch
index ba53ec2a1..327f7a203 100644
--- a/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -43,40 +43,6 @@ index 603910a6f9ecc34be9eb2d4fb28e5c2e20aca90a..72d2eea40c37b5fa627c8deeda180273
                  }
  
                  this.die();
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f939a9739df5eeea7121dd2eed4d48b7b88c16ce..498665a83b6add97873446fff7e7ee66e73699ac 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1374,7 +1374,13 @@ public abstract class EntityInsentient extends EntityLiving {
-             this.by = null;
-             if (!this.world.isClientSide && flag1) {
-                 this.forceDrops = true; // CraftBukkit
--                this.a((IMaterial) Items.LEAD);
-+                // Purpur start
-+                final ItemStack lead = new ItemStack(Items.LEAD);
-+                if (this.world.purpurConfig.persistentDroppableEntityDisplayNames && this.hasCustomName()) {
-+                    lead.setName(this.getCustomName());
-+                }
-+                this.dropItem(lead);
-+                // Purpur end
-                 this.forceDrops = false; // CraftBukkit
-             }
- 
-@@ -1453,7 +1459,13 @@ public abstract class EntityInsentient extends EntityLiving {
-             }
- 
-             if (this.ticksLived > 100) {
--                this.a((IMaterial) Items.LEAD);
-+                // Purpur start
-+                final ItemStack lead = new ItemStack(Items.LEAD);
-+                if (this.world.purpurConfig.persistentDroppableEntityDisplayNames && this.hasCustomName()) {
-+                    lead.setName(this.getCustomName());
-+                }
-+                this.dropItem(lead);
-+                // Purpur end
-                 this.by = null;
-             }
-         }
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
 index 8a95e698d5caa3730954ce1135b0ec37a389dd70..372be937f1cf95775e37931f326f6a77836968f3 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
diff --git a/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch
index ac8eabd84..673c0d4eb 100644
--- a/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 498665a83b6add97873446fff7e7ee66e73699ac..523fdb6a73a918bc04cbc88a440e72a1d934d148 100644
+index f939a9739df5eeea7121dd2eed4d48b7b88c16ce..a4759ebcb327299b53d0617274b32a00ef4e137b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1137,7 +1137,7 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch
index 1f1fb45bb..45d6eb291 100644
--- a/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch
@@ -31,7 +31,7 @@ index beee80c3d8277f2d784fb6b8a4152a871ee020b0..b884addf2ce6f1ef7394658078deb2e7
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 523fdb6a73a918bc04cbc88a440e72a1d934d148..afb64bceb4d39e1d1dd4e89a93b393e1357b764b 100644
+index a4759ebcb327299b53d0617274b32a00ef4e137b..68241ad2a528c386702c2bc77fae289f06852d51 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -786,7 +786,8 @@ public abstract class EntityInsentient extends EntityLiving {