diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java index 25208db16..c59f97111 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java index 863de7dc6..28985873d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java index fd120198c..a8a2f28e0 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java index d08703f6e..d8b2a4560 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java index 580b9e093..fe2cade47 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java index e4bf9795b..192a80296 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java index 05c5d2a98..a4c7d6b57 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java index 68a9249f6..7409e410c 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java index 2f70caa98..019c15413 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java index 234094793..98e1db500 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java index be82f12a2..8cf66b8ed 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java index d06814b56..bfe4be44d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java index 522d51abb..089c9437e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java index b6d1f2fa5..80a95e61b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java index c3be69a26..031e74dcf 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java index b7aaf3001..cf2e13348 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java index a789fdb33..af89012ac 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java index ae75d5493..714ae571d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java index 018fc8c0a..51b9d7880 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java index 7fca2c1f1..7eefd5bab 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java index b10356f67..cc161923f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java index 4e50fb1b7..608211979 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java index ff68daa68..f769849ae 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java index 542d072ed..022e2aab2 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java index c2a26ecb3..2ba09c1d9 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java index 828d48b6a..c9ac01ee4 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java index d944e212c..81049118a 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java index 8db6299e0..02c0be308 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java index c008c9826..7b3c69af1 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java index 52822966e..f6e2a58c1 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java index 53167fc9b..a9c2d0e20 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java index c396b58b3..84d6c2f3c 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java index 41d322185..a1554db56 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java index b03399483..89c3ea6e4 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index 9291f8ef0..82d08fb07 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/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 isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java index 88d61d423..f172c4397 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java index 615c63b9d..90a9b5955 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java index 5671676f8..944ba63ac 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java index b02526034..4409607fb 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java index b62389073..93f2d7738 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java index b77a52703..35c3759f6 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java index 4f2340c95..8f344ca99 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java index fcb190e34..8d427a2c1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java index a71327b98..2b07b50ab 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java index 1857bf544..f2e1ee6c8 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java index c00d87efb..b84d5714e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java index 288581314..cae8c0596 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java index 4d087f27c..032f630ac 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java index b202d25be..e6d9e88bb 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java index 8395f5e55..eb6d15038 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java index b49ebe6b2..05b8c8b2c 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java index a2e76a501..74bc63b55 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java index 36183282b..e85b92507 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java index ded4eb56f..8647daf9c 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java index 6e2aea30e..97d475c85 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java index a12f1bd15..c33130c25 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java index f5fdafdfa..18b8198f4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java index f6b173e43..ec00cb4b5 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java index b25774309..6c3883f5c 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java index 7ffaa4e94..363e4f82f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java index 72b0835ac..2abebecd9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java index bca09a3e0..65c067772 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java index d52013d9b..f1e53b635 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java index 1a39e4413..538fa915a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java index 7ffd5f5f8..32570490a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java index 49f5882a5..7896997b6 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java index 7533ddfb8..a88aaa270 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java index 674813017..95d0170ff 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java index 58f5aa26a..e20c13a31 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java index 091dc1b31..330a149e0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java index 93e6c2162..a442f38a0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java index 201b68c95..4b37277ce 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java index 0bab5daed..e9f3c4883 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java index e87f0f6df..56f361e17 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java index b12c9df19..45aefa9c2 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java index 78b0d6b02..228cbf054 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java index 6f1e18c64..188545b33 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java index 3b3176360..56efa8e74 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java index bd58b8177..29115e223 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java index bfca0bbe5..bbcad8831 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java index c5da27a85..3ae3d549b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java index b67c61781..e1b97bd15 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java index 1751cfe79..0e8fc6ca8 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java +++ b/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 isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java index 871a2f089..b16dbd273 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java index 824204fbe..7edeade83 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java index eb07404e5..0ed73dfc1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java index da1db5f0c..01f8f6770 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java index f0415b45e..e8ed352c3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java index 8ab94b737..64c2a8cf8 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java index 16d13bd2c..535a80bb4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java index 12b894db6..cd9604b08 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java index c684ed315..9ca1fc4f4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java index 4e10a08b2..52baa0819 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java index 6d0b45b4c..62873fafb 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java index fa1d4e60d..1e1e1640f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java index 84e3d5e65..adde2d5de 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java index 4bb77a48f..a448d6c52 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java index 830857976..1940624e2 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java index 224b3b223..e33121414 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java index 1edd330ed..4dfb5d7bf 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java index 3191fe5b3..362075ab7 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java @@ -176,7 +176,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java index 213009cf4..8220e459c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java @@ -176,7 +176,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java index 55dad6fa4..89a89dab1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java @@ -137,7 +137,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java index 21255bcaa..ced17e959 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java @@ -137,7 +137,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java index 199565438..0c7a21b99 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java @@ -160,7 +160,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java index 352c1f6e7..c3110e52e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java @@ -158,7 +158,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java index d891b09c2..36d36ca83 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java @@ -158,7 +158,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java index 93fccb5ca..c89f1098d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java @@ -156,7 +156,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java index 33a383688..1cb941958 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java @@ -124,16 +124,7 @@ public class ParrotController 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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java index 9e2bfc910..a4d8d9191 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java index b14cc1fca..9d35f0406 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java @@ -138,7 +138,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java index 3cef599dd..fc809a8b3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java @@ -124,16 +124,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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java index ad298a6c4..21592ac5a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java @@ -155,7 +155,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java index cfaccb916..f010ad59c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java @@ -148,7 +148,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java index 60e2f95d0..58a99388a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java index e56990c57..375c0e64b 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java @@ -136,7 +136,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java index 84de8f329..87fd10f82 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java @@ -136,7 +136,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java index a26adfab7..f86a66eb2 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java @@ -136,7 +136,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java index 2adc9eb46..8360fcba0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java @@ -136,7 +136,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java index 0488294bc..c1036e4db 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java @@ -158,7 +158,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java index ea8f219be..44fdc0661 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java @@ -136,7 +136,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java index 80538eede..52d753c65 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java @@ -136,7 +136,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java index 9ea133377..2b12a6c8d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java @@ -136,7 +136,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java index 3f009ee58..ba4fa5d7d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java @@ -115,16 +115,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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java index 6843d7e38..287f96409 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java @@ -177,7 +177,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java index d046c9778..d8c2a13fd 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java @@ -148,7 +148,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java index e5ef22dce..a935abe15 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java @@ -136,7 +136,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java index fded670c1..49e9fc417 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java @@ -117,7 +117,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java index 0ddc2fb11..b66556213 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java @@ -150,7 +150,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java index 09288ed93..07395d709 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java @@ -136,7 +136,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java index 128884308..4635433c5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java @@ -136,7 +136,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java index 05770d1ae..d11491795 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java @@ -136,7 +136,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java index 8033de3f9..9b2260d83 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_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; @@ -1874,8 +1875,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 isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java index d0d193435..68cc226d4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java @@ -146,16 +146,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 diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java index 0f8d6bb7d..8db3d1cc0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java @@ -143,7 +143,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java index b84d0ff9e..9b5df340b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java @@ -168,17 +168,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 diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java index aafdd9803..154d7c4b9 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java @@ -181,7 +181,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java index d56e8b827..1e1a36655 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java @@ -187,7 +187,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java index 56fa8607e..dfa71c3c6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java @@ -194,7 +194,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java index c42ee7c90..fc1406622 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java @@ -170,7 +170,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java index 497acfada..380150403 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java @@ -181,7 +181,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java index 93f363a85..6bce58b74 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java @@ -166,7 +166,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java index 05c164026..310a7f5ae 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java @@ -144,7 +144,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java index 66fcb010b..c9669673f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java @@ -167,7 +167,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java index bfdada294..bdc53b993 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java @@ -167,7 +167,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java index 0e48b7801..9135beee5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java @@ -154,7 +154,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java index c64c6f00d..e3e875e0f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java @@ -129,7 +129,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java index 8a8a1ef37..51f5a3ccf 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java @@ -153,7 +153,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java index 3fdbacf8b..0e785b9d5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java @@ -156,7 +156,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java index bc87f2172..cf1ce1d55 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java @@ -156,7 +156,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java index 3ec867579..bc4a991a2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java @@ -191,7 +191,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java index 6f46b1d17..dc6f21bb2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java @@ -191,7 +191,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java index e30f1b7cf..5e7684bc4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java @@ -191,7 +191,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java index bcec79807..dca754d52 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java @@ -192,7 +192,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java index bc22c98f2..f98649505 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java @@ -192,7 +192,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java index fd53df9ed..0c2c348c3 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java @@ -153,7 +153,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java index 84fa80bee..b371c85ba 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java @@ -153,7 +153,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java index ee1cf33ef..3850af43f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java @@ -176,7 +176,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java index b09c10e6a..f1febb5aa 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java @@ -166,7 +166,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java index 0182ed3ba..650a24365 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java @@ -174,7 +174,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java index eddc2730f..0bb22602c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java @@ -172,7 +172,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java index 8022a87fb..6a8c31a16 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java @@ -140,16 +140,7 @@ public class ParrotController 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 diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java index 74cfb5109..4f8da708a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java @@ -170,7 +170,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java index cd1bcf85a..97159b19d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java @@ -172,7 +172,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java index f161408d3..8c10c6b6f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java @@ -154,7 +154,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java index 9da3b261a..a44e49b1f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java @@ -140,16 +140,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 diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java index 25e3e3ef7..d9536aa4f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java @@ -175,7 +175,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java index d363dc222..62b8ba3fe 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java @@ -171,7 +171,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java index 0cb379215..6bc4eed69 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java @@ -173,7 +173,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java index f236d9cf0..b5d99170f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java @@ -164,7 +164,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java index c5980bb9f..d1ca079c7 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java @@ -155,7 +155,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java index e5a4fa9fb..a060a7976 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java @@ -152,7 +152,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java index f8e8b80db..00d6ddf6f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java @@ -152,7 +152,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java index c79874f69..42c9fc3ec 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java @@ -152,7 +152,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java index 44e205a27..81fbc9e0e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java @@ -152,7 +152,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java index be6bef5b3..606344343 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java @@ -166,7 +166,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java index 1eff97dcf..0761eeeec 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java @@ -152,7 +152,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java index a621830b8..a81dbc04e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java @@ -152,7 +152,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java index 204d00708..03a99e56b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java @@ -152,7 +152,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java index c6170eed5..f07e4adc9 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java @@ -173,7 +173,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java index c12f57028..3cdf2100f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java @@ -161,7 +161,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java index 8c6bb554c..329d70a3d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java @@ -131,16 +131,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 diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java index 4faedfd7f..00cebae83 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java @@ -193,7 +193,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java index 9aa4e6eae..3a2ac3bff 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java @@ -164,7 +164,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java index e1bab8e20..73516e99c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java @@ -152,7 +152,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java index 3d5858daf..f37ceb270 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java @@ -133,7 +133,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java index 29a14e0bd..041aea74e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java @@ -166,7 +166,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java index d3022ffef..5d333aecc 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java @@ -152,7 +152,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java index 7c2ba4249..464bd53e4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java @@ -152,7 +152,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java index b52aa40d9..6c435d729 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java @@ -152,7 +152,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index b9ba7a522..5852c9c55 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -1989,8 +1989,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 isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java index 56aacdd12..c2398a618 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java @@ -147,16 +147,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 diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java index e49cfe119..8d152d62d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java @@ -144,7 +144,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java index 90d4e2c9f..10749a67a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java @@ -192,7 +192,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java index 795789976..a240e9d04 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java @@ -179,17 +179,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 diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java index 98b2a7a39..f5f7b0a6b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java @@ -193,7 +193,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java index 663ce87e7..caa12b807 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java @@ -199,7 +199,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java index 2df5b1478..f9ad71384 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java @@ -207,7 +207,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java index 94c16f578..0d8522795 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java @@ -181,7 +181,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java index 24845b3b7..887127589 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java @@ -194,7 +194,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java index c535ad0b6..94639bc50 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java @@ -178,7 +178,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java index 4e9ab87d3..009186993 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java @@ -144,7 +144,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java index 850f76aa7..b252a63ff 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java @@ -186,7 +186,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java index ac2013d1a..682a715ee 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java @@ -178,7 +178,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java index d1c05b612..e237d4c56 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java @@ -165,7 +165,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java index 2c81f71d1..13330ea52 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java @@ -178,7 +178,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java index 874a87997..744d6df24 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java @@ -130,7 +130,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java index 004e5a2ad..e227d264e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java @@ -164,7 +164,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java index 516a3c866..d1f4c9e84 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java @@ -165,7 +165,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java index c18df4842..94fd9c906 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java @@ -165,7 +165,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java index 0b5bb3e2e..5ae210959 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java @@ -211,7 +211,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java index e4542185f..ffe2e3208 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java @@ -210,7 +210,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java index 749ed679a..bc069c434 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java @@ -210,7 +210,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java index 01be42ff8..e9cf0c6ec 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java @@ -211,7 +211,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java index 4fd1e55fd..1a0c76e49 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java @@ -211,7 +211,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java index 1094296fb..06bc8e134 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java @@ -165,7 +165,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java index d4809300a..1a2aebdd7 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java @@ -164,7 +164,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java index f1011e7ba..290d8a320 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java @@ -190,7 +190,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java index ccd9fa4a3..8a347dec8 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java @@ -170,7 +170,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java index a8df28dee..416afb24f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java @@ -188,7 +188,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java index 6b1cd05fe..804407fc5 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java @@ -186,7 +186,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java index 46b37268d..eb1c90d03 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java @@ -178,7 +178,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java index 2ee27a9c2..9dca69576 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java @@ -141,16 +141,7 @@ public class ParrotController 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 diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java index 1797a3d0f..8cfe4cc94 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java @@ -179,7 +179,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java index aef17406d..ff2b7b4f0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java @@ -186,7 +186,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java index 81748f291..f147996ba 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java @@ -165,7 +165,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java index 4bc4714bd..1ee9935b0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java @@ -178,7 +178,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java index 59073866c..3c5a22b92 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java @@ -144,16 +144,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 diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java index 555957a39..bfcb399cf 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java @@ -197,7 +197,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java index b83f1278d..507805816 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java @@ -185,7 +185,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java index 5777319ae..d067d7c08 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java @@ -178,7 +178,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java index 437b1928a..2b957db0d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java @@ -185,7 +185,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java index 4ce3f6c90..5d8621af4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java @@ -178,7 +178,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java index 5fae791f2..c28a7dffe 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java @@ -165,7 +165,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java index 050f098ce..907c755ca 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java @@ -164,7 +164,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java index d8cbedb2a..e36b7625b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java @@ -164,7 +164,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java index 56577cd5a..00719393e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java @@ -164,7 +164,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java index 05b8d9ea8..7011aa528 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java @@ -164,7 +164,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java index 373a21dba..cacc214a6 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java @@ -171,7 +171,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java index 414e2a5f7..403781c60 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java @@ -164,7 +164,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java index bace666af..906cd896f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java @@ -164,7 +164,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java index 82d14afb6..5a9696513 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java @@ -164,7 +164,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java index 1f43901ef..aedf02925 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java @@ -193,7 +193,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java index 0a3bd61f6..d6b12d6c2 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java @@ -185,7 +185,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java index a263b1af0..6ef52e757 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java @@ -173,7 +173,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java index 3d4dd9d34..cba5a7745 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java @@ -213,7 +213,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java index 82dbe9f19..df60598ea 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java @@ -179,7 +179,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java index 4b8efe4e7..48873eb67 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java @@ -215,7 +215,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java index 1fc3b697c..56c02adcd 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java @@ -164,7 +164,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java index a9fee009c..4a2622249 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java @@ -135,7 +135,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java index 4a71ced57..a47e128ac 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java @@ -181,7 +181,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java index 0c81d24fa..cc67df448 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java @@ -164,7 +164,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java index 903fb8933..e1303bb55 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java @@ -164,7 +164,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java index 4d62f0343..7655d610b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java @@ -164,7 +164,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index 7773810ba..31b310893 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -2057,8 +2057,8 @@ public class NMSImpl implements NMSBridge { network.socketAddress = socketAddress; } - 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 isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java index 8dc7da0d1..e733b73aa 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java @@ -140,16 +140,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 diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java index 5e49ba9f2..d8c82f53a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java @@ -137,16 +137,7 @@ public class BeeController 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 diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java index 8b2f4a64b..21771708b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java @@ -137,7 +137,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java index b8a015e88..efaa7177d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java @@ -186,7 +186,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java index a04637e24..bd02b38c7 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java @@ -173,17 +173,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 diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java index d37e6029b..d2ba905e8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java @@ -187,7 +187,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java index 318aded32..9405f56f7 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java @@ -197,7 +197,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java index a2349d6a3..b0c8bf874 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java @@ -201,7 +201,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java index 86ed43700..cf5b350e1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java @@ -175,7 +175,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java index ae3ea9b21..badc0f3f5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java @@ -192,7 +192,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java index 7e3e23b08..015387c89 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java @@ -172,7 +172,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java index b9af0f498..72df78a3e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java @@ -137,7 +137,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java index 4c5e0806d..9b6d2c0d1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java @@ -180,7 +180,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java index c00ff88d1..bbe265808 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java @@ -172,7 +172,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java index ecebc4999..e43ee6460 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java @@ -167,7 +167,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java index c88f10ae9..56d3f64e6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java @@ -180,7 +180,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java index e8977853e..36e7f58a3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java @@ -131,7 +131,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java index 1630448a7..4b98c56b8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java @@ -166,7 +166,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java index 7212ec5c8..b37251f0d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java @@ -167,7 +167,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java index ad8ef49a7..4380d9892 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java @@ -167,7 +167,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java index a915e5820..6297548de 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java @@ -213,7 +213,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java index 408cf97f1..44f42d6e8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java @@ -212,7 +212,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java index e9c8ca81d..8ec86ea2b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java @@ -212,7 +212,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java index 497ceac86..f874750a2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java @@ -213,7 +213,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java index 40cdcc84c..a905f197e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java @@ -213,7 +213,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java index 8b6c133a3..14c364186 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java @@ -167,7 +167,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java index d9b4fd018..2062ad024 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java @@ -166,7 +166,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java index a09444895..4e2412b5a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java @@ -192,7 +192,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java index 142e71a40..7bebdf082 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java @@ -176,7 +176,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java index 1b49f3405..64599a124 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java @@ -190,7 +190,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java index b269ad15d..713d37436 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java @@ -182,7 +182,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java index d17740dec..e84d54a14 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java @@ -180,7 +180,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java index ca6434aaf..a1c350089 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java @@ -142,16 +142,7 @@ public class ParrotController 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 diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java index 8f1f8ef78..045ee251f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java @@ -187,7 +187,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java index e82e40dc6..69ca0c966 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java @@ -188,7 +188,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java index 301570caf..df38480ea 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java @@ -167,7 +167,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java index c27886e36..b89a75777 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java @@ -180,7 +180,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java index 53436811a..481bd123f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java @@ -145,16 +145,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 diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java index a1665aafb..99ccf5d68 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java @@ -203,7 +203,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java index c3da2fe3d..02d2c8cf6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java @@ -187,7 +187,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java index 50e437c26..a13c8c86d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java @@ -180,7 +180,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java index 63308491f..83860f94a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java @@ -191,7 +191,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java index dcaa39373..211cbb2e6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java @@ -180,7 +180,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java index 2916793d5..63837ff1d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java @@ -167,7 +167,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java index c9006fab0..5ee1e16f3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java @@ -166,7 +166,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java index 185db4212..93f88fec8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java @@ -166,7 +166,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java index 4666d8c15..1b06c8fb2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java @@ -166,7 +166,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java index 5d27eb2b4..bc7f70eba 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java @@ -166,7 +166,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java index 7ab0ff653..128a263dc 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java @@ -177,7 +177,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java index d73700427..d0292edcd 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java @@ -166,7 +166,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java index 42f112fd5..fa4946c82 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java @@ -166,7 +166,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java index 181bc06a7..8939a58de 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java @@ -166,7 +166,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java index fa46a42dd..956e8f4bf 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java @@ -195,7 +195,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java index 077535f01..caeb85870 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java @@ -191,7 +191,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java index 51ae8b5a7..2d7ab3e47 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java @@ -182,7 +182,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java index 745447473..34ffb47d6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java @@ -134,16 +134,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 diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java index 1ef7b0f36..bf0edd18c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java @@ -214,7 +214,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java index 913ebf250..f2b838757 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java @@ -181,7 +181,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java index d1aa2b685..180c49d5c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java @@ -215,7 +215,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java index 184c5ce2d..0c544b1fe 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java @@ -165,7 +165,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java index 63a372ecc..91df64ab5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java @@ -130,7 +130,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java index 37ea35642..08f557ebb 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java @@ -183,7 +183,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java index 715b96ecf..3ff9aba36 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java @@ -166,7 +166,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java index 171908432..35e7f4bdf 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java @@ -166,7 +166,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java index 51254cfdc..79b24bed1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java @@ -166,7 +166,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index 1dff84a0d..01c9634c1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -2101,8 +2101,8 @@ public class NMSImpl implements NMSBridge { network.socketAddress = socketAddress; } - 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 isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java index 53d8a7fb1..3cf66a632 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java @@ -140,16 +140,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 diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java index 8b3a4f937..5dd4ed581 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java @@ -137,16 +137,7 @@ public class BeeController 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 diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java index b730e6e61..38b62ce5e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java @@ -137,7 +137,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java index 76cfa34b8..f32e587f9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java @@ -186,7 +186,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java index 17cccd237..7f13c278f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java @@ -173,17 +173,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 diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java index 092c0252e..88e0dd41b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java @@ -187,7 +187,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java index aa60d598c..346fe0d42 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java @@ -198,7 +198,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java index dd21bbe04..ca543277e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java @@ -202,7 +202,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java index 54ae767cc..f7c27b93d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java @@ -176,7 +176,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java index 1eacef1bf..42282e0d5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java @@ -192,7 +192,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java index bceee9e5f..e98bedce9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java @@ -172,7 +172,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java index e22544a1b..6eb6c3144 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java @@ -137,7 +137,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java index 864adcf43..aad45b62a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java @@ -180,7 +180,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java index 85f142582..7e1012564 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java @@ -172,7 +172,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java index c15ed97ed..2875f6a26 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java @@ -167,7 +167,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java index 99e5116e6..3307990a7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java @@ -180,7 +180,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java index 6d2a7c3f3..f4b61815b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java @@ -131,7 +131,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java index 7bd6d3e8b..0c52e03f4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java @@ -166,7 +166,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java index f47576fc0..ecbcb0ee4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java @@ -167,7 +167,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java index ef8110666..801a64e9b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java @@ -167,7 +167,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java index 6ba8108ef..2e794416f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java @@ -166,7 +166,7 @@ public class HoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java index 33f6e5731..2621117b6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java @@ -213,7 +213,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java index 6a7de214b..69209272b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java @@ -209,7 +209,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java index d585ebdf1..fd2f38f1e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java @@ -209,7 +209,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java index 193b345bf..d8e31d2bd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java @@ -213,7 +213,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java index e827e4b56..6c4a74808 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java @@ -210,7 +210,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java index 68c942b4a..4932fb543 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java @@ -167,7 +167,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java index 711b80787..0c73da07d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java @@ -166,7 +166,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java index 989d9d472..653e8396f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java @@ -192,7 +192,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java index bd582cb83..e0aeef04e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java @@ -176,7 +176,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java index 09887be46..b8e230554 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java @@ -191,7 +191,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java index 3ad69febd..e93f624e0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java @@ -182,7 +182,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java index a804f90a3..8936d2f87 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java @@ -180,7 +180,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java index 2d37f1aa9..3252d2c69 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java @@ -143,16 +143,7 @@ public class ParrotController 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 diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java index 290a5c87c..59e97b538 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java @@ -201,7 +201,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java index 2a321a9f5..c633434bf 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java @@ -189,7 +189,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java index 57bc8a0bd..42dbb5e76 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java @@ -167,7 +167,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java index c12fb59b6..6c68af69e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java @@ -166,7 +166,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java index 7d0bd6cdd..a7616a43a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java @@ -166,7 +166,7 @@ public class PiglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java index 747197ecd..cefe69ef2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java @@ -180,7 +180,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java index 12a405227..fdf335601 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java @@ -145,16 +145,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 diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java index 4609cea9c..0f7f8db19 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java @@ -204,7 +204,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java index ce18b5901..baaef9102 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java @@ -187,7 +187,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java index ec5a2eef6..582df90fb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java @@ -180,7 +180,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java index d0b18a858..a143c6ceb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java @@ -192,7 +192,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java index 5466878b7..a2c97cf68 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java @@ -180,7 +180,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java index 95bb92a2c..f48477a93 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java @@ -167,7 +167,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java index 69fb8be61..991c92165 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java @@ -166,7 +166,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java index 412a368b0..c9df59209 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java @@ -166,7 +166,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java index 477d242c9..8dbc3ab8a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java @@ -166,7 +166,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java index e6e00a0e9..e1e487814 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java @@ -166,7 +166,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java index 159fd3b94..92285a92c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java @@ -177,7 +177,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java index a3c4c5396..72564c0a0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java @@ -166,7 +166,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java index bbf5c7d8e..16ed2bb7a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java @@ -166,7 +166,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java index 73a0b1e4b..9541b918c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java @@ -166,7 +166,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java index 9c5c8abfe..3cc4dca30 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java @@ -166,7 +166,7 @@ public class StriderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java index 61939293c..7418e6ed5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java @@ -195,7 +195,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java index 4322a1510..77434cae5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java @@ -192,7 +192,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java index 3a8d012a0..dafee6e52 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java @@ -182,7 +182,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java index 7dc07ffd0..5cdbab8ef 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java @@ -134,16 +134,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 diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java index 8d5667c8b..3827ade29 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java @@ -216,7 +216,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java index db632fc72..a0c2a7bbb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java @@ -181,7 +181,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java index 2c1c13290..0c1378eac 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java @@ -219,7 +219,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java index 8c8905cb3..c1b99177d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java @@ -166,7 +166,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java index 38f89576d..df53cf12c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java @@ -130,7 +130,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java index 852204341..68304e30b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java @@ -183,7 +183,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java index 0258052e7..b4574b5ad 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java @@ -166,7 +166,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java index 717a0976d..2313db832 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java @@ -166,7 +166,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java index b5c02d650..f7aa6a145 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java @@ -166,7 +166,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java index 882e043f2..9a48d970d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java @@ -166,7 +166,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index 56457a8b7..fe468564e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -2069,8 +2069,8 @@ public class NMSImpl implements NMSBridge { network.socketAddress = socketAddress; } - 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 isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java index f914bb920..c29eb8b83 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java @@ -142,7 +142,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java index bb43944c0..56efc5859 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BatController extends MobEntityController { public BatController() { @@ -122,16 +121,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java index 126826c04..032743171 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BeeController extends MobEntityController { public BeeController() { @@ -119,16 +118,7 @@ public class BeeController 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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java index 680695417..3e4ecf544 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BlazeController extends MobEntityController { public BlazeController() { @@ -114,7 +113,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java index 2cb5c38c5..2d8b38232 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java @@ -135,7 +135,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java index e85f495c7..031afe26c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java @@ -132,17 +132,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java index ab66981e8..6d93df0c9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java @@ -143,7 +143,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java index a27cf41b7..3847beca1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java @@ -168,7 +168,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java index 4de76d834..32a1dafa6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java @@ -140,7 +140,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java index 6409aa500..60a6732d0 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java @@ -136,7 +136,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java index 2de799808..08e727d38 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java @@ -140,7 +140,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java index 11ef77f29..98e50488c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java @@ -132,7 +132,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java index d02b6de77..8bd5f63be 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java @@ -130,7 +130,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java index 522abe996..4f2b9ee27 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java @@ -139,7 +139,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java index a1bb5c293..111a32ba2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java @@ -132,7 +132,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java index ca24bfaa5..6225f1eb8 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java @@ -126,7 +126,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java index 6dc087583..825c58780 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java @@ -129,7 +129,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java index 9d50fbd2b..1e85a3843 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class GhastController extends MobEntityController { public GhastController() { @@ -114,7 +113,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java index 4b7646a94..2c0724a89 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java @@ -126,7 +126,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java index 8044471c9..cc15ab332 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java @@ -126,7 +126,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java index eac5492e7..d05ff179c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java @@ -129,7 +129,7 @@ public class GoatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java index d915d4f47..14d1457dd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java @@ -132,7 +132,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java index 539deab1b..65bdc0020 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java @@ -132,7 +132,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java index 57b865a87..cc589d177 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java @@ -129,7 +129,7 @@ public class HoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java index 303932d60..e7aa89ce4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java @@ -177,7 +177,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java index 74355748a..723fdb0d2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java @@ -173,7 +173,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java index a2ad154de..4b2cf4ff6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java @@ -176,7 +176,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java index 829e0299f..e7935a8db 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java @@ -176,7 +176,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java index 2289b8d7c..475267c38 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java @@ -176,7 +176,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java index 958b9c27a..3b664968c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java @@ -126,7 +126,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java index 6be418d64..ee73917a9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java @@ -126,7 +126,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java index 4779ceb76..5ef3319c4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java @@ -146,7 +146,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java index cc65ac46a..a819be517 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java @@ -127,7 +127,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java index 0624b7de8..d75ce6931 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java @@ -132,7 +132,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java index b227d079d..14ce92e8b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java @@ -135,7 +135,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java index bbd4403f0..e73988fcd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java @@ -129,7 +129,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java index 55e1bbbec..1e570a777 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java @@ -29,7 +29,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ParrotController extends MobEntityController { public ParrotController() { @@ -118,16 +117,7 @@ public class ParrotController 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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java index 030190f6d..dbb90afc1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java @@ -154,7 +154,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java index eb78970f9..390e3b817 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java @@ -137,7 +137,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java index 47bc3acf4..46d917bf5 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java @@ -127,7 +127,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java index ce08ae7ac..8389552ac 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java @@ -129,7 +129,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java index 7a4b8383e..fe8fd8d97 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java @@ -129,7 +129,7 @@ public class PiglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java index 5618ae51a..96870e4a2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java @@ -129,7 +129,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java index 34966671c..2271f8f4d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java @@ -27,7 +27,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class PolarBearController extends MobEntityController { public PolarBearController() { @@ -112,16 +111,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java index 05a06b8e6..698759a45 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java @@ -171,7 +171,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java index 2ba7dc98c..16ca6de71 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java @@ -138,7 +138,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java index 4258c44bb..fcef7c548 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java @@ -129,7 +129,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java index 0320f5f56..35a96ba3b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java @@ -160,7 +160,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java index f7e0957d7..e552504d3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java @@ -129,7 +129,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java index 83b30ace6..279d5383b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java @@ -130,7 +130,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java index ebf33a53f..d34e16c3c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java @@ -133,7 +133,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java index 486ddb3b8..f316263f6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java @@ -126,7 +126,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java index 96aabebcb..38a739b72 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java @@ -126,7 +126,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java index a1eaa1723..30cb0504d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java @@ -126,7 +126,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java index 2a11ae159..79783be95 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java @@ -127,7 +127,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java index caf290af7..68780cd01 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java @@ -126,7 +126,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java index e510e8288..15a5c7af8 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java @@ -126,7 +126,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java index 90807361e..21dd9f935 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java @@ -126,7 +126,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java index ac81970f8..31a71501f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java @@ -126,7 +126,7 @@ public class StriderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java index bb4db3d48..3e052cb3e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java @@ -147,7 +147,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java index 686655288..effbf8767 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java @@ -162,7 +162,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java index 3c036d9d4..a87c93bb2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java @@ -148,7 +148,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java index 900c58991..2321b4a4f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class VexController extends MobEntityController { public VexController() { @@ -112,16 +111,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java index 02d4136a2..b2b24732c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java @@ -143,7 +143,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java index e4a445ac6..a33644df5 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java @@ -129,7 +129,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java index 3786967e7..9f254d19f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java @@ -146,7 +146,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java index b939a3f8b..19a9acbae 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java @@ -126,7 +126,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java index e577d8b50..bf26ca6cd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class WitherController extends MobEntityController { public WitherController() { @@ -118,7 +117,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java index 8612e4136..59d76d9ef 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java @@ -131,7 +131,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java index 19d9d3783..9de8a1bae 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java @@ -128,7 +128,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java index b4efcc8c3..9e61c99a3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java @@ -126,7 +126,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java index bc783ad36..152d66783 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java @@ -126,7 +126,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java index 80e30acef..ad59115bf 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java @@ -126,7 +126,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java index 29c84e299..66932d176 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class AreaEffectCloudController extends MobEntityController { public AreaEffectCloudController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java index e1742e19d..96f038fbc 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.projectile.DragonFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class DragonFireballController extends MobEntityController { public DragonFireballController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java index 91d95118e..130e7e0e9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.ThrownEgg; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EggController extends AbstractEntityController { public EggController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java index 2ccf763d8..3581b6b80 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.boss.enderdragon.EndCrystal; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderCrystalController extends MobEntityController { public EnderCrystalController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java index c42289b96..96143abfb 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.projectile.ThrownEnderpearl; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderPearlController extends MobEntityController { public EnderPearlController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java index 48c9fc9f2..3e8ad515a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.projectile.EyeOfEnder; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderSignalController extends MobEntityController { public EnderSignalController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java index 10b54da76..9b73c7a29 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.ExperienceOrb; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ExperienceOrbController extends MobEntityController { public ExperienceOrbController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java index 7c86d4ad2..9a890094c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class FireworkController extends MobEntityController { public FireworkController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java index 3ab078093..5c1cc661b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java @@ -32,7 +32,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class FishingHookController extends MobEntityController { public FishingHookController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java index 68a89feb0..2160cb63f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.decoration.GlowItemFrame; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class GlowItemFrameController extends MobEntityController { public GlowItemFrameController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java index 73d5f8145..167be96e4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java @@ -27,7 +27,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ItemController extends AbstractEntityController { public ItemController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java index 4d8372b11..baa3fc41b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ItemFrameController extends MobEntityController { public ItemFrameController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java index 8b252a915..49abb82b4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.projectile.LargeFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LargeFireballController extends MobEntityController { public LargeFireballController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java index 7978b44c6..adee43dd8 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.decoration.LeashFenceKnotEntity; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LeashController extends MobEntityController { public LeashController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java index 5a3f2bc2f..75bdef404 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.projectile.LlamaSpit; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LlamaSpitController extends AbstractEntityController { public LlamaSpitController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java index 2494b99ff..7b032765b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.Marker; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MarkerController extends MobEntityController { public MarkerController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java index 07b57fb9e..615e9cfd6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.vehicle.MinecartChest; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartChestController extends MobEntityController { public MinecartChestController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java index 01680e17e..a7e2231a6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.vehicle.MinecartCommandBlock; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartCommandController extends MobEntityController { public MinecartCommandController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java index 4aa7bb184..723815d8a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.vehicle.MinecartFurnace; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartFurnaceController extends MobEntityController { public MinecartFurnaceController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java index 44d113b72..0a99ce2f0 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java @@ -18,7 +18,6 @@ import net.minecraft.world.entity.vehicle.MinecartHopper; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartHopperController extends MobEntityController { public MinecartHopperController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java index c14ad91db..8c3279624 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.vehicle.Minecart; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartRideableController extends MobEntityController { public MinecartRideableController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java index 307182b0d..cd27c2c74 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java @@ -18,7 +18,6 @@ import net.minecraft.world.entity.vehicle.MinecartSpawner; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartSpawnerController extends MobEntityController { public MinecartSpawnerController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java index 4f05907b6..f8b113984 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java @@ -18,7 +18,6 @@ import net.minecraft.world.entity.vehicle.MinecartTNT; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartTNTController extends MobEntityController { public MinecartTNTController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java index e94dae2b9..e704b966e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.decoration.Painting; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class PaintingController extends MobEntityController { public PaintingController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java index 8e98e13b8..5345304a6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.projectile.ShulkerBullet; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ShulkerBulletController extends MobEntityController { public ShulkerBulletController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java index ee0bae124..1f85fa579 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.projectile.SmallFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SmallFireballController extends MobEntityController { public SmallFireballController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java index 853994e34..dc43a9f9e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.projectile.Snowball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SnowballController extends MobEntityController { public SnowballController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java index 8303fb538..3570aca5f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.projectile.SpectralArrow; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SpectralArrowController extends MobEntityController { public SpectralArrowController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java index db0306b4b..3cc1eee63 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class TNTPrimedController extends MobEntityController { public TNTPrimedController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java index d89e32288..87cbc355d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.projectile.ThrownExperienceBottle; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownExpBottleController extends MobEntityController { public ThrownExpBottleController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java index d9ddd9e0b..2950869ed 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java @@ -23,7 +23,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownPotionController extends MobEntityController { public ThrownPotionController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java index f6471ef85..b8c1655fe 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java @@ -23,7 +23,6 @@ import net.minecraft.world.entity.projectile.ThrownTrident; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownTridentController extends MobEntityController { public ThrownTridentController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java index 5eb32c92c..6f4d08f44 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.projectile.Arrow; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class TippedArrowController extends MobEntityController { public TippedArrowController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java index 0dd9bc66b..ab4e83550 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java @@ -22,7 +22,6 @@ import net.minecraft.world.entity.projectile.WitherSkull; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class WitherSkullController extends MobEntityController { public WitherSkullController() { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index 6f9a06489..9f4e68840 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -2074,8 +2074,8 @@ public class NMSImpl implements NMSBridge { network.address = socketAddress; } - public static boolean isLeashed(NPC npc, Mob entity) { - return NMS.isLeashed(npc, entity::isLeashed, () -> entity.dropLeash(true, false)); + public static boolean isLeashed(NPC npc, Supplier isLeashed, Mob entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.dropLeash(true, false)); } @SuppressWarnings("deprecation") diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java index f891f4d2a..3a34629ea 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java @@ -142,7 +142,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java index e1cdceced..ef19b1f7d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BatController extends MobEntityController { public BatController() { @@ -124,16 +123,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java index af9d4ebca..50397e5a5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BeeController extends MobEntityController { public BeeController() { @@ -121,16 +120,7 @@ public class BeeController 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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java index 0740fd5ab..5df247760 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BlazeController extends MobEntityController { public BlazeController() { @@ -116,7 +115,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java index ad00e4c8c..3400d068b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java @@ -136,7 +136,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java index f4b42b9c3..befec4198 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java @@ -133,17 +133,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java index 13ada4942..6a7fc126e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java @@ -144,7 +144,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java index 44240a823..bcdb37f94 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java @@ -169,7 +169,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java index b11c42153..f75d6929c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java @@ -141,7 +141,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java index bf1a61e3e..4d16ab6bc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java @@ -136,7 +136,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java index 27cd57107..45fe59131 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java @@ -140,7 +140,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java index 79527878a..3a3f0dfa1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java @@ -133,7 +133,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java index b0e55f43f..0ebd812af 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java @@ -132,7 +132,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java index 6622d037c..b4b2699ec 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java @@ -136,7 +136,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java index 57231f611..f9d7a1fe1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java @@ -133,7 +133,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java index 2d39524dd..88a7216d0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java @@ -127,7 +127,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java index 56e64bb28..fdafee62d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java @@ -130,7 +130,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java index b35fc4c72..89e174dbc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class GhastController extends MobEntityController { public GhastController() { @@ -116,7 +115,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java index e76f1a955..9dbf6eefc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java @@ -127,7 +127,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java index d69af7e62..2d3afdfc4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java @@ -127,7 +127,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java index efb2bd770..1caf9b5df 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java @@ -130,7 +130,7 @@ public class GoatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java index e51ad78ad..83c4ee0eb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java @@ -133,7 +133,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java index ff9d519bb..9b9240721 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java @@ -133,7 +133,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java index e29fbcbe9..70b516c2f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java @@ -130,7 +130,7 @@ public class HoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java index bb0a2c608..6f05b947d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java @@ -176,7 +176,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java index 424b97757..e7219789e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java @@ -177,7 +177,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java index 90b2c444e..f06b5ff3b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java @@ -177,7 +177,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java index b814c2419..713a5204b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java @@ -177,7 +177,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java index 2208ccdb8..9ca2bdae4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java @@ -177,7 +177,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java index f8d6f1c0f..b668ca39c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java @@ -127,7 +127,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java index 424d3e68f..87febffd7 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java @@ -127,7 +127,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java index 2cb69c5cb..f86c18893 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java @@ -147,7 +147,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java index 56be77677..56bc43ab8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java @@ -128,7 +128,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java index de95c70aa..33f505f54 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java @@ -133,7 +133,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java index 7bcc72d8e..bdf309162 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java @@ -136,7 +136,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java index ab1cbd8e7..92ed16483 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java @@ -130,7 +130,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java index 1e866f911..271a020a6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java @@ -31,7 +31,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ParrotController extends MobEntityController { public ParrotController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java index 8eb0db996..a81357369 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java @@ -155,7 +155,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java index 84777a0cd..9c0394f6a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java @@ -137,7 +137,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java index 4947155f2..41daf1f70 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java @@ -128,7 +128,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java index 6101f2358..a05e57058 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java @@ -130,7 +130,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java index 41bc8b49b..bce763445 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java @@ -130,7 +130,7 @@ public class PiglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java index 42640899f..985dfd2e0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java @@ -130,7 +130,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java index a8ca33ba2..f7ebef9eb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java @@ -29,7 +29,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class PolarBearController extends MobEntityController { public PolarBearController() { @@ -114,16 +113,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java index 8daae0cb0..98c7b73d3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java @@ -172,7 +172,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java index e5d375731..3624a2b72 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java @@ -139,7 +139,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java index 634da224f..408202f94 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java @@ -135,7 +135,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java index 4a09f28c0..b574598f8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java @@ -161,7 +161,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java index 6d7211fcf..4c5957e68 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java @@ -130,7 +130,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java index 3d6284139..d9d33159a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java @@ -131,7 +131,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java index 29d39163d..069ccf998 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java @@ -134,7 +134,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java index 1db96316b..cb00b7b58 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java @@ -127,7 +127,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java index 8169ca894..24dddc288 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java @@ -127,7 +127,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java index 5acc55852..964548480 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java @@ -127,7 +127,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java index 42b1c2a99..4a312acdb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java @@ -128,7 +128,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java index 02d0a8d40..040d19c5e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java @@ -127,7 +127,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java index 6ccba34ac..7055393b3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java @@ -127,7 +127,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java index 24b675728..13432747b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java @@ -127,7 +127,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java index f16423b4f..4553c4475 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java @@ -127,7 +127,7 @@ public class StriderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java index 9d835691d..8dde072ec 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java @@ -148,7 +148,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java index c68cda61e..6fbaf3d08 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java @@ -163,7 +163,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java index 8f04c7a6c..cf29e4139 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java @@ -149,7 +149,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java index 850ee1014..1fe79f82e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class VexController extends MobEntityController { public VexController() { @@ -114,16 +113,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()) { - dropLeash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java index 4ba2633f0..ca4288dd1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java @@ -143,7 +143,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java index c48449fb6..3a3da2423 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java @@ -130,7 +130,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java index a39980969..feb49d67f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java @@ -144,7 +144,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java index 759f0eff5..af74b910a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java @@ -127,7 +127,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java index 4a47b4d14..14cc77969 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class WitherController extends MobEntityController { public WitherController() { @@ -120,7 +119,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java index 45e2cae0d..d926045c9 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java @@ -132,7 +132,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java index a58b228ea..74cfef756 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java @@ -129,7 +129,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java index 07c8dfc7a..193967f41 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java @@ -127,7 +127,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java index bc90e265f..de202d6ed 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java @@ -127,7 +127,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java index d4cffcc7e..ddee65483 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java @@ -127,7 +127,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java index 57cda9cc8..68b56a707 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class AreaEffectCloudController extends MobEntityController { public AreaEffectCloudController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java index bbb975652..c0afe764a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.DragonFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class DragonFireballController extends MobEntityController { public DragonFireballController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java index 8bc2e8a35..6953c7ad8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.projectile.ThrownEgg; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EggController extends AbstractEntityController { public EggController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java index 87fea0c7f..43d932f17 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.boss.enderdragon.EndCrystal; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderCrystalController extends MobEntityController { public EnderCrystalController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java index c62856471..f1094c052 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.ThrownEnderpearl; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderPearlController extends MobEntityController { public EnderPearlController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java index 57400505a..7352a31ac 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.EyeOfEnder; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderSignalController extends MobEntityController { public EnderSignalController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java index 277aead83..357286800 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.ExperienceOrb; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ExperienceOrbController extends MobEntityController { public ExperienceOrbController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java index 8ffaa0ac9..520257ae6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class FireworkController extends MobEntityController { public FireworkController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java index 6ec803525..401e865fd 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java @@ -33,7 +33,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class FishingHookController extends MobEntityController { public FishingHookController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java index 93e840f2c..a42140af5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.decoration.GlowItemFrame; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class GlowItemFrameController extends MobEntityController { public GlowItemFrameController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java index 2ed0c4c42..53b4609eb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java @@ -29,7 +29,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ItemController extends AbstractEntityController { public ItemController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java index ed4252b00..4d99b9439 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ItemFrameController extends MobEntityController { public ItemFrameController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java index ae14a32cb..3ac604826 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.LargeFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LargeFireballController extends MobEntityController { public LargeFireballController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java index 20f417573..3af0623d7 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.decoration.LeashFenceKnotEntity; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LeashController extends MobEntityController { public LeashController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java index 1fb200d86..b7e1e8329 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java @@ -27,7 +27,6 @@ import net.minecraft.world.entity.projectile.LlamaSpit; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LlamaSpitController extends AbstractEntityController { public LlamaSpitController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java index 6219d6856..ad3e45269 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.Marker; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MarkerController extends MobEntityController { public MarkerController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java index 82b5904c6..734c35f61 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.vehicle.MinecartChest; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartChestController extends MobEntityController { public MinecartChestController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java index 37816c4ed..25b468522 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.vehicle.MinecartCommandBlock; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartCommandController extends MobEntityController { public MinecartCommandController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java index baa8081f1..9db14df10 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.vehicle.MinecartFurnace; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartFurnaceController extends MobEntityController { public MinecartFurnaceController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java index ad854c6ef..67db9bc75 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java @@ -20,7 +20,6 @@ import net.minecraft.world.entity.vehicle.MinecartHopper; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartHopperController extends MobEntityController { public MinecartHopperController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java index aafab7b01..b12dbb1bb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.vehicle.Minecart; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartRideableController extends MobEntityController { public MinecartRideableController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java index 7f47a2320..414e43f98 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java @@ -20,7 +20,6 @@ import net.minecraft.world.entity.vehicle.MinecartSpawner; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartSpawnerController extends MobEntityController { public MinecartSpawnerController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java index 6f32f4536..9d977d288 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java @@ -20,7 +20,6 @@ import net.minecraft.world.entity.vehicle.MinecartTNT; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartTNTController extends MobEntityController { public MinecartTNTController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java index c5e2d8d4e..e4367b604 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.decoration.Painting; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class PaintingController extends MobEntityController { public PaintingController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java index efb08a091..1d68c267e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.ShulkerBullet; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ShulkerBulletController extends MobEntityController { public ShulkerBulletController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java index 5a34c5141..907201f52 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.SmallFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SmallFireballController extends MobEntityController { public SmallFireballController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java index b2a4f6ed0..be2e0e0ac 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.Snowball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SnowballController extends MobEntityController { public SnowballController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java index 5098f36b7..233189499 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.SpectralArrow; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SpectralArrowController extends MobEntityController { public SpectralArrowController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java index cceb7d9f9..fea20be20 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class TNTPrimedController extends MobEntityController { public TNTPrimedController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java index 74d2991c4..628ee7a08 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.ThrownExperienceBottle; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownExpBottleController extends MobEntityController { public ThrownExpBottleController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java index 10447cb21..599dd63e7 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java @@ -25,7 +25,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownPotionController extends MobEntityController { public ThrownPotionController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java index 1821288cf..924c2031a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.ThrownTrident; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownTridentController extends MobEntityController { public ThrownTridentController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java index b4b34cca9..6aba9038e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.Arrow; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class TippedArrowController extends MobEntityController { public TippedArrowController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java index d0f923d25..9a0347d8b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.WitherSkull; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class WitherSkullController extends MobEntityController { public WitherSkullController() { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index e408e88b1..a26500842 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -2082,8 +2082,8 @@ public class NMSImpl implements NMSBridge { network.address = socketAddress; } - public static boolean isLeashed(NPC npc, Mob entity) { - return NMS.isLeashed(npc, entity::isLeashed, () -> entity.dropLeash(true, false)); + public static boolean isLeashed(NPC npc, Supplier isLeashed, Mob entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.dropLeash(true, false)); } @SuppressWarnings("deprecation") diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java index b2a9f62f4..521eae13d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java @@ -143,7 +143,7 @@ public class AllayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java index 6a6624ecf..5770a5872 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java @@ -142,7 +142,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java index c3914998a..86f85ec03 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BatController extends MobEntityController { public BatController() { @@ -124,7 +123,7 @@ public class BatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java index 3b6a1dd75..550550bd5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BeeController extends MobEntityController { public BeeController() { @@ -121,7 +120,7 @@ public class BeeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java index 6cf49a8fa..c56c62609 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class BlazeController extends MobEntityController { public BlazeController() { @@ -116,7 +115,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java index b26ab369d..e9eeb7f86 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java @@ -153,7 +153,7 @@ public class CamelController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java index 504de293b..5edb49780 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java @@ -136,7 +136,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java index 8b131ad1e..03a9d7a0b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java @@ -134,7 +134,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java index 7ff254f4f..3eee2c3d1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java @@ -144,7 +144,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java index 05e787740..c875bd6df 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java @@ -169,7 +169,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java index 1417d9ed7..4738df0e6 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java @@ -141,7 +141,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java index fd854cb3b..be4d91c67 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java @@ -136,7 +136,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java index 6fffc272e..80f7719ef 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java @@ -140,7 +140,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java index c7288cbfe..401a3db0b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java @@ -134,7 +134,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java index fa4fd1278..dfade54ae 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java @@ -132,7 +132,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java index d183b1f8f..67ea81fed 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java @@ -137,7 +137,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java index 61cbe1fda..f663d2548 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java @@ -134,7 +134,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java index af87d540b..542442953 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java @@ -128,7 +128,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java index 4a70fe339..ad3471152 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java @@ -130,7 +130,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java index 9137db3ac..ef165f3c4 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java @@ -133,7 +133,7 @@ public class FrogController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java index 1a4d33d32..3bbca69eb 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class GhastController extends MobEntityController { public GhastController() { @@ -116,7 +115,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java index 0f6af03d4..3b2e13b0f 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java @@ -128,7 +128,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java index ff0550b09..cf5cda7e1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java @@ -128,7 +128,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java index 53d593639..316209425 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java @@ -130,7 +130,7 @@ public class GoatController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java index 691d3c99d..2bc3fa474 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java @@ -134,7 +134,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java index 7ec8cee31..9a9bebab5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java @@ -134,7 +134,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java index 9e2723c3c..19b4ba258 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java @@ -134,7 +134,7 @@ public class HoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java index 258351583..bca376c26 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java @@ -171,7 +171,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java index b7c083ffb..6785b1dac 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java @@ -171,7 +171,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java index 6776754ed..9e9ae1c36 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java @@ -171,7 +171,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java index 4bbb83187..8ce0ddb86 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java @@ -171,7 +171,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java index ca5cab512..1aceb5dff 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java @@ -171,7 +171,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java index 3ee7f0001..7eaf18b9b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java @@ -128,7 +128,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java index a9d64c294..72e5acd02 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java @@ -128,7 +128,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java index fa64070e3..857c23c92 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java @@ -147,7 +147,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java index 08e9da27b..81762fc00 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java @@ -128,7 +128,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java index d2daff33c..1f9bfa636 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java @@ -133,7 +133,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java index 05189d9f9..4db9f8956 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java @@ -136,7 +136,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java index 7e0c85b46..13bdf05da 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java @@ -130,7 +130,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java index 7a5a944ff..4daab0544 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java @@ -31,7 +31,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ParrotController extends MobEntityController { public ParrotController() { @@ -120,7 +119,7 @@ public class ParrotController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java index a0c5bba2b..ff7867cbc 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java @@ -153,7 +153,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java index 996e6f922..0e69be550 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java @@ -131,7 +131,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java index ffd231611..2832326ba 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java @@ -129,7 +129,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java index e431afa92..21fa1125c 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java @@ -131,7 +131,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java index cdf52256e..970b02057 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java @@ -131,7 +131,7 @@ public class PiglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java index 22d95bcd4..6b981b5f8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java @@ -130,7 +130,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java index 7bc5318f8..a99e0312f 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java @@ -29,7 +29,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class PolarBearController extends MobEntityController { public PolarBearController() { @@ -113,7 +112,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java index 7bd9356ad..d7d138d07 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java @@ -172,7 +172,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java index b24c81f1d..006ccf61c 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java @@ -139,7 +139,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java index 81b211cd7..315db2aa3 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java @@ -130,7 +130,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java index c9e3604f7..a02c89898 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java @@ -161,7 +161,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java index 8c691b710..f7cfcc552 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java @@ -130,7 +130,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java index 134767a05..497b49100 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java @@ -132,7 +132,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java index 9dedea007..ab9738b3e 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/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 diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java index 2b53f913a..99c8bbdab 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java @@ -128,7 +128,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java index fa33150a3..efdd7a540 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java @@ -128,7 +128,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java index b3bd28d09..fb3cbdfde 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java @@ -128,7 +128,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java index 7067e2513..755493669 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java @@ -128,7 +128,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java index c1e35b316..81e606b82 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java @@ -128,7 +128,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java index afa4fdf86..96d64c257 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java @@ -128,7 +128,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java index 7412897e3..15f3fc891 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java @@ -128,7 +128,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java index a448a7375..07d8ed5fb 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java @@ -128,7 +128,7 @@ public class StriderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java index f61430984..21732beca 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java @@ -161,7 +161,7 @@ public class TadpoleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java index a8a26ba9a..3c4b0a5f5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java @@ -148,7 +148,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java index 0bf447cd6..b588e8ad8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java @@ -163,7 +163,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java index a7112a7db..919047fd2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java @@ -149,7 +149,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java index 59733dc13..8f691738b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class VexController extends MobEntityController { public VexController() { @@ -114,7 +113,7 @@ public class VexController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java index 244f1e9a6..32079b8a1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java @@ -143,7 +143,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java index 59b32de08..a83773892 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java @@ -130,7 +130,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java index ef0f248ef..587b304d0 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java @@ -144,7 +144,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java index ab1823792..b9190ba3a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java @@ -138,7 +138,7 @@ public class WardenController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java index 249a088c0..bdc1a3b6b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java @@ -128,7 +128,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java index fcdc4b6dc..3a634c1c0 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class WitherController extends MobEntityController { public WitherController() { @@ -120,7 +119,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java index b7a143593..3a1eb76f8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java @@ -132,7 +132,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java index c12a8645d..b7fa366cf 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java @@ -130,7 +130,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java index 8273fd624..86b11c7e2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java @@ -128,7 +128,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java index 72dd65a88..bc76442bb 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java @@ -128,7 +128,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java index 08e3ead6c..dab3d6802 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java @@ -128,7 +128,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::isLeashed, this); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java index 52a5075e5..9daee774b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class AreaEffectCloudController extends MobEntityController { public AreaEffectCloudController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java index 8e5ad19c2..852483774 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.DragonFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class DragonFireballController extends MobEntityController { public DragonFireballController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java index d63283cbd..f990febec 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.projectile.ThrownEgg; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EggController extends AbstractEntityController { public EggController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java index a0e95f83d..832bcb216 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.boss.enderdragon.EndCrystal; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderCrystalController extends MobEntityController { public EnderCrystalController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java index e7dd6da82..91f1402cb 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.ThrownEnderpearl; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderPearlController extends MobEntityController { public EnderPearlController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java index 686c5727f..ff1c3d2d0 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.EyeOfEnder; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class EnderSignalController extends MobEntityController { public EnderSignalController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java index 626db12ef..0d3af5e19 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.ExperienceOrb; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ExperienceOrbController extends MobEntityController { public ExperienceOrbController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java index 104210f52..ecf5eaad1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class FireworkController extends MobEntityController { public FireworkController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java index aec9222b1..f4bc3a0e4 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java @@ -33,7 +33,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class FishingHookController extends MobEntityController { public FishingHookController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java index 361f87b9d..3df77e8a2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java @@ -27,7 +27,6 @@ import net.minecraft.world.entity.decoration.GlowItemFrame; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class GlowItemFrameController extends MobEntityController { public GlowItemFrameController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java index 2f2d7bc68..72d32e26c 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java @@ -29,7 +29,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ItemController extends AbstractEntityController { public ItemController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java index 80534e780..2cef3ba42 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java @@ -26,7 +26,6 @@ import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ItemFrameController extends MobEntityController { public ItemFrameController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java index c1c9f0120..9a43c22fc 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.LargeFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LargeFireballController extends MobEntityController { public LargeFireballController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java index 810cfddf8..43968a729 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.decoration.LeashFenceKnotEntity; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LeashController extends MobEntityController { public LeashController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java index b35f5d2fe..b2bcf50cb 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java @@ -27,7 +27,6 @@ import net.minecraft.world.entity.projectile.LlamaSpit; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class LlamaSpitController extends AbstractEntityController { public LlamaSpitController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java index 9b5d2fe9b..f9dc54fff 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.Marker; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MarkerController extends MobEntityController { public MarkerController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java index b1087fd30..58e483bed 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.vehicle.MinecartChest; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartChestController extends MobEntityController { public MinecartChestController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java index b56b1588e..fadd2ccce 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.vehicle.MinecartCommandBlock; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartCommandController extends MobEntityController { public MinecartCommandController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java index e366696ca..ec3d937e6 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.vehicle.MinecartFurnace; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartFurnaceController extends MobEntityController { public MinecartFurnaceController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java index 61c058b9b..c9d68a11e 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java @@ -20,7 +20,6 @@ import net.minecraft.world.entity.vehicle.MinecartHopper; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartHopperController extends MobEntityController { public MinecartHopperController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java index 41cd3ee9a..3a029d1d1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.vehicle.Minecart; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartRideableController extends MobEntityController { public MinecartRideableController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java index 1173df254..c5a33bdd8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java @@ -20,7 +20,6 @@ import net.minecraft.world.entity.vehicle.MinecartSpawner; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartSpawnerController extends MobEntityController { public MinecartSpawnerController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java index c4fbe1501..bf954b5a1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java @@ -20,7 +20,6 @@ import net.minecraft.world.entity.vehicle.MinecartTNT; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class MinecartTNTController extends MobEntityController { public MinecartTNTController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java index 02661cbd2..3f29a4529 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.decoration.Painting; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class PaintingController extends MobEntityController { public PaintingController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java index 7e81de564..f4dc635b5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.ShulkerBullet; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ShulkerBulletController extends MobEntityController { public ShulkerBulletController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java index 2d40bb5b9..40ef582c8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.SmallFireball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SmallFireballController extends MobEntityController { public SmallFireballController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java index ba5bcb239..0f8690f13 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.Snowball; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SnowballController extends MobEntityController { public SnowballController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java index 7e759dc0d..985da6c02 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.SpectralArrow; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class SpectralArrowController extends MobEntityController { public SpectralArrowController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java index eb1c18fea..3ea2e7b4c 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class TNTPrimedController extends MobEntityController { public TNTPrimedController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java index c19d5944d..018c1f5a2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.ThrownExperienceBottle; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownExpBottleController extends MobEntityController { public ThrownExpBottleController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java index 6e2c168d4..1f5401d45 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java @@ -25,7 +25,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownPotionController extends MobEntityController { public ThrownPotionController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java index fc908d452..d7dbce04c 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.projectile.ThrownTrident; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class ThrownTridentController extends MobEntityController { public ThrownTridentController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java index dbb42dfac..62136b275 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.Arrow; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class TippedArrowController extends MobEntityController { public TippedArrowController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java index 2f2405d5e..5b128eb67 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.projectile.WitherSkull; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; public class WitherSkullController extends MobEntityController { public WitherSkullController() { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java index e1af24d38..81f2a046f 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java @@ -2218,8 +2218,8 @@ public class NMSImpl implements NMSBridge { network.address = socketAddress; } - public static boolean isLeashed(NPC npc, Mob entity) { - return NMS.isLeashed(npc, entity::isLeashed, () -> entity.dropLeash(true, false)); + public static boolean isLeashed(NPC npc, Supplier isLeashed, Mob entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.dropLeash(true, false)); } @SuppressWarnings("deprecation") diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerMoveControl.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerMoveControl.java index f78541a63..0b69f561f 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerMoveControl.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerMoveControl.java @@ -121,7 +121,7 @@ public class PlayerMoveControl extends MoveControl { } float movement = (float) (this.speedMod * this.entity.getAttribute(Attributes.MOVEMENT_SPEED).getValue()); this.entity.setSpeed(movement); - this.entity.zza = movement; + // this.entity.zza = movement; if (shouldJump() || (dY >= NMS.getStepHeight(entity.getBukkitEntity()) && dXZ < 0.4D)) { this.jumpTicks = jumpTicks(); this.jumpTicks /= 3; diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java index 168a1a7be..879ef8c19 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java @@ -82,16 +82,7 @@ public class BatController extends MobEntityController { @Override public boolean cc() { - if (npc == null) { - return super.cc(); - } - boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) - return super.cc(); - if (super.cc()) { - unleash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java index e6ff0b481..79898dcb3 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java @@ -79,7 +79,7 @@ public class BlazeController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java index 1c43cb1b8..a5096b1a6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java @@ -88,17 +88,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean cc() { - if (npc == null) { - return super.cc(); - } - boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { - return super.cc(); - } - if (super.cc()) { - unleash(true, false); // clearLeash with client update - } - return false; // shouldLeash + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java index db18302ea..1ec368e7d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java @@ -99,7 +99,7 @@ public class ChickenController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java index f28e020bd..2b49c5544 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java @@ -114,7 +114,7 @@ public class CowController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java index c9ea5b874..ccca727a7 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java @@ -97,7 +97,7 @@ public class CreeperController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java index 017a246d9..bafd4a96f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java @@ -79,7 +79,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java index d0efb1602..fa412f9c1 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java @@ -88,7 +88,7 @@ public class EndermanController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java index 9ded8e63e..145437147 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java @@ -88,7 +88,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java index f949c513c..9b68799b2 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java @@ -70,7 +70,7 @@ public class GhastController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java index 113043f07..c5600eb3d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java @@ -74,7 +74,7 @@ public class GiantController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java index adb5eb895..5e7c4bfa2 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java @@ -74,7 +74,7 @@ public class GuardianController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java index c125e2592..fedc66eb5 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java @@ -96,7 +96,7 @@ public class HorseController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java index cf2d821e9..e51965643 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java @@ -74,7 +74,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java index 920cf4dea..9ec41a217 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java @@ -80,7 +80,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java index 1dcc77c92..68e7184bc 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java @@ -94,7 +94,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java index 23ab4c1de..241bb8d7a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java @@ -85,7 +85,7 @@ public class OcelotController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java index fc9b800c3..e73138970 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java @@ -94,7 +94,7 @@ public class PigController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java index 23198d20d..819d8848b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java @@ -75,7 +75,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java index f5a139cac..bfbaf2b7b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java @@ -86,7 +86,7 @@ public class RabbitController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java index 28516d887..420cbcecf 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java @@ -85,7 +85,7 @@ public class SheepController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java index 09399e060..696deb93c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java @@ -74,7 +74,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java index e81763899..9850f4371 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java @@ -74,7 +74,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java index 1f2ab64c9..8703ec05f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java @@ -80,7 +80,7 @@ public class SlimeController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java index 5d84de66d..12cae9d2a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java @@ -74,7 +74,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java index a5581a21b..2738f4a6d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java @@ -74,7 +74,7 @@ public class SpiderController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java index cbc157cb0..e41b9ffd5 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java @@ -74,7 +74,7 @@ public class SquidController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java index b9203b04d..2814c650e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java @@ -97,7 +97,7 @@ public class VillagerController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java index e06f4f150..f95107f97 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java @@ -74,7 +74,7 @@ public class WitchController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java index 1cac8a9e0..6921fe2f8 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java @@ -65,7 +65,7 @@ public class WitherController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java index 602666c0b..2bccd7e42 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java @@ -87,7 +87,7 @@ public class WolfController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java index c26fe69ac..13e43f865 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java @@ -74,7 +74,7 @@ public class ZombieController extends MobEntityController { @Override public boolean cc() { - return NMSImpl.isLeashed(npc, this); + return NMSImpl.isLeashed(npc, super::cc, this); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java index f87aa606e..8ac7913ee 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/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; @@ -1664,8 +1665,8 @@ public class NMSImpl implements NMSBridge { } } - public static boolean isLeashed(NPC npc, EntityInsentient entity) { - return NMS.isLeashed(npc, entity::cc, () -> entity.unleash(true, false)); + public static boolean isLeashed(NPC npc, Supplier isLeashed, EntityInsentient entity) { + return NMS.isLeashed(npc, isLeashed, () -> entity.unleash(true, false)); } public static boolean isNavigationFinished(NavigationAbstract navigation) {