From ad218261ff1489e5cf5c29dcac9faf13868f1fad Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 13 Feb 2023 21:25:26 +0800 Subject: [PATCH] Code size reduction --- .../nms/v1_10_R1/entity/BatController.java | 2 +- .../nms/v1_10_R1/entity/BlazeController.java | 10 +--------- .../nms/v1_10_R1/entity/ChickenController.java | 10 +--------- .../nms/v1_10_R1/entity/CowController.java | 10 +--------- .../nms/v1_10_R1/entity/CreeperController.java | 10 +--------- .../nms/v1_10_R1/entity/EnderDragonController.java | 10 +--------- .../nms/v1_10_R1/entity/EndermanController.java | 10 +--------- .../nms/v1_10_R1/entity/EndermiteController.java | 10 +--------- .../nms/v1_10_R1/entity/GhastController.java | 10 +--------- .../nms/v1_10_R1/entity/GiantController.java | 10 +--------- .../nms/v1_10_R1/entity/GuardianController.java | 10 +--------- .../nms/v1_10_R1/entity/HorseController.java | 10 +--------- .../nms/v1_10_R1/entity/IronGolemController.java | 10 +--------- .../nms/v1_10_R1/entity/MagmaCubeController.java | 10 +--------- .../nms/v1_10_R1/entity/MushroomCowController.java | 10 +--------- .../nms/v1_10_R1/entity/OcelotController.java | 10 +--------- .../nms/v1_10_R1/entity/PigController.java | 10 +--------- .../nms/v1_10_R1/entity/PigZombieController.java | 10 +--------- .../nms/v1_10_R1/entity/PolarBearController.java | 2 +- .../nms/v1_10_R1/entity/RabbitController.java | 10 +--------- .../nms/v1_10_R1/entity/SheepController.java | 10 +--------- .../nms/v1_10_R1/entity/ShulkerController.java | 10 +--------- .../nms/v1_10_R1/entity/SilverfishController.java | 10 +--------- .../nms/v1_10_R1/entity/SkeletonController.java | 10 +--------- .../nms/v1_10_R1/entity/SlimeController.java | 10 +--------- .../nms/v1_10_R1/entity/SnowmanController.java | 10 +--------- .../nms/v1_10_R1/entity/SpiderController.java | 10 +--------- .../nms/v1_10_R1/entity/SquidController.java | 10 +--------- .../nms/v1_10_R1/entity/VillagerController.java | 11 +---------- .../nms/v1_10_R1/entity/WitchController.java | 10 +--------- .../nms/v1_10_R1/entity/WitherController.java | 10 +--------- .../nms/v1_10_R1/entity/WolfController.java | 10 +--------- .../nms/v1_10_R1/entity/ZombieController.java | 10 +--------- .../net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java | 5 +++++ .../nms/v1_11_R1/entity/BlazeController.java | 2 +- .../nms/v1_11_R1/entity/ChickenController.java | 2 +- .../nms/v1_11_R1/entity/CowController.java | 2 +- .../nms/v1_11_R1/entity/CreeperController.java | 2 +- .../nms/v1_11_R1/entity/EnderDragonController.java | 2 +- .../nms/v1_11_R1/entity/EndermanController.java | 2 +- .../nms/v1_11_R1/entity/EndermiteController.java | 2 +- .../nms/v1_11_R1/entity/EvokerController.java | 2 +- .../nms/v1_11_R1/entity/GhastController.java | 2 +- .../nms/v1_11_R1/entity/GiantController.java | 2 +- .../nms/v1_11_R1/entity/GuardianController.java | 2 +- .../nms/v1_11_R1/entity/GuardianElderController.java | 2 +- .../nms/v1_11_R1/entity/HorseController.java | 2 +- .../nms/v1_11_R1/entity/HorseDonkeyController.java | 2 +- .../nms/v1_11_R1/entity/HorseMuleController.java | 2 +- .../nms/v1_11_R1/entity/HorseSkeletonController.java | 2 +- .../nms/v1_11_R1/entity/HorseZombieController.java | 2 +- .../nms/v1_11_R1/entity/IronGolemController.java | 2 +- .../nms/v1_11_R1/entity/LlamaController.java | 2 +- .../nms/v1_11_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_11_R1/entity/MushroomCowController.java | 2 +- .../nms/v1_11_R1/entity/OcelotController.java | 2 +- .../nms/v1_11_R1/entity/PigController.java | 2 +- .../nms/v1_11_R1/entity/PigZombieController.java | 2 +- .../nms/v1_11_R1/entity/RabbitController.java | 2 +- .../nms/v1_11_R1/entity/SheepController.java | 2 +- .../nms/v1_11_R1/entity/ShulkerController.java | 2 +- .../nms/v1_11_R1/entity/SilverfishController.java | 2 +- .../nms/v1_11_R1/entity/SkeletonController.java | 2 +- .../nms/v1_11_R1/entity/SkeletonStrayController.java | 2 +- .../nms/v1_11_R1/entity/SkeletonWitherController.java | 2 +- .../nms/v1_11_R1/entity/SlimeController.java | 2 +- .../nms/v1_11_R1/entity/SnowmanController.java | 2 +- .../nms/v1_11_R1/entity/SpiderController.java | 2 +- .../nms/v1_11_R1/entity/SquidController.java | 2 +- .../nms/v1_11_R1/entity/VillagerController.java | 2 +- .../nms/v1_11_R1/entity/VindicatorController.java | 2 +- .../nms/v1_11_R1/entity/WitchController.java | 2 +- .../nms/v1_11_R1/entity/WitherController.java | 2 +- .../nms/v1_11_R1/entity/WolfController.java | 2 +- .../nms/v1_11_R1/entity/ZombieController.java | 2 +- .../nms/v1_11_R1/entity/ZombieHuskController.java | 2 +- .../nms/v1_11_R1/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java | 7 ++++--- .../nms/v1_12_R1/entity/BlazeController.java | 2 +- .../nms/v1_12_R1/entity/ChickenController.java | 2 +- .../nms/v1_12_R1/entity/CowController.java | 2 +- .../nms/v1_12_R1/entity/CreeperController.java | 2 +- .../nms/v1_12_R1/entity/EnderDragonController.java | 2 +- .../nms/v1_12_R1/entity/EndermanController.java | 2 +- .../nms/v1_12_R1/entity/EndermiteController.java | 2 +- .../nms/v1_12_R1/entity/EvokerController.java | 2 +- .../nms/v1_12_R1/entity/GhastController.java | 2 +- .../nms/v1_12_R1/entity/GiantController.java | 2 +- .../nms/v1_12_R1/entity/GuardianController.java | 2 +- .../nms/v1_12_R1/entity/GuardianElderController.java | 2 +- .../nms/v1_12_R1/entity/HorseController.java | 2 +- .../nms/v1_12_R1/entity/HorseDonkeyController.java | 2 +- .../nms/v1_12_R1/entity/HorseMuleController.java | 2 +- .../nms/v1_12_R1/entity/HorseSkeletonController.java | 2 +- .../nms/v1_12_R1/entity/HorseZombieController.java | 2 +- .../nms/v1_12_R1/entity/IllusionerController.java | 2 +- .../nms/v1_12_R1/entity/IronGolemController.java | 2 +- .../nms/v1_12_R1/entity/LlamaController.java | 2 +- .../nms/v1_12_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_12_R1/entity/MushroomCowController.java | 2 +- .../nms/v1_12_R1/entity/OcelotController.java | 2 +- .../nms/v1_12_R1/entity/PigController.java | 2 +- .../nms/v1_12_R1/entity/PigZombieController.java | 2 +- .../nms/v1_12_R1/entity/RabbitController.java | 2 +- .../nms/v1_12_R1/entity/SheepController.java | 2 +- .../nms/v1_12_R1/entity/ShulkerController.java | 2 +- .../nms/v1_12_R1/entity/SilverfishController.java | 2 +- .../nms/v1_12_R1/entity/SkeletonController.java | 2 +- .../nms/v1_12_R1/entity/SkeletonStrayController.java | 2 +- .../nms/v1_12_R1/entity/SkeletonWitherController.java | 2 +- .../nms/v1_12_R1/entity/SlimeController.java | 2 +- .../nms/v1_12_R1/entity/SnowmanController.java | 2 +- .../nms/v1_12_R1/entity/SpiderController.java | 2 +- .../nms/v1_12_R1/entity/SquidController.java | 2 +- .../nms/v1_12_R1/entity/VillagerController.java | 2 +- .../nms/v1_12_R1/entity/VindicatorController.java | 2 +- .../nms/v1_12_R1/entity/WitchController.java | 2 +- .../nms/v1_12_R1/entity/WitherController.java | 2 +- .../nms/v1_12_R1/entity/WolfController.java | 2 +- .../nms/v1_12_R1/entity/ZombieController.java | 2 +- .../nms/v1_12_R1/entity/ZombieHuskController.java | 2 +- .../nms/v1_12_R1/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java | 4 ++++ .../nms/v1_13_R2/entity/BlazeController.java | 2 +- .../nms/v1_13_R2/entity/ChickenController.java | 2 +- .../nms/v1_13_R2/entity/CodController.java | 2 +- .../nms/v1_13_R2/entity/CowController.java | 2 +- .../nms/v1_13_R2/entity/CreeperController.java | 2 +- .../nms/v1_13_R2/entity/DolphinController.java | 2 +- .../nms/v1_13_R2/entity/DrownedController.java | 2 +- .../nms/v1_13_R2/entity/EnderDragonController.java | 2 +- .../nms/v1_13_R2/entity/EndermanController.java | 2 +- .../nms/v1_13_R2/entity/EndermiteController.java | 2 +- .../nms/v1_13_R2/entity/EvokerController.java | 2 +- .../nms/v1_13_R2/entity/GhastController.java | 2 +- .../nms/v1_13_R2/entity/GiantController.java | 2 +- .../nms/v1_13_R2/entity/GuardianController.java | 2 +- .../nms/v1_13_R2/entity/GuardianElderController.java | 2 +- .../nms/v1_13_R2/entity/HorseController.java | 2 +- .../nms/v1_13_R2/entity/HorseDonkeyController.java | 2 +- .../nms/v1_13_R2/entity/HorseMuleController.java | 2 +- .../nms/v1_13_R2/entity/HorseSkeletonController.java | 2 +- .../nms/v1_13_R2/entity/HorseZombieController.java | 2 +- .../nms/v1_13_R2/entity/IllusionerController.java | 2 +- .../nms/v1_13_R2/entity/IronGolemController.java | 2 +- .../nms/v1_13_R2/entity/LlamaController.java | 2 +- .../nms/v1_13_R2/entity/MagmaCubeController.java | 2 +- .../nms/v1_13_R2/entity/MushroomCowController.java | 2 +- .../nms/v1_13_R2/entity/OcelotController.java | 2 +- .../nms/v1_13_R2/entity/PhantomController.java | 2 +- .../nms/v1_13_R2/entity/PigController.java | 2 +- .../nms/v1_13_R2/entity/PigZombieController.java | 2 +- .../nms/v1_13_R2/entity/PufferFishController.java | 2 +- .../nms/v1_13_R2/entity/RabbitController.java | 2 +- .../nms/v1_13_R2/entity/SalmonController.java | 2 +- .../nms/v1_13_R2/entity/SheepController.java | 2 +- .../nms/v1_13_R2/entity/ShulkerController.java | 2 +- .../nms/v1_13_R2/entity/SilverfishController.java | 2 +- .../nms/v1_13_R2/entity/SkeletonController.java | 2 +- .../nms/v1_13_R2/entity/SkeletonStrayController.java | 2 +- .../nms/v1_13_R2/entity/SkeletonWitherController.java | 2 +- .../nms/v1_13_R2/entity/SlimeController.java | 2 +- .../nms/v1_13_R2/entity/SnowmanController.java | 2 +- .../nms/v1_13_R2/entity/SpiderController.java | 2 +- .../nms/v1_13_R2/entity/SquidController.java | 2 +- .../nms/v1_13_R2/entity/TropicalFishController.java | 2 +- .../nms/v1_13_R2/entity/TurtleController.java | 2 +- .../nms/v1_13_R2/entity/VillagerController.java | 2 +- .../nms/v1_13_R2/entity/VindicatorController.java | 2 +- .../nms/v1_13_R2/entity/WitchController.java | 2 +- .../nms/v1_13_R2/entity/WitherController.java | 2 +- .../nms/v1_13_R2/entity/WolfController.java | 2 +- .../nms/v1_13_R2/entity/ZombieController.java | 2 +- .../nms/v1_13_R2/entity/ZombieHuskController.java | 2 +- .../nms/v1_13_R2/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java | 9 ++++----- .../nms/v1_14_R1/entity/BlazeController.java | 2 +- .../nms/v1_14_R1/entity/CatController.java | 2 +- .../nms/v1_14_R1/entity/ChickenController.java | 2 +- .../nms/v1_14_R1/entity/CodController.java | 2 +- .../nms/v1_14_R1/entity/CowController.java | 2 +- .../nms/v1_14_R1/entity/CreeperController.java | 2 +- .../nms/v1_14_R1/entity/DolphinController.java | 2 +- .../nms/v1_14_R1/entity/DrownedController.java | 2 +- .../nms/v1_14_R1/entity/EnderDragonController.java | 2 +- .../nms/v1_14_R1/entity/EndermanController.java | 2 +- .../nms/v1_14_R1/entity/EndermiteController.java | 2 +- .../nms/v1_14_R1/entity/EvokerController.java | 2 +- .../nms/v1_14_R1/entity/FoxController.java | 2 +- .../nms/v1_14_R1/entity/GhastController.java | 2 +- .../nms/v1_14_R1/entity/GiantController.java | 2 +- .../nms/v1_14_R1/entity/GuardianController.java | 2 +- .../nms/v1_14_R1/entity/GuardianElderController.java | 2 +- .../nms/v1_14_R1/entity/HorseController.java | 2 +- .../nms/v1_14_R1/entity/HorseDonkeyController.java | 2 +- .../nms/v1_14_R1/entity/HorseMuleController.java | 2 +- .../nms/v1_14_R1/entity/HorseSkeletonController.java | 2 +- .../nms/v1_14_R1/entity/HorseZombieController.java | 2 +- .../nms/v1_14_R1/entity/IllusionerController.java | 2 +- .../nms/v1_14_R1/entity/IronGolemController.java | 2 +- .../nms/v1_14_R1/entity/LlamaController.java | 2 +- .../nms/v1_14_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_14_R1/entity/MushroomCowController.java | 2 +- .../nms/v1_14_R1/entity/OcelotController.java | 2 +- .../nms/v1_14_R1/entity/PandaController.java | 2 +- .../nms/v1_14_R1/entity/PhantomController.java | 2 +- .../nms/v1_14_R1/entity/PigController.java | 2 +- .../nms/v1_14_R1/entity/PigZombieController.java | 2 +- .../nms/v1_14_R1/entity/PillagerController.java | 2 +- .../nms/v1_14_R1/entity/PufferFishController.java | 2 +- .../nms/v1_14_R1/entity/RabbitController.java | 2 +- .../nms/v1_14_R1/entity/RavagerController.java | 2 +- .../nms/v1_14_R1/entity/SalmonController.java | 2 +- .../nms/v1_14_R1/entity/SheepController.java | 2 +- .../nms/v1_14_R1/entity/ShulkerController.java | 2 +- .../nms/v1_14_R1/entity/SilverfishController.java | 2 +- .../nms/v1_14_R1/entity/SkeletonController.java | 2 +- .../nms/v1_14_R1/entity/SkeletonStrayController.java | 2 +- .../nms/v1_14_R1/entity/SkeletonWitherController.java | 2 +- .../nms/v1_14_R1/entity/SlimeController.java | 2 +- .../nms/v1_14_R1/entity/SnowmanController.java | 2 +- .../nms/v1_14_R1/entity/SpiderController.java | 2 +- .../nms/v1_14_R1/entity/SquidController.java | 2 +- .../nms/v1_14_R1/entity/TraderLlamaController.java | 2 +- .../nms/v1_14_R1/entity/TropicalFishController.java | 2 +- .../nms/v1_14_R1/entity/TurtleController.java | 2 +- .../nms/v1_14_R1/entity/VillagerController.java | 2 +- .../nms/v1_14_R1/entity/VindicatorController.java | 2 +- .../v1_14_R1/entity/WanderingTraderController.java | 2 +- .../nms/v1_14_R1/entity/WitchController.java | 2 +- .../nms/v1_14_R1/entity/WitherController.java | 2 +- .../nms/v1_14_R1/entity/WolfController.java | 2 +- .../nms/v1_14_R1/entity/ZombieController.java | 2 +- .../nms/v1_14_R1/entity/ZombieHuskController.java | 2 +- .../nms/v1_14_R1/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java | 8 ++++---- .../nms/v1_15_R1/entity/BlazeController.java | 2 +- .../nms/v1_15_R1/entity/CatController.java | 2 +- .../nms/v1_15_R1/entity/ChickenController.java | 2 +- .../nms/v1_15_R1/entity/CodController.java | 2 +- .../nms/v1_15_R1/entity/CowController.java | 2 +- .../nms/v1_15_R1/entity/CreeperController.java | 2 +- .../nms/v1_15_R1/entity/DolphinController.java | 2 +- .../nms/v1_15_R1/entity/DrownedController.java | 2 +- .../nms/v1_15_R1/entity/EnderDragonController.java | 2 +- .../nms/v1_15_R1/entity/EndermanController.java | 2 +- .../nms/v1_15_R1/entity/EndermiteController.java | 2 +- .../nms/v1_15_R1/entity/EvokerController.java | 2 +- .../nms/v1_15_R1/entity/FoxController.java | 2 +- .../nms/v1_15_R1/entity/GhastController.java | 2 +- .../nms/v1_15_R1/entity/GiantController.java | 2 +- .../nms/v1_15_R1/entity/GuardianController.java | 2 +- .../nms/v1_15_R1/entity/GuardianElderController.java | 2 +- .../nms/v1_15_R1/entity/HorseController.java | 2 +- .../nms/v1_15_R1/entity/HorseDonkeyController.java | 2 +- .../nms/v1_15_R1/entity/HorseMuleController.java | 2 +- .../nms/v1_15_R1/entity/HorseSkeletonController.java | 2 +- .../nms/v1_15_R1/entity/HorseZombieController.java | 2 +- .../nms/v1_15_R1/entity/IllusionerController.java | 2 +- .../nms/v1_15_R1/entity/IronGolemController.java | 2 +- .../nms/v1_15_R1/entity/LlamaController.java | 2 +- .../nms/v1_15_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_15_R1/entity/MushroomCowController.java | 2 +- .../nms/v1_15_R1/entity/OcelotController.java | 2 +- .../nms/v1_15_R1/entity/PandaController.java | 2 +- .../nms/v1_15_R1/entity/PhantomController.java | 2 +- .../nms/v1_15_R1/entity/PigController.java | 2 +- .../nms/v1_15_R1/entity/PigZombieController.java | 2 +- .../nms/v1_15_R1/entity/PillagerController.java | 2 +- .../nms/v1_15_R1/entity/PufferFishController.java | 2 +- .../nms/v1_15_R1/entity/RabbitController.java | 2 +- .../nms/v1_15_R1/entity/RavagerController.java | 2 +- .../nms/v1_15_R1/entity/SalmonController.java | 2 +- .../nms/v1_15_R1/entity/SheepController.java | 2 +- .../nms/v1_15_R1/entity/ShulkerController.java | 2 +- .../nms/v1_15_R1/entity/SilverfishController.java | 2 +- .../nms/v1_15_R1/entity/SkeletonController.java | 2 +- .../nms/v1_15_R1/entity/SkeletonStrayController.java | 2 +- .../nms/v1_15_R1/entity/SkeletonWitherController.java | 2 +- .../nms/v1_15_R1/entity/SlimeController.java | 2 +- .../nms/v1_15_R1/entity/SnowmanController.java | 2 +- .../nms/v1_15_R1/entity/SpiderController.java | 2 +- .../nms/v1_15_R1/entity/SquidController.java | 2 +- .../nms/v1_15_R1/entity/TraderLlamaController.java | 2 +- .../nms/v1_15_R1/entity/TropicalFishController.java | 2 +- .../nms/v1_15_R1/entity/TurtleController.java | 2 +- .../nms/v1_15_R1/entity/VillagerController.java | 2 +- .../nms/v1_15_R1/entity/VindicatorController.java | 2 +- .../v1_15_R1/entity/WanderingTraderController.java | 2 +- .../nms/v1_15_R1/entity/WitchController.java | 2 +- .../nms/v1_15_R1/entity/WitherController.java | 2 +- .../nms/v1_15_R1/entity/WolfController.java | 2 +- .../nms/v1_15_R1/entity/ZombieController.java | 2 +- .../nms/v1_15_R1/entity/ZombieHuskController.java | 2 +- .../nms/v1_15_R1/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java | 8 ++++---- .../nms/v1_16_R3/entity/BlazeController.java | 2 +- .../nms/v1_16_R3/entity/CatController.java | 2 +- .../nms/v1_16_R3/entity/ChickenController.java | 2 +- .../nms/v1_16_R3/entity/CodController.java | 2 +- .../nms/v1_16_R3/entity/CowController.java | 2 +- .../nms/v1_16_R3/entity/CreeperController.java | 2 +- .../nms/v1_16_R3/entity/DolphinController.java | 2 +- .../nms/v1_16_R3/entity/DrownedController.java | 2 +- .../nms/v1_16_R3/entity/EnderDragonController.java | 2 +- .../nms/v1_16_R3/entity/EndermanController.java | 2 +- .../nms/v1_16_R3/entity/EndermiteController.java | 2 +- .../nms/v1_16_R3/entity/EvokerController.java | 2 +- .../nms/v1_16_R3/entity/FoxController.java | 2 +- .../nms/v1_16_R3/entity/GhastController.java | 2 +- .../nms/v1_16_R3/entity/GiantController.java | 2 +- .../nms/v1_16_R3/entity/GuardianController.java | 2 +- .../nms/v1_16_R3/entity/GuardianElderController.java | 2 +- .../nms/v1_16_R3/entity/HoglinController.java | 2 +- .../nms/v1_16_R3/entity/HorseController.java | 2 +- .../nms/v1_16_R3/entity/HorseDonkeyController.java | 2 +- .../nms/v1_16_R3/entity/HorseMuleController.java | 2 +- .../nms/v1_16_R3/entity/HorseSkeletonController.java | 2 +- .../nms/v1_16_R3/entity/HorseZombieController.java | 5 +---- .../nms/v1_16_R3/entity/IllusionerController.java | 2 +- .../nms/v1_16_R3/entity/IronGolemController.java | 2 +- .../nms/v1_16_R3/entity/LlamaController.java | 2 +- .../nms/v1_16_R3/entity/MagmaCubeController.java | 2 +- .../nms/v1_16_R3/entity/MushroomCowController.java | 2 +- .../nms/v1_16_R3/entity/OcelotController.java | 2 +- .../nms/v1_16_R3/entity/PandaController.java | 2 +- .../nms/v1_16_R3/entity/PhantomController.java | 2 +- .../nms/v1_16_R3/entity/PigController.java | 2 +- .../nms/v1_16_R3/entity/PigZombieController.java | 2 +- .../nms/v1_16_R3/entity/PiglinBruteController.java | 2 +- .../nms/v1_16_R3/entity/PiglinController.java | 2 +- .../nms/v1_16_R3/entity/PillagerController.java | 2 +- .../nms/v1_16_R3/entity/PufferFishController.java | 2 +- .../nms/v1_16_R3/entity/RabbitController.java | 2 +- .../nms/v1_16_R3/entity/RavagerController.java | 2 +- .../nms/v1_16_R3/entity/SalmonController.java | 2 +- .../nms/v1_16_R3/entity/SheepController.java | 2 +- .../nms/v1_16_R3/entity/ShulkerController.java | 2 +- .../nms/v1_16_R3/entity/SilverfishController.java | 2 +- .../nms/v1_16_R3/entity/SkeletonController.java | 2 +- .../nms/v1_16_R3/entity/SkeletonStrayController.java | 2 +- .../nms/v1_16_R3/entity/SkeletonWitherController.java | 2 +- .../nms/v1_16_R3/entity/SlimeController.java | 2 +- .../nms/v1_16_R3/entity/SnowmanController.java | 2 +- .../nms/v1_16_R3/entity/SpiderController.java | 2 +- .../nms/v1_16_R3/entity/SquidController.java | 2 +- .../nms/v1_16_R3/entity/StriderController.java | 2 +- .../nms/v1_16_R3/entity/TraderLlamaController.java | 2 +- .../nms/v1_16_R3/entity/TropicalFishController.java | 2 +- .../nms/v1_16_R3/entity/TurtleController.java | 2 +- .../nms/v1_16_R3/entity/VillagerController.java | 2 +- .../nms/v1_16_R3/entity/VindicatorController.java | 2 +- .../v1_16_R3/entity/WanderingTraderController.java | 2 +- .../nms/v1_16_R3/entity/WitchController.java | 2 +- .../nms/v1_16_R3/entity/WitherController.java | 2 +- .../nms/v1_16_R3/entity/WolfController.java | 2 +- .../nms/v1_16_R3/entity/ZoglinController.java | 2 +- .../nms/v1_16_R3/entity/ZombieController.java | 2 +- .../nms/v1_16_R3/entity/ZombieHuskController.java | 2 +- .../nms/v1_16_R3/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java | 5 ++++- .../nms/v1_17_R1/entity/AxolotlController.java | 2 +- .../nms/v1_17_R1/entity/BlazeController.java | 2 +- .../nms/v1_17_R1/entity/CatController.java | 2 +- .../nms/v1_17_R1/entity/ChickenController.java | 2 +- .../nms/v1_17_R1/entity/CodController.java | 2 +- .../nms/v1_17_R1/entity/CowController.java | 2 +- .../nms/v1_17_R1/entity/CreeperController.java | 2 +- .../nms/v1_17_R1/entity/DolphinController.java | 2 +- .../nms/v1_17_R1/entity/DrownedController.java | 2 +- .../nms/v1_17_R1/entity/EnderDragonController.java | 2 +- .../nms/v1_17_R1/entity/EndermanController.java | 2 +- .../nms/v1_17_R1/entity/EndermiteController.java | 2 +- .../nms/v1_17_R1/entity/EvokerController.java | 2 +- .../nms/v1_17_R1/entity/FoxController.java | 2 +- .../nms/v1_17_R1/entity/GhastController.java | 2 +- .../nms/v1_17_R1/entity/GiantController.java | 2 +- .../nms/v1_17_R1/entity/GlowSquidController.java | 2 +- .../nms/v1_17_R1/entity/GoatController.java | 2 +- .../nms/v1_17_R1/entity/GuardianController.java | 2 +- .../nms/v1_17_R1/entity/GuardianElderController.java | 2 +- .../nms/v1_17_R1/entity/HoglinController.java | 2 +- .../nms/v1_17_R1/entity/HorseController.java | 2 +- .../nms/v1_17_R1/entity/HorseDonkeyController.java | 2 +- .../nms/v1_17_R1/entity/HorseMuleController.java | 2 +- .../nms/v1_17_R1/entity/HorseSkeletonController.java | 2 +- .../nms/v1_17_R1/entity/HorseZombieController.java | 2 +- .../nms/v1_17_R1/entity/IllusionerController.java | 2 +- .../nms/v1_17_R1/entity/IronGolemController.java | 2 +- .../nms/v1_17_R1/entity/LlamaController.java | 2 +- .../nms/v1_17_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_17_R1/entity/MushroomCowController.java | 2 +- .../nms/v1_17_R1/entity/OcelotController.java | 2 +- .../nms/v1_17_R1/entity/PandaController.java | 2 +- .../nms/v1_17_R1/entity/PhantomController.java | 2 +- .../nms/v1_17_R1/entity/PigController.java | 2 +- .../nms/v1_17_R1/entity/PigZombieController.java | 2 +- .../nms/v1_17_R1/entity/PiglinBruteController.java | 2 +- .../nms/v1_17_R1/entity/PiglinController.java | 2 +- .../nms/v1_17_R1/entity/PillagerController.java | 2 +- .../nms/v1_17_R1/entity/PufferFishController.java | 2 +- .../nms/v1_17_R1/entity/RabbitController.java | 2 +- .../nms/v1_17_R1/entity/RavagerController.java | 2 +- .../nms/v1_17_R1/entity/SalmonController.java | 2 +- .../nms/v1_17_R1/entity/SheepController.java | 2 +- .../nms/v1_17_R1/entity/ShulkerController.java | 2 +- .../nms/v1_17_R1/entity/SilverfishController.java | 2 +- .../nms/v1_17_R1/entity/SkeletonController.java | 2 +- .../nms/v1_17_R1/entity/SkeletonStrayController.java | 2 +- .../nms/v1_17_R1/entity/SkeletonWitherController.java | 2 +- .../nms/v1_17_R1/entity/SlimeController.java | 2 +- .../nms/v1_17_R1/entity/SnowmanController.java | 2 +- .../nms/v1_17_R1/entity/SpiderController.java | 2 +- .../nms/v1_17_R1/entity/SquidController.java | 2 +- .../nms/v1_17_R1/entity/StriderController.java | 2 +- .../nms/v1_17_R1/entity/TraderLlamaController.java | 2 +- .../nms/v1_17_R1/entity/TropicalFishController.java | 2 +- .../nms/v1_17_R1/entity/TurtleController.java | 2 +- .../nms/v1_17_R1/entity/VillagerController.java | 2 +- .../nms/v1_17_R1/entity/VindicatorController.java | 2 +- .../v1_17_R1/entity/WanderingTraderController.java | 2 +- .../nms/v1_17_R1/entity/WitchController.java | 2 +- .../nms/v1_17_R1/entity/WitherController.java | 2 +- .../nms/v1_17_R1/entity/WolfController.java | 2 +- .../nms/v1_17_R1/entity/ZoglinController.java | 2 +- .../nms/v1_17_R1/entity/ZombieController.java | 2 +- .../nms/v1_17_R1/entity/ZombieHuskController.java | 2 +- .../nms/v1_17_R1/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java | 5 ++++- .../nms/v1_18_R2/entity/AxolotlController.java | 2 +- .../nms/v1_18_R2/entity/BlazeController.java | 2 +- .../nms/v1_18_R2/entity/CatController.java | 2 +- .../nms/v1_18_R2/entity/ChickenController.java | 2 +- .../nms/v1_18_R2/entity/CodController.java | 2 +- .../nms/v1_18_R2/entity/CowController.java | 2 +- .../nms/v1_18_R2/entity/CreeperController.java | 2 +- .../nms/v1_18_R2/entity/DolphinController.java | 2 +- .../nms/v1_18_R2/entity/DrownedController.java | 2 +- .../nms/v1_18_R2/entity/EnderDragonController.java | 2 +- .../nms/v1_18_R2/entity/EndermanController.java | 2 +- .../nms/v1_18_R2/entity/EndermiteController.java | 2 +- .../nms/v1_18_R2/entity/EvokerController.java | 2 +- .../nms/v1_18_R2/entity/FoxController.java | 2 +- .../nms/v1_18_R2/entity/GhastController.java | 2 +- .../nms/v1_18_R2/entity/GiantController.java | 2 +- .../nms/v1_18_R2/entity/GlowSquidController.java | 2 +- .../nms/v1_18_R2/entity/GoatController.java | 2 +- .../nms/v1_18_R2/entity/GuardianController.java | 2 +- .../nms/v1_18_R2/entity/GuardianElderController.java | 2 +- .../nms/v1_18_R2/entity/HoglinController.java | 2 +- .../nms/v1_18_R2/entity/HorseController.java | 2 +- .../nms/v1_18_R2/entity/HorseDonkeyController.java | 2 +- .../nms/v1_18_R2/entity/HorseMuleController.java | 2 +- .../nms/v1_18_R2/entity/HorseSkeletonController.java | 2 +- .../nms/v1_18_R2/entity/HorseZombieController.java | 2 +- .../nms/v1_18_R2/entity/IllusionerController.java | 2 +- .../nms/v1_18_R2/entity/IronGolemController.java | 2 +- .../nms/v1_18_R2/entity/LlamaController.java | 2 +- .../nms/v1_18_R2/entity/MagmaCubeController.java | 2 +- .../nms/v1_18_R2/entity/MushroomCowController.java | 2 +- .../nms/v1_18_R2/entity/OcelotController.java | 2 +- .../nms/v1_18_R2/entity/PandaController.java | 2 +- .../nms/v1_18_R2/entity/PhantomController.java | 2 +- .../nms/v1_18_R2/entity/PigController.java | 2 +- .../nms/v1_18_R2/entity/PigZombieController.java | 2 +- .../nms/v1_18_R2/entity/PiglinBruteController.java | 2 +- .../nms/v1_18_R2/entity/PiglinController.java | 2 +- .../nms/v1_18_R2/entity/PillagerController.java | 2 +- .../nms/v1_18_R2/entity/PufferFishController.java | 2 +- .../nms/v1_18_R2/entity/RabbitController.java | 2 +- .../nms/v1_18_R2/entity/RavagerController.java | 2 +- .../nms/v1_18_R2/entity/SalmonController.java | 2 +- .../nms/v1_18_R2/entity/SheepController.java | 2 +- .../nms/v1_18_R2/entity/ShulkerController.java | 2 +- .../nms/v1_18_R2/entity/SilverfishController.java | 2 +- .../nms/v1_18_R2/entity/SkeletonController.java | 2 +- .../nms/v1_18_R2/entity/SkeletonStrayController.java | 2 +- .../nms/v1_18_R2/entity/SkeletonWitherController.java | 2 +- .../nms/v1_18_R2/entity/SlimeController.java | 2 +- .../nms/v1_18_R2/entity/SnowmanController.java | 2 +- .../nms/v1_18_R2/entity/SpiderController.java | 2 +- .../nms/v1_18_R2/entity/SquidController.java | 2 +- .../nms/v1_18_R2/entity/StriderController.java | 2 +- .../nms/v1_18_R2/entity/TraderLlamaController.java | 2 +- .../nms/v1_18_R2/entity/TropicalFishController.java | 2 +- .../nms/v1_18_R2/entity/TurtleController.java | 2 +- .../nms/v1_18_R2/entity/VillagerController.java | 2 +- .../nms/v1_18_R2/entity/VindicatorController.java | 2 +- .../v1_18_R2/entity/WanderingTraderController.java | 2 +- .../nms/v1_18_R2/entity/WitchController.java | 2 +- .../nms/v1_18_R2/entity/WitherController.java | 2 +- .../nms/v1_18_R2/entity/WolfController.java | 2 +- .../nms/v1_18_R2/entity/ZoglinController.java | 2 +- .../nms/v1_18_R2/entity/ZombieController.java | 2 +- .../nms/v1_18_R2/entity/ZombieHuskController.java | 2 +- .../nms/v1_18_R2/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java | 4 ++++ .../nms/v1_19_R2/entity/AllayController.java | 2 +- .../nms/v1_19_R2/entity/AxolotlController.java | 2 +- .../nms/v1_19_R2/entity/BatController.java | 2 +- .../nms/v1_19_R2/entity/BeeController.java | 2 +- .../nms/v1_19_R2/entity/BlazeController.java | 2 +- .../nms/v1_19_R2/entity/CamelController.java | 2 +- .../nms/v1_19_R2/entity/CatController.java | 2 +- .../nms/v1_19_R2/entity/CaveSpiderController.java | 2 +- .../nms/v1_19_R2/entity/ChickenController.java | 2 +- .../nms/v1_19_R2/entity/CodController.java | 2 +- .../nms/v1_19_R2/entity/CowController.java | 2 +- .../nms/v1_19_R2/entity/CreeperController.java | 2 +- .../nms/v1_19_R2/entity/DolphinController.java | 2 +- .../nms/v1_19_R2/entity/DrownedController.java | 2 +- .../nms/v1_19_R2/entity/EnderDragonController.java | 2 +- .../nms/v1_19_R2/entity/EndermanController.java | 2 +- .../nms/v1_19_R2/entity/EndermiteController.java | 2 +- .../nms/v1_19_R2/entity/EvokerController.java | 2 +- .../nms/v1_19_R2/entity/FoxController.java | 2 +- .../nms/v1_19_R2/entity/FrogController.java | 2 +- .../nms/v1_19_R2/entity/GhastController.java | 2 +- .../nms/v1_19_R2/entity/GiantController.java | 2 +- .../nms/v1_19_R2/entity/GlowSquidController.java | 2 +- .../nms/v1_19_R2/entity/GoatController.java | 2 +- .../nms/v1_19_R2/entity/GuardianController.java | 2 +- .../nms/v1_19_R2/entity/GuardianElderController.java | 2 +- .../nms/v1_19_R2/entity/HoglinController.java | 2 +- .../nms/v1_19_R2/entity/HorseController.java | 2 +- .../nms/v1_19_R2/entity/HorseDonkeyController.java | 2 +- .../nms/v1_19_R2/entity/HorseMuleController.java | 2 +- .../nms/v1_19_R2/entity/HorseSkeletonController.java | 2 +- .../nms/v1_19_R2/entity/HorseZombieController.java | 2 +- .../nms/v1_19_R2/entity/IllusionerController.java | 2 +- .../nms/v1_19_R2/entity/IronGolemController.java | 2 +- .../nms/v1_19_R2/entity/LlamaController.java | 2 +- .../nms/v1_19_R2/entity/MagmaCubeController.java | 2 +- .../nms/v1_19_R2/entity/MushroomCowController.java | 2 +- .../nms/v1_19_R2/entity/OcelotController.java | 2 +- .../nms/v1_19_R2/entity/PandaController.java | 2 +- .../nms/v1_19_R2/entity/ParrotController.java | 2 +- .../nms/v1_19_R2/entity/PhantomController.java | 2 +- .../nms/v1_19_R2/entity/PigController.java | 2 +- .../nms/v1_19_R2/entity/PigZombieController.java | 2 +- .../nms/v1_19_R2/entity/PiglinBruteController.java | 2 +- .../nms/v1_19_R2/entity/PiglinController.java | 2 +- .../nms/v1_19_R2/entity/PillagerController.java | 2 +- .../nms/v1_19_R2/entity/PolarBearController.java | 2 +- .../nms/v1_19_R2/entity/PufferFishController.java | 2 +- .../nms/v1_19_R2/entity/RabbitController.java | 2 +- .../nms/v1_19_R2/entity/RavagerController.java | 2 +- .../nms/v1_19_R2/entity/SalmonController.java | 2 +- .../nms/v1_19_R2/entity/SheepController.java | 2 +- .../nms/v1_19_R2/entity/ShulkerController.java | 2 +- .../nms/v1_19_R2/entity/SilverfishController.java | 2 +- .../nms/v1_19_R2/entity/SkeletonController.java | 2 +- .../nms/v1_19_R2/entity/SkeletonStrayController.java | 2 +- .../nms/v1_19_R2/entity/SkeletonWitherController.java | 2 +- .../nms/v1_19_R2/entity/SlimeController.java | 2 +- .../nms/v1_19_R2/entity/SnowmanController.java | 2 +- .../nms/v1_19_R2/entity/SpiderController.java | 2 +- .../nms/v1_19_R2/entity/SquidController.java | 2 +- .../nms/v1_19_R2/entity/StriderController.java | 2 +- .../nms/v1_19_R2/entity/TadpoleController.java | 2 +- .../nms/v1_19_R2/entity/TraderLlamaController.java | 2 +- .../nms/v1_19_R2/entity/TropicalFishController.java | 2 +- .../nms/v1_19_R2/entity/TurtleController.java | 2 +- .../nms/v1_19_R2/entity/VexController.java | 2 +- .../nms/v1_19_R2/entity/VillagerController.java | 2 +- .../nms/v1_19_R2/entity/VindicatorController.java | 2 +- .../v1_19_R2/entity/WanderingTraderController.java | 2 +- .../nms/v1_19_R2/entity/WardenController.java | 2 +- .../nms/v1_19_R2/entity/WitchController.java | 2 +- .../nms/v1_19_R2/entity/WitherController.java | 2 +- .../nms/v1_19_R2/entity/WolfController.java | 2 +- .../nms/v1_19_R2/entity/ZoglinController.java | 2 +- .../nms/v1_19_R2/entity/ZombieController.java | 2 +- .../nms/v1_19_R2/entity/ZombieHuskController.java | 2 +- .../nms/v1_19_R2/entity/ZombieVillagerController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java | 5 ++++- .../nms/v1_8_R3/entity/BlazeController.java | 2 +- .../nms/v1_8_R3/entity/ChickenController.java | 2 +- .../nms/v1_8_R3/entity/CowController.java | 2 +- .../nms/v1_8_R3/entity/CreeperController.java | 2 +- .../nms/v1_8_R3/entity/EnderDragonController.java | 2 +- .../nms/v1_8_R3/entity/EndermanController.java | 2 +- .../nms/v1_8_R3/entity/EndermiteController.java | 2 +- .../nms/v1_8_R3/entity/GhastController.java | 2 +- .../nms/v1_8_R3/entity/GiantController.java | 2 +- .../nms/v1_8_R3/entity/GuardianController.java | 2 +- .../nms/v1_8_R3/entity/HorseController.java | 2 +- .../nms/v1_8_R3/entity/IronGolemController.java | 2 +- .../nms/v1_8_R3/entity/MagmaCubeController.java | 2 +- .../nms/v1_8_R3/entity/MushroomCowController.java | 2 +- .../nms/v1_8_R3/entity/OcelotController.java | 2 +- .../nms/v1_8_R3/entity/PigController.java | 2 +- .../nms/v1_8_R3/entity/PigZombieController.java | 2 +- .../nms/v1_8_R3/entity/RabbitController.java | 2 +- .../nms/v1_8_R3/entity/SheepController.java | 2 +- .../nms/v1_8_R3/entity/SilverfishController.java | 2 +- .../nms/v1_8_R3/entity/SkeletonController.java | 2 +- .../nms/v1_8_R3/entity/SlimeController.java | 2 +- .../nms/v1_8_R3/entity/SnowmanController.java | 2 +- .../nms/v1_8_R3/entity/SpiderController.java | 2 +- .../nms/v1_8_R3/entity/SquidController.java | 2 +- .../nms/v1_8_R3/entity/VillagerController.java | 2 +- .../nms/v1_8_R3/entity/WitchController.java | 2 +- .../nms/v1_8_R3/entity/WitherController.java | 2 +- .../nms/v1_8_R3/entity/WolfController.java | 2 +- .../nms/v1_8_R3/entity/ZombieController.java | 2 +- .../net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java | 4 ++++ 607 files changed, 641 insertions(+), 867 deletions(-) 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 0f3bf4197..25208db16 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 cb8a7fb6a..863de7dc6 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,15 +125,7 @@ public class BlazeController 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, 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 6f4827185..d08703f6e 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,15 +161,7 @@ public class ChickenController 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, 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 93d22468b..580b9e093 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,15 +176,7 @@ public class CowController 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, 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 94bf24a6a..e4bf9795b 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,15 +160,7 @@ public class CreeperController 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, 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 1dbd350b6..05c5d2a98 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,15 +124,7 @@ public class EnderDragonController 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, 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 25198b02d..68a9249f6 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,15 +149,7 @@ public class EndermanController 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, 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 2d9f7d654..2f70caa98 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,15 +149,7 @@ public class EndermiteController 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, 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 281093940..234094793 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,15 +116,7 @@ public class GhastController 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, 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 dc9a96f12..be82f12a2 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,15 +135,7 @@ public class GiantController 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, 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 ee43af075..d06814b56 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,15 +136,7 @@ public class GuardianController 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, 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 18fb9077e..522d51abb 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,15 +166,7 @@ public class HorseController 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, 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 3f0cec858..b6d1f2fa5 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,15 +135,7 @@ public class IronGolemController 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, 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 a49440523..c3be69a26 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,15 +148,7 @@ public class MagmaCubeController 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, 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 c19637aae..b7aaf3001 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,15 +157,7 @@ public class MushroomCowController 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, 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 0073d9e3d..a789fdb33 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,15 +153,7 @@ public class OcelotController 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, 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 c43b84362..ae75d5493 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,15 +156,7 @@ public class PigController 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, 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 d99edf4ce..018fc8c0a 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,15 +136,7 @@ public class PigZombieController 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, 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 3fa89e7f7..7fca2c1f1 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5c8679025..b10356f67 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,15 +153,7 @@ public class RabbitController 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, 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 a101ec39b..4e50fb1b7 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,15 +146,7 @@ public class SheepController 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, 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 371f0d769..ff68daa68 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,15 +136,7 @@ public class ShulkerController 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, 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 603ce6b46..542d072ed 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,15 +135,7 @@ public class SilverfishController 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, 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 24c633ead..c2a26ecb3 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,15 +135,7 @@ public class SkeletonController 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, 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 e061191fb..828d48b6a 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,15 +149,7 @@ public class SlimeController 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, 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 f7f05d235..d944e212c 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,15 +135,7 @@ public class SnowmanController 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, 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 4d7745927..8db6299e0 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,15 +135,7 @@ public class SpiderController 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, 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 9515e7857..c008c9826 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,15 +135,7 @@ public class SquidController 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, 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 99675d2ce..52822966e 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 @@ -39,7 +39,6 @@ public class VillagerController extends MobEntityController { public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { private boolean blockingATrade; - private final CitizensNPC npc; public EntityVillagerNPC(World world) { @@ -170,15 +169,7 @@ public class VillagerController 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, 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 b15e91535..53167fc9b 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,15 +135,7 @@ public class WitchController 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, 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 3d53603e2..c396b58b3 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,15 +116,7 @@ public class WitherController 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, 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 87c6733ef..41d322185 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,15 +149,7 @@ public class WolfController 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, 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 5a4d2a900..b03399483 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,15 +135,7 @@ public class ZombieController 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, 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 8c4cb30c0..9291f8ef0 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 @@ -1801,6 +1801,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.n(); } @@ -1915,6 +1919,7 @@ public class NMSImpl implements NMSBridge { private static Field SKULL_PROFILE_FIELD; private static MethodHandle TEAM_FIELD; private static Field TRACKED_ENTITY_SET = NMS.getField(EntityTracker.class, "c"); + private static final Field WITHER_BOSS_BAR_FIELD = NMS.getField(EntityWither.class, "bG"); static { 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 9272488b8..615c63b9d 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ebd9900f7..b02526034 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b63e16818..b62389073 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1ba82d530..b77a52703 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7d6bcaa46..4f2340c95 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8e6279eaf..fcb190e34 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e4e33a8fc..a71327b98 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0d3bff3bc..1857bf544 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 362ccdc09..c00d87efb 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 13015cef7..288581314 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 05d2ef482..4d087f27c 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 003d7e401..b202d25be 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1e19a913b..8395f5e55 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5b3527f7a..b49ebe6b2 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f4263d0ac..a2e76a501 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d5d79c279..36183282b 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ae5b0b230..ded4eb56f 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 31dd61bce..6e2aea30e 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 23265a8d7..a12f1bd15 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 30679ecee..f5fdafdfa 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0c068219c..f6b173e43 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 875579c2b..b25774309 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ba9883098..7ffaa4e94 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5907e01bc..72b0835ac 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 58de2658e..d52013d9b 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 01f13ccf7..1a39e4413 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 35a2af843..7ffd5f5f8 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c8b9adf01..49f5882a5 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7501be81a..7533ddfb8 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5060d0b93..674813017 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a92f4b706..58f5aa26a 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 20bacd7fa..091dc1b31 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a0359d018..93e6c2162 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c128bbd9b..201b68c95 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4db1a38f4..0bab5daed 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 47e5b0885..b12c9df19 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 2689caded..78b0d6b02 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 21b8694eb..6f1e18c64 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3b7e546da..3b3176360 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 899d6e10c..bd58b8177 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 73244fbc6..bfca0bbe5 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 05fca1cf1..c5da27a85 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 76039cc73..b67c61781 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1b2a4957c..1751cfe79 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 @@ -1867,6 +1867,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.n(); } @@ -1978,11 +1982,8 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle REPAIR_INVENTORY = NMS.getGetter(ContainerAnvil.class, "h"); private static final MethodHandle RESULT_INVENTORY = NMS.getGetter(ContainerAnvil.class, "g"); private static Field SKULL_PROFILE_FIELD; - private static MethodHandle TEAM_FIELD; - private static Field TRACKED_ENTITY_SET = NMS.getField(EntityTracker.class, "c"); - private static final Field WITHER_BOSS_BAR_FIELD = NMS.getField(EntityWither.class, "bF"); static { 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 c4d5de707..824204fbe 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 37f46b32f..da1db5f0c 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ddabb4a29..f0415b45e 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e2fcbb7a2..8ab94b737 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 734d11fbf..16d13bd2c 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b57fb96ad..12b894db6 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 55c7e24fc..c684ed315 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3dcfd1c8a..4e10a08b2 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8f0bf03e0..6d0b45b4c 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 df3ac569f..fa1d4e60d 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 89bce348f..84e3d5e65 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b3e3183b6..4bb77a48f 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ca2b2c0b1..830857976 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d9de491e1..224b3b223 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3a11e5e35..1edd330ed 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 dbfe503dd..3191fe5b3 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 51e764484..213009cf4 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f6cf087a0..55dad6fa4 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a5a8ec21d..21255bcaa 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5c51cdb99..199565438 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9e4528089..352c1f6e7 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 16c91df12..d891b09c2 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 6edd5a589..93fccb5ca 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 447bd8eec..9e2bfc910 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5fefafa9f..b14cc1fca 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ecb532c64..ad298a6c4 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 669028fbb..cfaccb916 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 19819dcc7..60e2f95d0 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e6e385748..e56990c57 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 2ebe52a13..84de8f329 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b930f8ce9..a26adfab7 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 77d332e3d..2adc9eb46 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 30fbe4ccc..0488294bc 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 77696e85a..ea8f219be 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ae3be2497..80538eede 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 05d669fe9..9ea133377 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c74cb3bd6..6843d7e38 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d9ed7d612..d046c9778 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7b232452a..e5ef22dce 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d82e798be..fded670c1 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c3c334952..0ddc2fb11 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 858e2eb14..09288ed93 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ab50acb48..128884308 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8529a17e1..05770d1ae 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 NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3609e2d19..8033de3f9 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 @@ -1874,6 +1874,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.o(); } 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 d80a4d0bf..7cc25d297 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 @@ -152,7 +152,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 940140ba0..2c606b20c 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 @@ -190,7 +190,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 49326b271..d477860b7 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 @@ -196,7 +196,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a7a84b3b4..6bc4d1395 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 @@ -203,7 +203,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3f5d43fb1..eeaf8d288 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 @@ -179,7 +179,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d7831e97e..47893f203 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 @@ -190,7 +190,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d302239d0..41afcf32d 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 @@ -175,7 +175,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f393cec34..c7f68d69f 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 @@ -153,7 +153,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b2505b594..65a8ea763 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 @@ -176,7 +176,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fa9590993..7c3d10a46 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 @@ -176,7 +176,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 58b76037c..73c39c554 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 @@ -163,7 +163,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 cf27e849c..1614af2e1 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 @@ -138,7 +138,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b15e72a4f..45432c142 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 @@ -162,7 +162,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4943e01f6..08cfb47a4 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 @@ -165,7 +165,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b641a3bae..0ee7924be 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 @@ -165,7 +165,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 928e102cf..20e7b4c20 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 @@ -200,7 +200,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d13327ecc..ecf65744e 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 @@ -200,7 +200,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4372bbc24..287be44cc 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 @@ -200,7 +200,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d42a366a1..8b02c0d5e 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 @@ -201,7 +201,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 14cb66c1e..d56a5f702 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 @@ -201,7 +201,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f0d223261..bca4a1845 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 @@ -162,7 +162,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 dece7dec9..ab6078217 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 @@ -162,7 +162,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a3d068824..7daaa1692 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 @@ -185,7 +185,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3ebc5587a..fbb3f0ab0 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 @@ -175,7 +175,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 82ecfdf08..6eee24856 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 @@ -183,7 +183,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 02e715a54..950afb8f8 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 @@ -181,7 +181,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 585e4083a..b622556e4 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 @@ -179,7 +179,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5fc9806f1..eda4d1f8d 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 @@ -181,7 +181,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 81819db4e..3fca00dd4 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 @@ -163,7 +163,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 973615f54..9999e2ff1 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 @@ -184,7 +184,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 eed9d5afd..c6a2d403e 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 @@ -180,7 +180,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fbf6a3a09..bacf11063 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 @@ -182,7 +182,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 81c0a62e0..4a575e901 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 @@ -173,7 +173,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 407985557..c347ab09c 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 @@ -164,7 +164,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b1a4c6ee7..d40c80c73 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 @@ -161,7 +161,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5c8e2447f..11e816def 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 @@ -161,7 +161,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 43b877cda..f2f11084e 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 @@ -161,7 +161,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8bc0878ff..bf549ab59 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 @@ -161,7 +161,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a65967335..5f995db0c 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 @@ -175,7 +175,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5ae423072..6bc2d721c 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 @@ -161,7 +161,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 787a7441f..8aa65d54a 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 @@ -161,7 +161,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1dc86b26a..0de110f09 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 @@ -161,7 +161,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 eadbad6ff..ff6a71dd9 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 @@ -182,7 +182,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 04e00dd91..a575a6257 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 @@ -170,7 +170,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 10db212bb..cfe77895b 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 @@ -202,7 +202,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c0943e528..5c875d007 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 @@ -173,7 +173,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ce59245dc..ccd5827bd 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 @@ -161,7 +161,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3a7c97790..21964053d 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 @@ -142,7 +142,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5dbd19eaf..eb8f3a7fa 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 @@ -175,7 +175,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 02ce101e8..acf1f8314 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 @@ -161,7 +161,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 95957c6bc..374994768 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 @@ -161,7 +161,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a89ef61c2..a73e756ef 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 @@ -161,7 +161,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1b1dceec7..124b8f5d2 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 @@ -1975,6 +1975,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.p(); } @@ -2101,7 +2105,6 @@ public class NMSImpl implements NMSBridge { EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, EntityType.SHULKER, EntityType.PHANTOM); - private static final Method BLOCK_POSITION_B_D = NMS.getMethod(BlockPosition.PooledBlockPosition.class, "e", false, double.class, double.class, double.class); private static final Field CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getField(CraftBossBar.class, "handle"); @@ -2126,13 +2129,9 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle REPAIR_INVENTORY = NMS.getGetter(ContainerAnvil.class, "repairInventory"); private static final MethodHandle RESULT_INVENTORY = NMS.getGetter(ContainerAnvil.class, "resultInventory"); private static Field SKULL_PROFILE_FIELD; - private static MethodHandle TEAM_FIELD; - private static Field TRACKED_ENTITY_SET = NMS.getField(EntityTracker.class, "c"); - private static final Field WITHER_BOSS_BAR_FIELD = NMS.getField(EntityWither.class, "bL", false); - static { try { ENTITY_FISH_NUM_IN_SCHOOL = NMS.getField(Class.forName("net.minecraft.server.v1_13_R2.EntityFishSchool"), 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 2c0a0bd77..56c4bc58b 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 @@ -150,7 +150,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9d201b539..52db94a17 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 @@ -197,7 +197,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ce6703166..b529f16d8 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 @@ -198,7 +198,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 2b2755d9c..d2a03fa26 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 @@ -204,7 +204,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 11dc602c2..dfc548bac 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 @@ -212,7 +212,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 40a6946d6..05bc3d216 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 @@ -186,7 +186,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 60cea8361..d8e7c07a1 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 @@ -199,7 +199,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 239ebf983..63944b502 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 @@ -183,7 +183,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fbd7abd75..fa096d2c1 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 @@ -149,7 +149,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 54aa04321..722990fe6 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 @@ -191,7 +191,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 134e18e2e..4c2e23e93 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 @@ -183,7 +183,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c8d8210df..87e049a09 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 @@ -170,7 +170,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 09d4bfc32..347339346 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 @@ -183,7 +183,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d8dc179c2..d5c597985 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 @@ -136,7 +136,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3f7d3e6b5..a3d22c781 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 @@ -169,7 +169,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0d6eec6a0..472de7bf9 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 @@ -170,7 +170,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 eda983254..c343f2591 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 @@ -170,7 +170,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d59b63680..c8aaf8522 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 @@ -216,7 +216,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1957e267e..e455d9521 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 @@ -215,7 +215,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 bcf6068bf..91d2a92de 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 @@ -215,7 +215,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 769a28208..c88ebcb90 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 @@ -216,7 +216,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c10e9763d..df5b6a8c3 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 @@ -216,7 +216,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0cca763eb..1987d8e0e 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 @@ -170,7 +170,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d5d1b8924..ed8ec16c5 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 @@ -169,7 +169,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 826c8baa2..ec598203a 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 @@ -195,7 +195,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e8b15360f..a03c6c76a 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 @@ -175,7 +175,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a2f554c92..604b9cbc8 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 @@ -193,7 +193,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f57963161..0d5d6ac14 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 @@ -191,7 +191,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c7114a39f..a73bc20dc 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 @@ -183,7 +183,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 307833d33..13f9bb584 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 @@ -184,7 +184,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d05aab387..8dcc0ce3a 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 @@ -191,7 +191,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 6b32979f0..b3afd8e40 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 @@ -170,7 +170,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f5d88f634..ebf98bb80 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 @@ -183,7 +183,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fa66b4057..02f3e4035 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 @@ -202,7 +202,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a969c0171..d9b40770b 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 @@ -190,7 +190,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 07c32f652..782c729fa 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 @@ -183,7 +183,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b19a65c23..47b0246c1 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 @@ -190,7 +190,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d8ebbffcf..ed76bbc30 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 @@ -183,7 +183,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b8060309c..4df245ba1 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 @@ -170,7 +170,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 46340411b..00464ba20 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 @@ -169,7 +169,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 06773fe97..df4c32a6a 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 @@ -169,7 +169,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5ad5de17d..2e5a75856 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 @@ -169,7 +169,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9532bb6d1..fef13b19a 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 @@ -169,7 +169,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 28872b3f7..d84c3f26c 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 @@ -176,7 +176,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fe1b06cff..d890cf317 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 @@ -169,7 +169,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3743a175f..47fcf9dbe 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 @@ -169,7 +169,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f5498d352..3e778d51f 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 @@ -169,7 +169,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 77316adb6..591880a7a 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 @@ -198,7 +198,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e253dfab2..983a78a8b 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 @@ -190,7 +190,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 2e074d757..aae64fd68 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 @@ -178,7 +178,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 65fa60c2e..7ee380651 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 @@ -218,7 +218,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 af63a4eba..0a147c79b 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 @@ -184,7 +184,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d112580ea..d7b684d0c 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 @@ -220,7 +220,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7349e7552..43b3583cc 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 @@ -169,7 +169,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 918a48c2c..2097a9c70 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 @@ -141,7 +141,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 948c8ae9a..23461a99c 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 @@ -186,7 +186,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 cdbb9035d..3f99306e7 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 @@ -169,7 +169,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9e2be2b58..9675f5a4d 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 @@ -169,7 +169,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ee00c1d61..926199b20 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 @@ -169,7 +169,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0f1007c1d..dde82016c 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 @@ -2047,6 +2047,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.n(); } @@ -2208,7 +2212,6 @@ public class NMSImpl implements NMSBridge { EntityType.PHANTOM); private static final MethodHandle BEHAVIOR_MAP = NMS.getGetter(BehaviorController.class, "c"); - private static final MethodHandle BLOCK_POSITION_B_D = NMS.getMethodHandle(BlockPosition.PooledBlockPosition.class, "c", false, double.class, double.class, double.class); private static final MethodHandle BUKKITENTITY_FIELD_SETTER = NMS.getSetter(Entity.class, "bukkitEntity"); @@ -2255,11 +2258,8 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle REPAIR_INVENTORY = NMS.getGetter(ContainerAnvil.class, "repairInventory"); private static final MethodHandle RESULT_INVENTORY = NMS.getGetter(ContainerAnvil.class, "resultInventory"); private static final MethodHandle SIZE_FIELD_GETTER = NMS.getGetter(Entity.class, "size"); - private static final MethodHandle SIZE_FIELD_SETTER = NMS.getSetter(Entity.class, "size"); - private static Field SKULL_PROFILE_FIELD; - private static MethodHandle TEAM_FIELD; static { 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 17544cff3..ad54c07a8 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 @@ -143,7 +143,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8701f04eb..8d6f3c7a9 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 @@ -191,7 +191,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3d96a619f..79dd64434 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 @@ -192,7 +192,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 6eb319f1e..fd23533c2 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 @@ -202,7 +202,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 dbb2331e4..9d7921415 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 @@ -206,7 +206,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 102eeb631..0ac6bb9f2 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 @@ -180,7 +180,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3dfccde7b..1361f3b41 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 @@ -197,7 +197,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0a7d1a7ae..342a27733 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 @@ -177,7 +177,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d76365ad7..e820f36a8 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 @@ -142,7 +142,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4524fb208..175fcb709 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 @@ -185,7 +185,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7cd883c37..e26745781 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 @@ -177,7 +177,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a3dc4ea55..9556fe4eb 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 @@ -172,7 +172,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1da77666a..c3e09928f 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 @@ -185,7 +185,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7c70dc414..075fd0a0d 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 @@ -137,7 +137,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 62b57d1ae..2cad8627c 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 @@ -171,7 +171,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8233a3c56..ab93e2ba0 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 @@ -172,7 +172,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fec2a2170..efe0e755c 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 @@ -172,7 +172,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d085e31d1..2bba4ba44 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 @@ -218,7 +218,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c98d0e13f..9288efee8 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 @@ -217,7 +217,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 6fb03c6df..877dc3339 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 @@ -217,7 +217,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fea28ae8d..010361a0f 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 @@ -218,7 +218,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 35c59f5fc..e0db11f3f 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 @@ -218,7 +218,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5ba7f7f91..f0199002d 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 @@ -172,7 +172,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f924b9c76..e3d7f6175 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 @@ -171,7 +171,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d1d75c01f..d2bc0448c 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 @@ -197,7 +197,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 196772dd4..17fffc98b 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 @@ -181,7 +181,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a017ee1fe..d393f132b 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 @@ -195,7 +195,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b3018d225..3c14c1958 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 @@ -187,7 +187,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 63247ccb2..6ed428502 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 @@ -185,7 +185,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9c4676398..ab7997410 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 @@ -192,7 +192,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f6537c7dd..905a38876 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 @@ -193,7 +193,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c317378c7..2761247ed 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 @@ -172,7 +172,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 13cf9fad2..d48a5498b 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 @@ -185,7 +185,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fe38ad01e..c2961561e 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 @@ -208,7 +208,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ee6c02f68..7046cb15e 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 @@ -192,7 +192,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 eef2f9b35..db56ede10 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 @@ -185,7 +185,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 11db67848..e697565b1 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 @@ -196,7 +196,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d19a9d558..13449606e 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 @@ -185,7 +185,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 847713ac3..c68c28d2a 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 @@ -172,7 +172,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9268cd9c9..0a2351947 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 @@ -171,7 +171,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 17586df1b..5e3b436e3 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 @@ -171,7 +171,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ca280707d..88c2bab25 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 @@ -171,7 +171,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 aea2ba922..b8381475a 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 @@ -171,7 +171,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ab7623b5e..462b0bf63 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 @@ -182,7 +182,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 6614126bd..eaf181d18 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 @@ -171,7 +171,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d36b3d482..3ea91ac6a 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 @@ -171,7 +171,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c75e8dd7a..f12a99b55 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 @@ -171,7 +171,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 88fa91ba3..4e0172517 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 @@ -200,7 +200,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4d31b6760..db219d214 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 @@ -196,7 +196,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4a8b472c5..f21fa654b 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 @@ -187,7 +187,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4d08a31d6..1df4c85c7 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 @@ -219,7 +219,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 91bcdabd8..dcf18be11 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 @@ -186,7 +186,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e7e1e99f3..c04253c07 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 @@ -220,7 +220,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 08b190b82..d8912a732 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 @@ -170,7 +170,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 aa74e46bf..1a6c49ad8 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 @@ -136,7 +136,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a87677cfd..e02c014ef 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 @@ -188,7 +188,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 be4ed45b2..66ed0918a 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 @@ -171,7 +171,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 af810c96d..37953b85a 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 @@ -171,7 +171,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b95c3811b..0198b277f 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 @@ -171,7 +171,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e56528fb5..0cfb02a74 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 @@ -2091,6 +2091,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.m(); } @@ -2300,7 +2304,6 @@ public class NMSImpl implements NMSBridge { true, EntityPlayer.class, boolean.class); private static final Map, EntityTypes> CITIZENS_ENTITY_TYPES = Maps.newHashMap(); - private static final MethodHandle CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getSetter(CraftBossBar.class, "handle"); private static final float DEFAULT_SPEED = 1F; private static final MethodHandle ENDERDRAGON_BATTLE_FIELD = NMS.getGetter(EntityEnderDragon.class, "bN"); @@ -2345,11 +2348,8 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle SET_POSE = NMS.getMethodHandle(Entity.class, "setPose", true, EntityPose.class); private static MethodHandle SET_PROFILE_METHOD; private static final MethodHandle SIZE_FIELD_GETTER = NMS.getGetter(Entity.class, "size"); - private static final MethodHandle SIZE_FIELD_SETTER = NMS.getSetter(Entity.class, "size"); - private static Field SKULL_PROFILE_FIELD; - private static MethodHandle TEAM_FIELD; static { 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 8e9094990..59524a505 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 @@ -143,7 +143,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fc2bcaa1e..9497944e3 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 @@ -191,7 +191,7 @@ public class CatController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 2596b83cc..719a37094 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 @@ -192,7 +192,7 @@ public class ChickenController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 768aabdfe..b1120a846 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 @@ -203,7 +203,7 @@ public class CodController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4269626d1..74ea3da9b 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 @@ -207,7 +207,7 @@ public class CowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b4f5d0bf8..b1e7732ea 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 @@ -181,7 +181,7 @@ public class CreeperController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9276286c8..8cf1a565e 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 @@ -197,7 +197,7 @@ public class DolphinController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8eadf1a85..b510faf78 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 @@ -177,7 +177,7 @@ public class DrownedController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f6f440f9d..ae34275da 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 @@ -142,7 +142,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f9eae27e6..990c231ff 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 @@ -185,7 +185,7 @@ public class EndermanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d806c4441..8f8ca9211 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 @@ -177,7 +177,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 efe6a70b7..9e12b8b3c 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 @@ -172,7 +172,7 @@ public class EvokerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 20019c246..a9f629ae7 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 @@ -185,7 +185,7 @@ public class FoxController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3add62f22..4b6f3f787 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 @@ -137,7 +137,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 48c479080..1eec0d51d 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 @@ -171,7 +171,7 @@ public class GiantController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e670678b6..2a7a0b6ab 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 @@ -172,7 +172,7 @@ public class GuardianController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b25062c0d..eadaf9dd7 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 @@ -172,7 +172,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 85ae62c7f..9b487c133 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 @@ -171,7 +171,7 @@ public class HoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 890ee591c..2bfd9db1e 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 @@ -218,7 +218,7 @@ public class HorseController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 930dc2275..26d5c01a8 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 @@ -214,7 +214,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d98560569..f0bc1a68d 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 @@ -214,7 +214,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 b162b89cf..16c24a308 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 @@ -218,7 +218,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d7efea5ee..3ddb0e6d3 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 @@ -54,11 +54,8 @@ public class HorseZombieController extends MobEntityController { public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { private double baseMovementSpeed; - boolean calledNMSHeight = false; - private final CitizensNPC npc; - private boolean riding; public EntityHorseZombieNPC(EntityTypes types, World world) { @@ -218,7 +215,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7da9247b9..c9c87be2e 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 @@ -172,7 +172,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e86458449..02c6ed03c 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 @@ -171,7 +171,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7198825cc..d1b6f3123 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 @@ -197,7 +197,7 @@ public class LlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 972c5eb3b..36bd62635 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 @@ -181,7 +181,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 6018e78c3..fd5e588a4 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 @@ -196,7 +196,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 2dfa956d2..879612d3c 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 @@ -187,7 +187,7 @@ public class OcelotController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4c8df1761..c675b601b 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 @@ -185,7 +185,7 @@ public class PandaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 cf68f1755..787e72203 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 @@ -206,7 +206,7 @@ public class PhantomController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0e87e63fa..28605047d 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 @@ -194,7 +194,7 @@ public class PigController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 585f1553d..c47cab8d1 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 @@ -172,7 +172,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1a2e39805..54144af3f 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 @@ -171,7 +171,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4ef689aaa..31ab59dfa 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 @@ -171,7 +171,7 @@ public class PiglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 126332b15..ce1a4c31b 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 @@ -185,7 +185,7 @@ public class PillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 07acecbdb..81e0f87ee 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 @@ -209,7 +209,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3ef0e780a..efb379e60 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 @@ -192,7 +192,7 @@ public class RabbitController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 7f8876c4a..70049aee0 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 @@ -185,7 +185,7 @@ public class RavagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8fe7c927e..e410cead8 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 @@ -197,7 +197,7 @@ public class SalmonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c530fcc95..9e8d6a878 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 @@ -185,7 +185,7 @@ public class SheepController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5d3b77fe2..6f36a6257 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 @@ -172,7 +172,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0164d1200..78ac64c48 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 @@ -171,7 +171,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 523ba12e1..6ad069c73 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 @@ -171,7 +171,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 330844db0..2c8be370e 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 @@ -171,7 +171,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 85e8e1b0d..743133fae 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 @@ -171,7 +171,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1ebda3713..7de9c634c 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 @@ -182,7 +182,7 @@ public class SlimeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5790a488e..6aa6e4347 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 @@ -171,7 +171,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1d60ee6c1..5f195eb61 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 @@ -171,7 +171,7 @@ public class SpiderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 73d984703..b633e8a47 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 @@ -171,7 +171,7 @@ public class SquidController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 63d576925..fa5aa56f3 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 @@ -171,7 +171,7 @@ public class StriderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 bc4d9c956..0d5f35954 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 @@ -200,7 +200,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 adee0f928..1d629851a 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 @@ -197,7 +197,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c0280b46d..edd9f1a75 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 @@ -187,7 +187,7 @@ public class TurtleController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 0b6549061..46f2fb809 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 @@ -221,7 +221,7 @@ public class VillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f9025ab80..c8c7e68c4 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 @@ -186,7 +186,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d10e753b7..f367b2fc3 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 @@ -224,7 +224,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 3575b3c00..c03067e70 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 @@ -171,7 +171,7 @@ public class WitchController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 dc0333b05..ab9ffabaa 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 @@ -136,7 +136,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ded33fa09..ff4c502ab 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 @@ -188,7 +188,7 @@ public class WolfController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 bda2fb955..140ee9289 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 @@ -171,7 +171,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 4c2607bb5..e84ae1fc2 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 @@ -171,7 +171,7 @@ public class ZombieController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 47f14291b..a65306968 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 @@ -171,7 +171,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 88c0729b5..8474dfc30 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 @@ -171,7 +171,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 863968f45..c6f961fe5 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 @@ -2059,6 +2059,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.m(); } @@ -2271,7 +2275,6 @@ public class NMSImpl implements NMSBridge { EntityType.SHULKER, EntityType.PHANTOM); private static final MethodHandle BEHAVIOR_MAP = NMS.getGetter(BehaviorController.class, "e"); - private static final MethodHandle BUKKITENTITY_FIELD_SETTER = NMS.getSetter(Entity.class, "bukkitEntity"); private static final MethodHandle CHUNKMAP_UPDATE_PLAYER_STATUS = NMS.getMethodHandle(PlayerChunkMap.class, "a", true, EntityPlayer.class, boolean.class); 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 c0c5cf4fa..f2cba8354 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 b661500ae..ccd746e2f 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 @@ -114,7 +114,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5f4af17e1..113e042ad 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 2ea086ea7..23766718d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 378b5ee0c..2974ed226 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 35e5b021d..6924a3a11 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 12eaaa8ed..402b85c0b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 b835dc51b..4eb6df3c4 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 f9ac827b4..190cb0e57 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ecec3519c..59961eda0 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 208c89bc9..aa69effaa 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 300805c9f..8541f089f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 8209cbe50..d7cbccaf1 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 4ccff18f1..327afc764 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 862596b44..44f48ee5e 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 @@ -114,7 +114,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 f19ae6800..9c9e1a4c5 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 2ea63a628..998de4f3e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5a00dbaf2..74a012a00 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 11b5934e0..e5abb6a26 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 e1a055e68..ba7c5aa4d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 2f1f78b79..c03aedd13 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 adb425d17..365f1a5e5 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 343a7c80a..52a50ae2c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 57a4b274e..e8639e42f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 729daedf0..b56587aa3 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 afd178901..f4a850f1b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 0bcc2eda5..99c43b20d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 297037582..e1e61a1ec 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a9c118452..6d7b6c4f1 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 745da0f1e..dcbd591fc 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 24eaf6e84..310b3cd08 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 782a5b437..4586d6d71 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 3c479e036..b4647756d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 74e5f0ac9..efbe2fa97 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 8a1952934..8bcc3fece 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d0e6b4c9b..70658fec4 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d4b60d1d2..af2cdef4e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 391bbe75e..399b8cb4e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 346dc00bf..c12036214 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 905ca487b..dd3f417c0 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 7efca336a..d95b28deb 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 0f986525c..f42c9306e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 dc06000a1..0a581e5c5 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 731e4ee1d..f9be00261 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a9234a532..98d69bc09 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 761e283f0..90c233972 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 13571460a..949118c86 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 fd69abbc6..9558264c5 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 395bc2e13..9bd6853de 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 8b36291f7..03fca44d8 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5f7ebb277..20d6c5573 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d5d1934f1..530f0c7e9 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ec9c4f632..e4977b2b6 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ace46da70..599844b35 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 9143a19f6..eb13c9e15 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 7094ef0b6..9451663c0 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 e724a2137..0e6fc9b95 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 c59698ac0..537bf0c15 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 1a3b227f7..91a69431c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 49ca0bf7b..6ba8f684f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 da485a1ed..27d07ceeb 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 98a82772e..1c131320c 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 @@ -118,7 +118,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d840a43e2..24253b08a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 1e3656ddc..bb23e819d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a26ec1999..05c2fb833 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 4ab7bc4ef..49653d8fd 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 51f2350a9..698491d2b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, this); } @Override 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 8d62cc368..b016b2c73 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 @@ -2064,6 +2064,10 @@ 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)); + } + @SuppressWarnings("deprecation") public static void minecartItemLogic(AbstractMinecart minecart) { NPC npc = ((NPCHolder) minecart).getNPC(); @@ -2268,7 +2272,6 @@ public class NMSImpl implements NMSBridge { EntityType.SILVERFISH, EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, EntityType.SHULKER, EntityType.PHANTOM); - private static final MethodHandle BEHAVIOR_MAP = NMS.getGetter(Brain.class, "f"); private static final MethodHandle BUKKITENTITY_FIELD_SETTER = NMS.getSetter(Entity.class, "bukkitEntity"); private static final MethodHandle CHUNKMAP_UPDATE_PLAYER_STATUS = NMS.getMethodHandle(ChunkMap.class, "a", true, 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 4f94f6b9d..06d2b870a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 3ad0a2a2f..cd984308a 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 @@ -116,7 +116,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5d0db67ca..e7b8cd255 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d6040ebbf..9aedbae95 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 783e1b438..bc31a4211 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5eba47934..e8a71cd2c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 0cc40bcf1..b4eea6ad3 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 6dded4444..9df7fa864 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 324618ed6..a9f01d228 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a45c55832..0075a929b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 82948d7fe..e4945aab2 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5716629ab..43734bf5e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 430f21e9c..c0f37f55e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d2d4a50c1..9f354b572 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ee163c5be..6c76f3944 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 @@ -116,7 +116,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 738bc3187..52ea60a1f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d0f697bcf..961db09f3 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5d08a011f..3839bcc51 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 871b69f35..66689675c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 f39fcdc22..9574a3c6b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 838017ec1..00036b59a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d9a00ebd4..642af3e3d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5df63077a..87e90c0a0 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 95b64028b..8e636366f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 b732fceae..b88defe31 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 10bb9b84a..4bcadf49c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 6547abec0..e1cd2616b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 da9e85198..8d18451dc 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 2c7c04452..4d2c6fe74 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 96c4a9528..15116b54c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5a7879b31..364cea887 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 22b72ecf4..f8fccebb5 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 50b1a23da..ed99931ea 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, this); } @Override 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 7a9cf1d37..ec0645546 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 870318cd7..6e13fa7de 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 bf9ae82a2..f30b35b7e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 015adbac6..20d14e05f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 460e215d1..b63238790 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 45fe7e065..4eee3840a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 49620ea24..71948e6ae 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 cd11b507f..1b144ca56 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 96d18df24..9e7a3868b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 feeef2092..94ae22342 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 8e2020c03..76ed60674 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 21147d7a3..b95cfbf05 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 945e84f75..2a35f6e17 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 79b7f6f9b..f36164598 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 9cafcd692..121fef706 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 2abb3e652..d3465abf1 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 8c395b6d4..ae4925640 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 2d1af7801..f1795d334 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 42bf3d485..22bef2691 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 f343e08b9..a875c84bf 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 c543843cc..616b9f989 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 0f5a259ef..c2f574a3c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 3c010f84b..2a4ece001 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 62bf201cb..aae0d263f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 3997adf66..c3bda3306 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 2fc10b191..999bf583f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 1db2bf0f9..beb52dd97 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 64aa72b1e..ab1b72f63 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 acda02055..d6fd7b2f6 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 @@ -120,7 +120,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 788ece178..bddb6a487 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 fa7a6bef3..ab0bb3283 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 0e6cda43a..e62444962 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 c6b909ae0..e1d63ae29 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 6a1e632e2..4babf9757 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, this); } @Override 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 955e7e6a8..dc4d0c81c 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 @@ -2072,6 +2072,10 @@ 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)); + } + @SuppressWarnings("deprecation") public static void minecartItemLogic(AbstractMinecart minecart) { NPC npc = ((NPCHolder) minecart).getNPC(); 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 9934fb608..60cf4501a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 3d7979b50..b89baddf2 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 1fec78d2c..88e80b93d 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 @@ -124,7 +124,7 @@ public class BatController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 56851c7ef..7dc848c3d 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 @@ -121,7 +121,7 @@ public class BeeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 05a0a7098..6cfd2627e 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 @@ -116,7 +116,7 @@ public class BlazeController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 28b43f251..7dd7adf8c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 6a9dce2d6..595bdf4e1 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 27308cc36..43eb1971b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 b90df105f..2564c9cf1 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a25dc6f90..41da59289 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 69031833d..489a56e64 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a95701e80..f0e165a5d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 98ebda990..53098d110 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 1b53ae9a1..d64768e35 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 3d5400bac..da36ed92a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 fbb9901e3..2fd08328d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 af48bd153..8765660b0 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 eaf5a412e..b8612e1a9 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 dd0c36a25..45f81035f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d25458232..1d35ae111 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 93e1bc942..5455200d5 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 @@ -116,7 +116,7 @@ public class GhastController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ac913bddb..beffea36b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 860b26a17..9259a54c7 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 c3c972876..56576fe2d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 68622ed9f..36c070202 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ae951a603..c2ed1d6a0 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a91e429c2..9301df44e 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 301aa6124..a2c031ab3 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a754c542f..9c0baaa4f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ba8428697..61f859000 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a6477db62..8132a13b3 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 4627d1aa9..7448ed7cb 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 267c5ad4a..24c6e6cde 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 e6973065d..95a4524fd 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 421a60144..7481e3c8d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 fbe571083..7316c1467 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 f1fea524a..aa0f4621a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 04342fc1e..3d8f1d856 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 761cbf7de..297f3d75d 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a4f7346ae..18e387a88 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 @@ -120,7 +120,7 @@ public class ParrotController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 c6e575ed9..d0f80f2fa 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ec72436bc..db38c7246 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 acdb951b2..27016f43b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ff2411afd..7d06394c1 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a32046f9e..7b7e12d8a 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 aefb764a1..9782639c3 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 e1c93f2ef..f3ad492e5 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 @@ -113,7 +113,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 7c26f408b..9f960fd04 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ba70925e4..805b05388 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 dedf567f0..edea56f37 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 f312e8c72..e476054d2 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 71c73bf4c..51441f251 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 9ff517c33..d86ab1851 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a0a06a797..b6bdb050f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 0eaa73c86..9e0bbebed 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 567315dae..ce98c42cc 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a6284b116..f038c70ad 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 a2328830d..bb30a06ba 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 5a8cc6eb7..e002ac110 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 55786be81..7079ef398 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 763d54743..17beb8b0f 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 9e3a77574..14574d578 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 785c3aa89..b79eeb0ab 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 4d46a92ae..f1a214628 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d531ab69f..c2c44b8d1 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 985157947..f86e2c391 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 d57d219fa..ce401bdb5 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 @@ -114,7 +114,7 @@ public class VexController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 f41cac98f..147403444 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 ff4232d1c..03f77be8c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 412ca602f..694d8c04b 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 8716b38ef..c0143ad96 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 dcb11bf48..129dc5401 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 8e6c3fbf6..d8cf13db1 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 @@ -120,7 +120,7 @@ public class WitherController extends MobEntityController { @Override public boolean isLeashed() { - return NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 e9150ddfd..134f4f7ce 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 b29af5aeb..4cca52874 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 27663c806..36c263333 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 13a723074..a231c121c 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, 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 6240b5363..53d2f5496 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 NMS.isLeashed(npc, super::isLeashed, () -> dropLeash(true, false)); + return NMSImpl.isLeashed(npc, this); } @Override 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 eac818547..04b4a2d3b 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 @@ -2208,6 +2208,10 @@ 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)); + } + @SuppressWarnings("deprecation") public static void minecartItemLogic(AbstractMinecart minecart) { NPC npc = ((NPCHolder) minecart).getNPC(); @@ -2442,7 +2446,6 @@ public class NMSImpl implements NMSBridge { } private static final MethodHandle ADVANCEMENTS_PLAYER_FIELD = NMS.getFinalSetter(ServerPlayer.class, "cq"); - private static final Set BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.BEE, EntityType.SILVERFISH, EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, 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 015df29a8..e6ff0b481 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a268ea323..db18302ea 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 363d4e124..f28e020bd 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d5a81f1ce..c9ea5b874 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 8a7325499..017a246d9 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5e7d2232d..d0efb1602 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 abb0268c0..9ded8e63e 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 014e57ce8..f949c513c 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 61687f681..113043f07 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1db7148e4..adb5eb895 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 fc457ba74..c125e2592 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 e7d85b220..cf2d821e9 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ec25e374b..920cf4dea 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 ca775ccc4..1dcc77c92 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 122a10abd..23ab4c1de 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 1e27db5c9..fc9b800c3 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 c882e2db2..23198d20d 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 db7173a5b..f5a139cac 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 099f717d8..28516d887 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 bd509e69d..09399e060 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 874e56818..e81763899 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 d0f03e584..1f2ab64c9 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 86e6e3885..5d84de66d 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 a4cccc1d0..a5581a21b 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 5ca4bba3f..cbc157cb0 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 17600e2a9..b9203b04d 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 9c54b4acc..e06f4f150 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 6a9eb8c47..1cac8a9e0 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f0545ef60..602666c0b 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 f597f0c67..c26fe69ac 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 NMS.isLeashed(npc, super::cc, () -> unleash(true, false)); + return NMSImpl.isLeashed(npc, 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 959402e21..f87aa606e 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 @@ -1664,6 +1664,10 @@ 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 isNavigationFinished(NavigationAbstract navigation) { return navigation.m(); }