From aa53cef96f9f2124e824ef1a6aad47f9edcaa19e Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sat, 25 Dec 2021 09:39:27 +1100
Subject: [PATCH] SPIGOT-5627: Leads vanish when transporting leashed entities
 through a Nether portal

By: DerFrZocker <derrieple@gmail.com>
---
 .../minecraft/world/entity/EntityInsentient.patch  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/paper-server/nms-patches/net/minecraft/world/entity/EntityInsentient.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityInsentient.patch
index 8dbdb2e908..e8c6e6946a 100644
--- a/paper-server/nms-patches/net/minecraft/world/entity/EntityInsentient.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/EntityInsentient.patch
@@ -285,7 +285,17 @@
              this.dropLeash(true, true);
          }
  
-@@ -1412,7 +1523,14 @@
+@@ -1341,7 +1452,9 @@
+             }
+ 
+             if (this.tickCount > 100) {
++                this.forceDrops = true; // CraftBukkit
+                 this.spawnAtLocation((IMaterial) Items.LEAD);
++                this.forceDrops = false; // CraftBukkit
+                 this.leashInfoTag = null;
+             }
+         }
+@@ -1412,7 +1525,14 @@
          int i = EnchantmentManager.getFireAspect(this);
  
          if (i > 0) {
@@ -301,7 +311,7 @@
          }
  
          boolean flag = entity.hurt(DamageSource.mobAttack(this), f);
-@@ -1480,9 +1598,10 @@
+@@ -1480,9 +1600,10 @@
      @Override
      protected void removeAfterChangingDimensions() {
          super.removeAfterChangingDimensions();