Get rid of a second stack overflow

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java

@@ -128,7 +128,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java

@@ -125,7 +125,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java

@@ -150,17 +150,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
-                return super.isLeashed();
-            }
-            boolean protectedDefault = npc.isProtected();
-            if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) {
-                return super.isLeashed();
-            }
-            if (super.isLeashed()) {
-                unleash(true, false); // clearLeash with client update
-            }
-            return false; // shouldLeash
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java

@@ -161,7 +161,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java

@@ -176,7 +176,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java

@@ -160,7 +160,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java

@@ -124,7 +124,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java

@@ -149,7 +149,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java

@@ -149,7 +149,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java

@@ -116,7 +116,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java

@@ -135,7 +135,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java

@@ -136,7 +136,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java

@@ -166,7 +166,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java

@@ -135,7 +135,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java

@@ -148,7 +148,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java

@@ -157,7 +157,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java

@@ -153,7 +153,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java

@@ -156,7 +156,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java

@@ -136,7 +136,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java

@@ -122,7 +122,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java

@@ -153,7 +153,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java

@@ -146,7 +146,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java

@@ -136,7 +136,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java

@@ -135,7 +135,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java

@@ -135,7 +135,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java

@@ -149,7 +149,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java

@@ -135,7 +135,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java

@@ -135,7 +135,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java

@@ -135,7 +135,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java

@@ -169,7 +169,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java

@@ -135,7 +135,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java

@@ -116,7 +116,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java

@@ -149,7 +149,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java

@@ -135,7 +135,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java

@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -1801,8 +1802,8 @@ public class NMSImpl implements NMSBridge {
         }
     }
 
-    public static boolean isLeashed(NPC npc, EntityInsentient entity) {
-        return NMS.isLeashed(npc, entity::isLeashed, () -> entity.unleash(true, false));
+    public static boolean isLeashed(NPC npc, Supplier<Boolean> isLeashed, EntityInsentient entity) {
+        return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false));
     }
 
     public static boolean isNavigationFinished(NavigationAbstract navigation) {

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java

@@ -129,16 +129,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
-                return super.isLeashed();
-            }
-            boolean protectedDefault = npc.isProtected();
-            if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault))
-                return super.isLeashed();
-            if (super.isLeashed()) {
-                unleash(true, false); // clearLeash with client update
-            }
-            return false; // shouldLeash
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java

@@ -126,7 +126,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java

@@ -151,17 +151,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
-                return super.isLeashed();
-            }
-            boolean protectedDefault = npc.isProtected();
-            if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) {
-                return super.isLeashed();
-            }
-            if (super.isLeashed()) {
-                unleash(true, false); // clearLeash with client update
-            }
-            return false; // shouldLeash
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java

@@ -162,7 +162,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java

@@ -177,7 +177,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java

@@ -153,7 +153,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java

@@ -125,7 +125,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java

@@ -150,7 +150,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java

@@ -150,7 +150,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java

@@ -137,7 +137,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java

@@ -117,7 +117,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java

@@ -136,7 +136,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java

@@ -137,7 +137,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java

@@ -137,7 +137,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java

@@ -159,7 +159,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java

@@ -159,7 +159,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java

@@ -159,7 +159,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java

@@ -160,7 +160,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java

@@ -160,7 +160,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java

@@ -136,7 +136,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java

@@ -159,7 +159,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java

@@ -157,7 +157,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java

@@ -157,7 +157,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java

@@ -154,7 +154,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java

@@ -155,7 +155,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java

@@ -137,7 +137,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java

@@ -123,16 +123,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
-                return super.isLeashed();
-            }
-            boolean protectedDefault = npc.isProtected();
-            if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault))
-                return super.isLeashed();
-            if (super.isLeashed()) {
-                unleash(true, false); // clearLeash with client update
-            }
-            return false; // shouldLeash
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java

@@ -154,7 +154,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java

@@ -147,7 +147,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java

@@ -146,7 +146,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java

@@ -135,7 +135,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java

@@ -135,7 +135,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java

@@ -135,7 +135,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java

@@ -135,7 +135,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java

@@ -157,7 +157,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java

@@ -135,7 +135,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java

@@ -135,7 +135,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java

@@ -135,7 +135,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java

@@ -114,16 +114,7 @@ public class VexController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
-                return super.isLeashed();
-            }
-            boolean protectedDefault = npc.isProtected();
-            if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault))
-                return super.isLeashed();
-            if (super.isLeashed()) {
-                unleash(true, false); // clearLeash with client update
-            }
-            return false; // shouldLeash
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java

@@ -176,7 +176,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java

@@ -147,7 +147,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java

@@ -135,7 +135,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java

@@ -116,7 +116,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java

@@ -149,7 +149,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java

@@ -135,7 +135,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java

@@ -135,7 +135,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java

@@ -135,7 +135,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java

@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -1867,8 +1868,8 @@ public class NMSImpl implements NMSBridge {
         }
     }
 
-    public static boolean isLeashed(NPC npc, EntityInsentient entity) {
-        return NMS.isLeashed(npc, entity::isLeashed, () -> entity.unleash(true, false));
+    public static boolean isLeashed(NPC npc, Supplier<Boolean> isLeashed, EntityInsentient entity) {
+        return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false));
     }
 
     public static boolean isNavigationFinished(NavigationAbstract navigation) {

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java

@@ -130,16 +130,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
-                return super.isLeashed();
-            }
-            boolean protectedDefault = npc.isProtected();
-            if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault))
-                return super.isLeashed();
-            if (super.isLeashed()) {
-                unleash(true, false); // clearLeash with client update
-            }
-            return false; // shouldLeash
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java

@@ -127,7 +127,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java

@@ -152,17 +152,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
-                return super.isLeashed();
-            }
-            boolean protectedDefault = npc.isProtected();
-            if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) {
-                return super.isLeashed();
-            }
-            if (super.isLeashed()) {
-                unleash(true, false); // clearLeash with client update
-            }
-            return false; // shouldLeash
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java

@@ -163,7 +163,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java

@@ -178,7 +178,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java

@@ -154,7 +154,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java

@@ -126,7 +126,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java

@@ -151,7 +151,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java

@@ -151,7 +151,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java

@@ -138,7 +138,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java

@@ -118,7 +118,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java

@@ -137,7 +137,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java

@@ -138,7 +138,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java

@@ -138,7 +138,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java

@@ -175,7 +175,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java

@@ -175,7 +175,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java

@@ -175,7 +175,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            return NMSImpl.isLeashed(npc, this);
+            return NMSImpl.isLeashed(npc, super::isLeashed, this);
         }
 
         @Override