From b243d9698cbef6e732561edfa9037bcf53631f44 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sat, 10 Dec 2022 13:29:05 +0800 Subject: [PATCH] Use npc.isProtected() --- .../net/citizensnpcs/nms/v1_10_R1/entity/BatController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/BlazeController.java | 2 +- .../nms/v1_10_R1/entity/CaveSpiderController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/ChickenController.java | 2 +- .../net/citizensnpcs/nms/v1_10_R1/entity/CowController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/CreeperController.java | 4 ++-- .../nms/v1_10_R1/entity/EnderDragonController.java | 2 +- .../nms/v1_10_R1/entity/EndermanController.java | 2 +- .../nms/v1_10_R1/entity/EndermiteController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/GhastController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/GiantController.java | 2 +- .../nms/v1_10_R1/entity/GuardianController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/HorseController.java | 4 ++-- .../nms/v1_10_R1/entity/IronGolemController.java | 2 +- .../nms/v1_10_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_10_R1/entity/MushroomCowController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/OcelotController.java | 2 +- .../net/citizensnpcs/nms/v1_10_R1/entity/PigController.java | 2 +- .../nms/v1_10_R1/entity/PigZombieController.java | 2 +- .../nms/v1_10_R1/entity/PolarBearController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/RabbitController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/SheepController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java | 2 +- .../nms/v1_10_R1/entity/SilverfishController.java | 2 +- .../nms/v1_10_R1/entity/SkeletonController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/SlimeController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/SpiderController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/SquidController.java | 2 +- .../nms/v1_10_R1/entity/VillagerController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/WitchController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/WitherController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/WolfController.java | 2 +- .../citizensnpcs/nms/v1_10_R1/entity/ZombieController.java | 2 +- .../v1_10_R1/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_10_R1/entity/nonliving/EggController.java | 2 +- .../nms/v1_10_R1/entity/nonliving/EnderPearlController.java | 2 +- .../v1_10_R1/entity/nonliving/LargeFireballController.java | 2 +- .../v1_10_R1/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../net/citizensnpcs/nms/v1_11_R1/entity/BatController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/BlazeController.java | 2 +- .../nms/v1_11_R1/entity/CaveSpiderController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/ChickenController.java | 2 +- .../net/citizensnpcs/nms/v1_11_R1/entity/CowController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_11_R1/entity/EvokerController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/GhastController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/GiantController.java | 2 +- .../nms/v1_11_R1/entity/GuardianController.java | 2 +- .../nms/v1_11_R1/entity/GuardianElderController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_11_R1/entity/LlamaController.java | 2 +- .../nms/v1_11_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_11_R1/entity/MushroomCowController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/OcelotController.java | 2 +- .../net/citizensnpcs/nms/v1_11_R1/entity/PigController.java | 2 +- .../nms/v1_11_R1/entity/PigZombieController.java | 2 +- .../nms/v1_11_R1/entity/PolarBearController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/RabbitController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/SheepController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_11_R1/entity/SlimeController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/SpiderController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/SquidController.java | 2 +- .../net/citizensnpcs/nms/v1_11_R1/entity/VexController.java | 2 +- .../nms/v1_11_R1/entity/VillagerController.java | 2 +- .../nms/v1_11_R1/entity/VindicatorController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/WitchController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/WitherController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/WolfController.java | 2 +- .../citizensnpcs/nms/v1_11_R1/entity/ZombieController.java | 2 +- .../nms/v1_11_R1/entity/ZombieHuskController.java | 2 +- .../nms/v1_11_R1/entity/ZombieVillagerController.java | 2 +- .../v1_11_R1/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_11_R1/entity/nonliving/EggController.java | 2 +- .../nms/v1_11_R1/entity/nonliving/EnderPearlController.java | 2 +- .../v1_11_R1/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_11_R1/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_11_R1/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../net/citizensnpcs/nms/v1_12_R1/entity/BatController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/BlazeController.java | 2 +- .../nms/v1_12_R1/entity/CaveSpiderController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/ChickenController.java | 2 +- .../net/citizensnpcs/nms/v1_12_R1/entity/CowController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_12_R1/entity/EvokerController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/GhastController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/GiantController.java | 2 +- .../nms/v1_12_R1/entity/GuardianController.java | 2 +- .../nms/v1_12_R1/entity/GuardianElderController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_12_R1/entity/LlamaController.java | 2 +- .../nms/v1_12_R1/entity/MagmaCubeController.java | 2 +- .../nms/v1_12_R1/entity/MushroomCowController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/OcelotController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/ParrotController.java | 4 ++-- .../net/citizensnpcs/nms/v1_12_R1/entity/PigController.java | 2 +- .../nms/v1_12_R1/entity/PigZombieController.java | 2 +- .../nms/v1_12_R1/entity/PolarBearController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/RabbitController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/SheepController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_12_R1/entity/SlimeController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/SpiderController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/SquidController.java | 2 +- .../net/citizensnpcs/nms/v1_12_R1/entity/VexController.java | 2 +- .../nms/v1_12_R1/entity/VillagerController.java | 2 +- .../nms/v1_12_R1/entity/VindicatorController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/WitchController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/WitherController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/WolfController.java | 2 +- .../citizensnpcs/nms/v1_12_R1/entity/ZombieController.java | 2 +- .../nms/v1_12_R1/entity/ZombieHuskController.java | 2 +- .../nms/v1_12_R1/entity/ZombieVillagerController.java | 2 +- .../v1_12_R1/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_12_R1/entity/nonliving/EggController.java | 2 +- .../nms/v1_12_R1/entity/nonliving/EnderPearlController.java | 2 +- .../v1_12_R1/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_12_R1/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_12_R1/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../net/citizensnpcs/nms/v1_13_R2/entity/BatController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/BlazeController.java | 4 ++-- .../nms/v1_13_R2/entity/CaveSpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/ChickenController.java | 4 ++-- .../net/citizensnpcs/nms/v1_13_R2/entity/CodController.java | 4 ++-- .../net/citizensnpcs/nms/v1_13_R2/entity/CowController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/CreeperController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/DolphinController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/DrownedController.java | 4 ++-- .../nms/v1_13_R2/entity/EnderDragonController.java | 4 ++-- .../nms/v1_13_R2/entity/EndermanController.java | 4 ++-- .../nms/v1_13_R2/entity/EndermiteController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/EvokerController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/GhastController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/GiantController.java | 4 ++-- .../nms/v1_13_R2/entity/GuardianController.java | 4 ++-- .../nms/v1_13_R2/entity/GuardianElderController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/HorseController.java | 4 ++-- .../nms/v1_13_R2/entity/HorseDonkeyController.java | 4 ++-- .../nms/v1_13_R2/entity/HorseMuleController.java | 4 ++-- .../nms/v1_13_R2/entity/HorseSkeletonController.java | 4 ++-- .../nms/v1_13_R2/entity/HorseZombieController.java | 4 ++-- .../nms/v1_13_R2/entity/IllusionerController.java | 4 ++-- .../nms/v1_13_R2/entity/IronGolemController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/LlamaController.java | 4 ++-- .../nms/v1_13_R2/entity/MagmaCubeController.java | 4 ++-- .../nms/v1_13_R2/entity/MushroomCowController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/OcelotController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/ParrotController.java | 6 +++--- .../citizensnpcs/nms/v1_13_R2/entity/PhantomController.java | 4 ++-- .../net/citizensnpcs/nms/v1_13_R2/entity/PigController.java | 4 ++-- .../nms/v1_13_R2/entity/PigZombieController.java | 4 ++-- .../nms/v1_13_R2/entity/PolarBearController.java | 4 ++-- .../nms/v1_13_R2/entity/PufferFishController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/RabbitController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/SalmonController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/SheepController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java | 4 ++-- .../nms/v1_13_R2/entity/SilverfishController.java | 4 ++-- .../nms/v1_13_R2/entity/SkeletonController.java | 4 ++-- .../nms/v1_13_R2/entity/SkeletonStrayController.java | 4 ++-- .../nms/v1_13_R2/entity/SkeletonWitherController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/SlimeController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/SpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/SquidController.java | 4 ++-- .../nms/v1_13_R2/entity/TropicalFishController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/TurtleController.java | 4 ++-- .../net/citizensnpcs/nms/v1_13_R2/entity/VexController.java | 4 ++-- .../nms/v1_13_R2/entity/VillagerController.java | 4 ++-- .../nms/v1_13_R2/entity/VindicatorController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/WitchController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/WitherController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/WolfController.java | 4 ++-- .../citizensnpcs/nms/v1_13_R2/entity/ZombieController.java | 4 ++-- .../nms/v1_13_R2/entity/ZombieHuskController.java | 4 ++-- .../nms/v1_13_R2/entity/ZombieVillagerController.java | 4 ++-- .../v1_13_R2/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_13_R2/entity/nonliving/EggController.java | 2 +- .../nms/v1_13_R2/entity/nonliving/EnderPearlController.java | 2 +- .../v1_13_R2/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_13_R2/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_13_R2/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../net/citizensnpcs/nms/v1_14_R1/entity/BatController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/BlazeController.java | 4 ++-- .../net/citizensnpcs/nms/v1_14_R1/entity/CatController.java | 4 ++-- .../nms/v1_14_R1/entity/CaveSpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/ChickenController.java | 4 ++-- .../net/citizensnpcs/nms/v1_14_R1/entity/CodController.java | 4 ++-- .../net/citizensnpcs/nms/v1_14_R1/entity/CowController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/CreeperController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/DolphinController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/DrownedController.java | 4 ++-- .../nms/v1_14_R1/entity/EnderDragonController.java | 4 ++-- .../nms/v1_14_R1/entity/EndermanController.java | 4 ++-- .../nms/v1_14_R1/entity/EndermiteController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/EvokerController.java | 4 ++-- .../net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/GhastController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/GiantController.java | 4 ++-- .../nms/v1_14_R1/entity/GuardianController.java | 4 ++-- .../nms/v1_14_R1/entity/GuardianElderController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/HorseController.java | 4 ++-- .../nms/v1_14_R1/entity/HorseDonkeyController.java | 4 ++-- .../nms/v1_14_R1/entity/HorseMuleController.java | 4 ++-- .../nms/v1_14_R1/entity/HorseSkeletonController.java | 4 ++-- .../nms/v1_14_R1/entity/HorseZombieController.java | 4 ++-- .../nms/v1_14_R1/entity/IllusionerController.java | 4 ++-- .../nms/v1_14_R1/entity/IronGolemController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/LlamaController.java | 4 ++-- .../nms/v1_14_R1/entity/MagmaCubeController.java | 4 ++-- .../nms/v1_14_R1/entity/MushroomCowController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/OcelotController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/PandaController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/ParrotController.java | 6 +++--- .../citizensnpcs/nms/v1_14_R1/entity/PhantomController.java | 4 ++-- .../net/citizensnpcs/nms/v1_14_R1/entity/PigController.java | 4 ++-- .../nms/v1_14_R1/entity/PigZombieController.java | 4 ++-- .../nms/v1_14_R1/entity/PillagerController.java | 4 ++-- .../nms/v1_14_R1/entity/PolarBearController.java | 4 ++-- .../nms/v1_14_R1/entity/PufferFishController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/RabbitController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/RavagerController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/SalmonController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/SheepController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java | 4 ++-- .../nms/v1_14_R1/entity/SilverfishController.java | 4 ++-- .../nms/v1_14_R1/entity/SkeletonController.java | 4 ++-- .../nms/v1_14_R1/entity/SkeletonStrayController.java | 4 ++-- .../nms/v1_14_R1/entity/SkeletonWitherController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/SlimeController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/SpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/SquidController.java | 4 ++-- .../nms/v1_14_R1/entity/TraderLlamaController.java | 4 ++-- .../nms/v1_14_R1/entity/TropicalFishController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/TurtleController.java | 4 ++-- .../net/citizensnpcs/nms/v1_14_R1/entity/VexController.java | 4 ++-- .../nms/v1_14_R1/entity/VillagerController.java | 4 ++-- .../nms/v1_14_R1/entity/VindicatorController.java | 4 ++-- .../nms/v1_14_R1/entity/WanderingTraderController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/WitchController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/WitherController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/WolfController.java | 4 ++-- .../citizensnpcs/nms/v1_14_R1/entity/ZombieController.java | 4 ++-- .../nms/v1_14_R1/entity/ZombieHuskController.java | 4 ++-- .../nms/v1_14_R1/entity/ZombieVillagerController.java | 4 ++-- .../v1_14_R1/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_14_R1/entity/nonliving/EggController.java | 2 +- .../nms/v1_14_R1/entity/nonliving/EnderPearlController.java | 2 +- .../v1_14_R1/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_14_R1/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_14_R1/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../net/citizensnpcs/nms/v1_15_R1/entity/BatController.java | 4 ++-- .../net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/BlazeController.java | 4 ++-- .../net/citizensnpcs/nms/v1_15_R1/entity/CatController.java | 4 ++-- .../nms/v1_15_R1/entity/CaveSpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/ChickenController.java | 4 ++-- .../net/citizensnpcs/nms/v1_15_R1/entity/CodController.java | 4 ++-- .../net/citizensnpcs/nms/v1_15_R1/entity/CowController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/CreeperController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/DolphinController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/DrownedController.java | 4 ++-- .../nms/v1_15_R1/entity/EnderDragonController.java | 4 ++-- .../nms/v1_15_R1/entity/EndermanController.java | 4 ++-- .../nms/v1_15_R1/entity/EndermiteController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/EvokerController.java | 4 ++-- .../net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/GhastController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/GiantController.java | 4 ++-- .../nms/v1_15_R1/entity/GuardianController.java | 4 ++-- .../nms/v1_15_R1/entity/GuardianElderController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/HorseController.java | 4 ++-- .../nms/v1_15_R1/entity/HorseDonkeyController.java | 4 ++-- .../nms/v1_15_R1/entity/HorseMuleController.java | 4 ++-- .../nms/v1_15_R1/entity/HorseSkeletonController.java | 4 ++-- .../nms/v1_15_R1/entity/HorseZombieController.java | 4 ++-- .../nms/v1_15_R1/entity/IllusionerController.java | 4 ++-- .../nms/v1_15_R1/entity/IronGolemController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/LlamaController.java | 4 ++-- .../nms/v1_15_R1/entity/MagmaCubeController.java | 4 ++-- .../nms/v1_15_R1/entity/MushroomCowController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/OcelotController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/PandaController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/ParrotController.java | 6 +++--- .../citizensnpcs/nms/v1_15_R1/entity/PhantomController.java | 4 ++-- .../net/citizensnpcs/nms/v1_15_R1/entity/PigController.java | 4 ++-- .../nms/v1_15_R1/entity/PigZombieController.java | 4 ++-- .../nms/v1_15_R1/entity/PillagerController.java | 4 ++-- .../nms/v1_15_R1/entity/PolarBearController.java | 4 ++-- .../nms/v1_15_R1/entity/PufferFishController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/RabbitController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/RavagerController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/SalmonController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/SheepController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java | 4 ++-- .../nms/v1_15_R1/entity/SilverfishController.java | 4 ++-- .../nms/v1_15_R1/entity/SkeletonController.java | 4 ++-- .../nms/v1_15_R1/entity/SkeletonStrayController.java | 4 ++-- .../nms/v1_15_R1/entity/SkeletonWitherController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/SlimeController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/SpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/SquidController.java | 4 ++-- .../nms/v1_15_R1/entity/TraderLlamaController.java | 4 ++-- .../nms/v1_15_R1/entity/TropicalFishController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/TurtleController.java | 4 ++-- .../net/citizensnpcs/nms/v1_15_R1/entity/VexController.java | 4 ++-- .../nms/v1_15_R1/entity/VillagerController.java | 4 ++-- .../nms/v1_15_R1/entity/VindicatorController.java | 4 ++-- .../nms/v1_15_R1/entity/WanderingTraderController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/WitchController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/WitherController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/WolfController.java | 4 ++-- .../citizensnpcs/nms/v1_15_R1/entity/ZombieController.java | 4 ++-- .../nms/v1_15_R1/entity/ZombieHuskController.java | 4 ++-- .../nms/v1_15_R1/entity/ZombieVillagerController.java | 4 ++-- .../v1_15_R1/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_15_R1/entity/nonliving/EggController.java | 2 +- .../nms/v1_15_R1/entity/nonliving/EnderPearlController.java | 2 +- .../v1_15_R1/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_15_R1/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_15_R1/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../net/citizensnpcs/nms/v1_16_R3/entity/BatController.java | 4 ++-- .../net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/BlazeController.java | 4 ++-- .../net/citizensnpcs/nms/v1_16_R3/entity/CatController.java | 4 ++-- .../nms/v1_16_R3/entity/CaveSpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/ChickenController.java | 4 ++-- .../net/citizensnpcs/nms/v1_16_R3/entity/CodController.java | 4 ++-- .../net/citizensnpcs/nms/v1_16_R3/entity/CowController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/CreeperController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/DolphinController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/DrownedController.java | 4 ++-- .../nms/v1_16_R3/entity/EnderDragonController.java | 4 ++-- .../nms/v1_16_R3/entity/EndermanController.java | 4 ++-- .../nms/v1_16_R3/entity/EndermiteController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/EvokerController.java | 4 ++-- .../net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/GhastController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/GiantController.java | 4 ++-- .../nms/v1_16_R3/entity/GuardianController.java | 4 ++-- .../nms/v1_16_R3/entity/GuardianElderController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/HoglinController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/HorseController.java | 4 ++-- .../nms/v1_16_R3/entity/HorseDonkeyController.java | 4 ++-- .../nms/v1_16_R3/entity/HorseMuleController.java | 4 ++-- .../nms/v1_16_R3/entity/HorseSkeletonController.java | 4 ++-- .../nms/v1_16_R3/entity/HorseZombieController.java | 4 ++-- .../nms/v1_16_R3/entity/IllusionerController.java | 4 ++-- .../nms/v1_16_R3/entity/IronGolemController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/LlamaController.java | 4 ++-- .../nms/v1_16_R3/entity/MagmaCubeController.java | 4 ++-- .../nms/v1_16_R3/entity/MushroomCowController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/OcelotController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/PandaController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/ParrotController.java | 6 +++--- .../citizensnpcs/nms/v1_16_R3/entity/PhantomController.java | 4 ++-- .../net/citizensnpcs/nms/v1_16_R3/entity/PigController.java | 4 ++-- .../nms/v1_16_R3/entity/PigZombieController.java | 4 ++-- .../nms/v1_16_R3/entity/PiglinBruteController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/PiglinController.java | 4 ++-- .../nms/v1_16_R3/entity/PillagerController.java | 4 ++-- .../nms/v1_16_R3/entity/PolarBearController.java | 4 ++-- .../nms/v1_16_R3/entity/PufferFishController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/RabbitController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/RavagerController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/SalmonController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/SheepController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java | 4 ++-- .../nms/v1_16_R3/entity/SilverfishController.java | 4 ++-- .../nms/v1_16_R3/entity/SkeletonController.java | 4 ++-- .../nms/v1_16_R3/entity/SkeletonStrayController.java | 4 ++-- .../nms/v1_16_R3/entity/SkeletonWitherController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/SlimeController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/SpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/SquidController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/StriderController.java | 4 ++-- .../nms/v1_16_R3/entity/TraderLlamaController.java | 4 ++-- .../nms/v1_16_R3/entity/TropicalFishController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/TurtleController.java | 4 ++-- .../net/citizensnpcs/nms/v1_16_R3/entity/VexController.java | 4 ++-- .../nms/v1_16_R3/entity/VillagerController.java | 4 ++-- .../nms/v1_16_R3/entity/VindicatorController.java | 4 ++-- .../nms/v1_16_R3/entity/WanderingTraderController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/WitchController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/WitherController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/WolfController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java | 4 ++-- .../citizensnpcs/nms/v1_16_R3/entity/ZombieController.java | 4 ++-- .../nms/v1_16_R3/entity/ZombieHuskController.java | 4 ++-- .../nms/v1_16_R3/entity/ZombieVillagerController.java | 4 ++-- .../v1_16_R3/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_16_R3/entity/nonliving/EggController.java | 2 +- .../nms/v1_16_R3/entity/nonliving/EnderPearlController.java | 2 +- .../v1_16_R3/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_16_R3/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_16_R3/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/BatController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/BlazeController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/CatController.java | 4 ++-- .../nms/v1_17_R1/entity/CaveSpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/ChickenController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/CodController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/CowController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/CreeperController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/DolphinController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/DrownedController.java | 4 ++-- .../nms/v1_17_R1/entity/EnderDragonController.java | 4 ++-- .../nms/v1_17_R1/entity/EndermanController.java | 4 ++-- .../nms/v1_17_R1/entity/EndermiteController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/EvokerController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/GhastController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/GiantController.java | 4 ++-- .../nms/v1_17_R1/entity/GlowSquidController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/GoatController.java | 4 ++-- .../nms/v1_17_R1/entity/GuardianController.java | 4 ++-- .../nms/v1_17_R1/entity/GuardianElderController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/HoglinController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/HorseController.java | 4 ++-- .../nms/v1_17_R1/entity/HorseDonkeyController.java | 4 ++-- .../nms/v1_17_R1/entity/HorseMuleController.java | 4 ++-- .../nms/v1_17_R1/entity/HorseSkeletonController.java | 4 ++-- .../nms/v1_17_R1/entity/HorseZombieController.java | 4 ++-- .../nms/v1_17_R1/entity/IllusionerController.java | 4 ++-- .../nms/v1_17_R1/entity/IronGolemController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/LlamaController.java | 4 ++-- .../nms/v1_17_R1/entity/MagmaCubeController.java | 4 ++-- .../nms/v1_17_R1/entity/MushroomCowController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/OcelotController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/PandaController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/ParrotController.java | 6 +++--- .../citizensnpcs/nms/v1_17_R1/entity/PhantomController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/PigController.java | 4 ++-- .../nms/v1_17_R1/entity/PigZombieController.java | 4 ++-- .../nms/v1_17_R1/entity/PiglinBruteController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/PiglinController.java | 4 ++-- .../nms/v1_17_R1/entity/PillagerController.java | 4 ++-- .../nms/v1_17_R1/entity/PolarBearController.java | 4 ++-- .../nms/v1_17_R1/entity/PufferFishController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/RabbitController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/RavagerController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/SalmonController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/SheepController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java | 4 ++-- .../nms/v1_17_R1/entity/SilverfishController.java | 4 ++-- .../nms/v1_17_R1/entity/SkeletonController.java | 4 ++-- .../nms/v1_17_R1/entity/SkeletonStrayController.java | 4 ++-- .../nms/v1_17_R1/entity/SkeletonWitherController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/SlimeController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/SpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/SquidController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/StriderController.java | 4 ++-- .../nms/v1_17_R1/entity/TraderLlamaController.java | 4 ++-- .../nms/v1_17_R1/entity/TropicalFishController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/TurtleController.java | 4 ++-- .../net/citizensnpcs/nms/v1_17_R1/entity/VexController.java | 4 ++-- .../nms/v1_17_R1/entity/VillagerController.java | 4 ++-- .../nms/v1_17_R1/entity/VindicatorController.java | 4 ++-- .../nms/v1_17_R1/entity/WanderingTraderController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/WitchController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/WitherController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/WolfController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java | 4 ++-- .../citizensnpcs/nms/v1_17_R1/entity/ZombieController.java | 4 ++-- .../nms/v1_17_R1/entity/ZombieHuskController.java | 4 ++-- .../nms/v1_17_R1/entity/ZombieVillagerController.java | 4 ++-- .../v1_17_R1/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_17_R1/entity/nonliving/EggController.java | 2 +- .../nms/v1_17_R1/entity/nonliving/EnderPearlController.java | 2 +- .../v1_17_R1/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_17_R1/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_17_R1/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/BatController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/BlazeController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/CatController.java | 4 ++-- .../nms/v1_18_R2/entity/CaveSpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/ChickenController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/CodController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/CowController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/CreeperController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/DolphinController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/DrownedController.java | 4 ++-- .../nms/v1_18_R2/entity/EnderDragonController.java | 4 ++-- .../nms/v1_18_R2/entity/EndermanController.java | 4 ++-- .../nms/v1_18_R2/entity/EndermiteController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/EvokerController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/GhastController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/GiantController.java | 4 ++-- .../nms/v1_18_R2/entity/GlowSquidController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/GoatController.java | 4 ++-- .../nms/v1_18_R2/entity/GuardianController.java | 4 ++-- .../nms/v1_18_R2/entity/GuardianElderController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/HoglinController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/HorseController.java | 4 ++-- .../nms/v1_18_R2/entity/HorseDonkeyController.java | 4 ++-- .../nms/v1_18_R2/entity/HorseMuleController.java | 4 ++-- .../nms/v1_18_R2/entity/HorseSkeletonController.java | 4 ++-- .../nms/v1_18_R2/entity/HorseZombieController.java | 4 ++-- .../nms/v1_18_R2/entity/IllusionerController.java | 4 ++-- .../nms/v1_18_R2/entity/IronGolemController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/LlamaController.java | 4 ++-- .../nms/v1_18_R2/entity/MagmaCubeController.java | 4 ++-- .../nms/v1_18_R2/entity/MushroomCowController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/OcelotController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/PandaController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/ParrotController.java | 6 +++--- .../citizensnpcs/nms/v1_18_R2/entity/PhantomController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/PigController.java | 4 ++-- .../nms/v1_18_R2/entity/PigZombieController.java | 4 ++-- .../nms/v1_18_R2/entity/PiglinBruteController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/PiglinController.java | 4 ++-- .../nms/v1_18_R2/entity/PillagerController.java | 4 ++-- .../nms/v1_18_R2/entity/PolarBearController.java | 4 ++-- .../nms/v1_18_R2/entity/PufferFishController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/RabbitController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/RavagerController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/SalmonController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/SheepController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java | 4 ++-- .../nms/v1_18_R2/entity/SilverfishController.java | 4 ++-- .../nms/v1_18_R2/entity/SkeletonController.java | 4 ++-- .../nms/v1_18_R2/entity/SkeletonStrayController.java | 4 ++-- .../nms/v1_18_R2/entity/SkeletonWitherController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/SlimeController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/SpiderController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/SquidController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/StriderController.java | 4 ++-- .../nms/v1_18_R2/entity/TraderLlamaController.java | 4 ++-- .../nms/v1_18_R2/entity/TropicalFishController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/TurtleController.java | 4 ++-- .../net/citizensnpcs/nms/v1_18_R2/entity/VexController.java | 4 ++-- .../nms/v1_18_R2/entity/VillagerController.java | 4 ++-- .../nms/v1_18_R2/entity/VindicatorController.java | 4 ++-- .../nms/v1_18_R2/entity/WanderingTraderController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/WitchController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/WitherController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/WolfController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java | 4 ++-- .../citizensnpcs/nms/v1_18_R2/entity/ZombieController.java | 4 ++-- .../nms/v1_18_R2/entity/ZombieHuskController.java | 4 ++-- .../nms/v1_18_R2/entity/ZombieVillagerController.java | 4 ++-- .../v1_18_R2/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_18_R2/entity/nonliving/EggController.java | 2 +- .../nms/v1_18_R2/entity/nonliving/EnderPearlController.java | 2 +- .../v1_18_R2/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_18_R2/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_18_R2/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/AllayController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/BatController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/BlazeController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/CatController.java | 2 +- .../nms/v1_19_R2/entity/CaveSpiderController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/ChickenController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/CodController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/CowController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/CreeperController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/DolphinController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_19_R2/entity/EvokerController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/FrogController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/GhastController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/GiantController.java | 2 +- .../nms/v1_19_R2/entity/GlowSquidController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/GoatController.java | 2 +- .../nms/v1_19_R2/entity/GuardianController.java | 2 +- .../nms/v1_19_R2/entity/GuardianElderController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/HoglinController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_19_R2/entity/LlamaController.java | 2 +- .../nms/v1_19_R2/entity/MagmaCubeController.java | 2 +- .../nms/v1_19_R2/entity/MushroomCowController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/OcelotController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/PandaController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/ParrotController.java | 4 ++-- .../citizensnpcs/nms/v1_19_R2/entity/PhantomController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/PigController.java | 2 +- .../nms/v1_19_R2/entity/PigZombieController.java | 2 +- .../nms/v1_19_R2/entity/PiglinBruteController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_19_R2/entity/RabbitController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/RavagerController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/SalmonController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/SheepController.java | 2 +- .../citizensnpcs/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 +- .../citizensnpcs/nms/v1_19_R2/entity/SlimeController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/SpiderController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/SquidController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/StriderController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java | 2 +- .../nms/v1_19_R2/entity/TraderLlamaController.java | 2 +- .../nms/v1_19_R2/entity/TropicalFishController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/TurtleController.java | 2 +- .../net/citizensnpcs/nms/v1_19_R2/entity/VexController.java | 2 +- .../nms/v1_19_R2/entity/VillagerController.java | 2 +- .../nms/v1_19_R2/entity/VindicatorController.java | 2 +- .../nms/v1_19_R2/entity/WanderingTraderController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/WardenController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/WitchController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/WitherController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/WolfController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java | 2 +- .../citizensnpcs/nms/v1_19_R2/entity/ZombieController.java | 2 +- .../nms/v1_19_R2/entity/ZombieHuskController.java | 2 +- .../nms/v1_19_R2/entity/ZombieVillagerController.java | 2 +- .../v1_19_R2/entity/nonliving/DragonFireballController.java | 2 +- .../nms/v1_19_R2/entity/nonliving/EggController.java | 2 +- .../nms/v1_19_R2/entity/nonliving/EnderPearlController.java | 2 +- .../v1_19_R2/entity/nonliving/LargeFireballController.java | 2 +- .../nms/v1_19_R2/entity/nonliving/LlamaSpitController.java | 2 +- .../v1_19_R2/entity/nonliving/SmallFireballController.java | 2 +- .../entity/nonliving/ThrownExpBottleController.java | 2 +- .../java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java | 2 +- .../net/citizensnpcs/nms/v1_8_R3/entity/BatController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/BlazeController.java | 2 +- .../nms/v1_8_R3/entity/CaveSpiderController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/ChickenController.java | 2 +- .../net/citizensnpcs/nms/v1_8_R3/entity/CowController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/CreeperController.java | 4 ++-- .../nms/v1_8_R3/entity/EnderDragonController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/EndermanController.java | 2 +- .../nms/v1_8_R3/entity/EndermiteController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/GhastController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/GiantController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/GuardianController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/HorseController.java | 4 ++-- .../nms/v1_8_R3/entity/IronGolemController.java | 2 +- .../nms/v1_8_R3/entity/MagmaCubeController.java | 2 +- .../nms/v1_8_R3/entity/MushroomCowController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/OcelotController.java | 2 +- .../net/citizensnpcs/nms/v1_8_R3/entity/PigController.java | 2 +- .../nms/v1_8_R3/entity/PigZombieController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/RabbitController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/SheepController.java | 2 +- .../nms/v1_8_R3/entity/SilverfishController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/SlimeController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/SpiderController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/SquidController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/VillagerController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/WitchController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/WitherController.java | 2 +- .../net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java | 2 +- .../citizensnpcs/nms/v1_8_R3/entity/ZombieController.java | 2 +- .../nms/v1_8_R3/entity/nonliving/EggController.java | 2 +- .../nms/v1_8_R3/entity/nonliving/EnderPearlController.java | 2 +- .../v1_8_R3/entity/nonliving/LargeFireballController.java | 2 +- .../v1_8_R3/entity/nonliving/SmallFireballController.java | 2 +- .../v1_8_R3/entity/nonliving/SplashPotionController.java | 2 +- .../v1_8_R3/entity/nonliving/ThrownExpBottleController.java | 2 +- 717 files changed, 1131 insertions(+), 1131 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 44e4c3f20..b5fd9e7d3 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 @@ -135,7 +135,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 42d296ebb..43c8d6185 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 @@ -131,7 +131,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java index 0706ebc52..b8771d8fd 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java @@ -157,7 +157,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } 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 e05686d06..7bf35b575 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 @@ -167,7 +167,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a5ab8a489..234a18ddc 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 @@ -182,7 +182,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 450b7a2a9..c0678c313 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 @@ -83,7 +83,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean a(EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack) { - return npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true) + return npc == null || !npc.isProtected() ? super.a(entityhuman, enumhand, itemstack) : false; } @@ -168,7 +168,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0dcd197b4..c90db1bb6 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 @@ -130,7 +130,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 fdd35854a..645b27673 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 @@ -155,7 +155,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 35a9e88d2..bb9f7cebc 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 @@ -155,7 +155,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 fb245625e..cc98ea070 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 @@ -122,7 +122,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f6bc2d4b5..621066f2a 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 @@ -141,7 +141,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 82b769e49..3adeab52c 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 @@ -142,7 +142,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6e3732a62..507dfe660 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 @@ -113,7 +113,7 @@ public class HorseController extends MobEntityController { public boolean di() { if (npc == null) return super.di(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); return super.di() && !protectedDefault; } @@ -173,7 +173,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4676e75c0..745e24c08 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 @@ -141,7 +141,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e45876353..1ed8de5fa 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 @@ -154,7 +154,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ffc125cb4..e15c03e2b 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 @@ -163,7 +163,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c8b5c64eb..aa18da4cd 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 @@ -159,7 +159,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e8fb5e4a6..e08eebbe1 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 @@ -162,7 +162,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4f72458f0..f13e3e918 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 @@ -142,7 +142,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 974731ca5..c616fca9f 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 @@ -129,7 +129,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 7dcc34b24..2286160dd 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 @@ -159,7 +159,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c1f54e639..146e0e8cc 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 @@ -152,7 +152,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e27c91848..db41196e5 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 @@ -142,7 +142,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4e4af7d91..b91b4b425 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 @@ -141,7 +141,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 b0dcd020b..2a68ca139 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 @@ -141,7 +141,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 14a593413..aa2ea430f 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 @@ -155,7 +155,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ec651e392..1ecca779b 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 @@ -141,7 +141,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 eeba6f746..98f8d238b 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 @@ -141,7 +141,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 189de00d2..1e2937612 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 @@ -141,7 +141,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f7e3632e4..228464de5 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 @@ -176,7 +176,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 db45c3045..6f049975d 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 @@ -141,7 +141,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 90f1929e3..542ff8b5c 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 @@ -122,7 +122,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 544893071..c740ee8e7 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 @@ -155,7 +155,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 439f4a20b..3a161ba28 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 @@ -141,7 +141,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java index 94ffc0d17..bd0df5680 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java @@ -93,7 +93,7 @@ public class DragonFireballController extends MobEntityController { public void m() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.m(); } } else { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java index 2d833510f..e19924cf9 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java @@ -108,7 +108,7 @@ public class EggController extends AbstractEntityController { public void m() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.m(); } } else { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java index 185f04e29..8fc9796b6 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java @@ -92,7 +92,7 @@ public class EnderPearlController extends MobEntityController { public void m() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.m(); } } else { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java index ff04ea892..899dd3b97 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java @@ -79,7 +79,7 @@ public class LargeFireballController extends MobEntityController { public void m() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.m(); } } else { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java index 4c7a11ef7..274e09187 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java @@ -78,7 +78,7 @@ public class SmallFireballController extends MobEntityController { public void m() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.m(); } } else { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java index 01cd70d16..f317ca0e9 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java @@ -78,7 +78,7 @@ public class ThrownExpBottleController extends MobEntityController { public void m() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.m(); } } else { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java index be30dcefe..00a37f437 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java @@ -136,7 +136,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 43ecb176e..bd10ea34e 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 @@ -132,7 +132,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java index 25a597ce0..3f028ebbd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java @@ -158,7 +158,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } 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 360c26bed..544a1797b 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 @@ -168,7 +168,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 90756acc7..22fe06d2b 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 @@ -183,7 +183,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d357d17a4..3d436ac30 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 @@ -159,7 +159,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 9d70af96f..0b42587ac 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 @@ -131,7 +131,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 225d948b2..08bda24d4 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 @@ -156,7 +156,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f2174e1c1..492975a59 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 @@ -156,7 +156,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6b807660e..3bfdc7b0e 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 @@ -143,7 +143,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 999f5bd85..380b062ca 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 @@ -123,7 +123,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0c1d6b329..a76943e9d 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 @@ -142,7 +142,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 49a9551ae..fdaa92558 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 @@ -143,7 +143,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 364425660..48ccc1098 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 @@ -143,7 +143,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 54a43f41d..68798e959 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 @@ -166,7 +166,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a9562871d..569890fe9 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 @@ -166,7 +166,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 47e9a6b4e..94f4ec2e6 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 @@ -166,7 +166,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a2dd342da..6b2db61bc 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 @@ -167,7 +167,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 04cdfd0cd..b294bf138 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 @@ -167,7 +167,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 eb127a059..32ec3c759 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 @@ -142,7 +142,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 524ce5937..1cf62f801 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 @@ -166,7 +166,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e8449b890..6af0733cd 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 @@ -163,7 +163,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 96daa06e7..4e097b9d4 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 @@ -163,7 +163,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e39225be9..e48a42167 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 @@ -160,7 +160,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 afb7f05bf..04d52eb3e 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 @@ -161,7 +161,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 9a0251c51..29b8f6535 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 @@ -143,7 +143,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java index 3beba125a..88077671e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java @@ -130,7 +130,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 2aa499e14..ae1975f98 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 @@ -160,7 +160,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 7b0d18357..d404e9a10 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 @@ -153,7 +153,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0e2406ef1..994846298 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 @@ -152,7 +152,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 34bfba595..9f3a2b797 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 @@ -141,7 +141,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5d317d5df..eb1f0547d 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 @@ -141,7 +141,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 1e4bb1330..63bd56ca6 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 @@ -141,7 +141,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 05afc5b4f..6d673d49b 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 @@ -141,7 +141,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c8c1a88e7..ca05ab237 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 @@ -163,7 +163,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ea7e67abe..fefacff2c 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 @@ -141,7 +141,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 96cfc7d46..4697d99ee 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 @@ -141,7 +141,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 bde35f120..99603be81 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 @@ -141,7 +141,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java index 7e3b7704a..920730222 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java @@ -121,7 +121,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c156ed457..64b40fd66 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 @@ -182,7 +182,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 77b96f272..197a141ec 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 @@ -153,7 +153,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 7679b75df..32d28ff8f 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 @@ -141,7 +141,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 508079353..e0999262c 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 @@ -122,7 +122,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6ffdb59ab..6e029d3df 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 @@ -155,7 +155,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 70ea9aa2b..1b6aaf16d 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 @@ -141,7 +141,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a6d9ef7bd..1f6f66c6a 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 @@ -141,7 +141,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 44486b285..af1a3aecf 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 @@ -141,7 +141,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java index 5e03b7970..d148829e4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java @@ -57,7 +57,7 @@ public class DragonFireballController extends MobEntityController { public void A_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.A_(); } } else { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java index a4483f3d2..a84773236 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java @@ -72,7 +72,7 @@ public class EggController extends AbstractEntityController { public void A_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.A_(); } } else { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java index c4fd2ba38..240d640c9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java @@ -56,7 +56,7 @@ public class EnderPearlController extends MobEntityController { public void A_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.A_(); } } else { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java index 47fd1dc01..9b702618a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java @@ -43,7 +43,7 @@ public class LargeFireballController extends MobEntityController { public void A_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.A_(); } } else { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java index 8337bdac5..81b1555bd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java @@ -60,7 +60,7 @@ public class LlamaSpitController extends AbstractEntityController { public void A_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.A_(); } } else { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java index 0c6597dc2..a2ad476ea 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java @@ -42,7 +42,7 @@ public class SmallFireballController extends MobEntityController { public void A_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.A_(); } } else { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java index ee6faa50c..66a995735 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java @@ -42,7 +42,7 @@ public class ThrownExpBottleController extends MobEntityController { public void A_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.A_(); } } else { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java index 623c8cb96..1371bdfea 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java @@ -139,7 +139,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6734b4503..352a4aa67 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 @@ -135,7 +135,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java index 3bc14821e..9b5ff74d9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java @@ -161,7 +161,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } 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 e8d24ca01..d8b5d0ea6 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 @@ -171,7 +171,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e120701b1..e9cd53408 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 @@ -186,7 +186,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ff0b0f0da..845f1d724 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 @@ -162,7 +162,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 96f316519..2de19fb1b 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 @@ -134,7 +134,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 582a11c33..1cb46faf9 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 @@ -159,7 +159,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ac97b5c27..c61ac1541 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 @@ -159,7 +159,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 799c4c3ff..8214311d2 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 @@ -146,7 +146,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 1c749449c..f2636734b 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 @@ -126,7 +126,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 fb447fdbd..8c3334b49 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 @@ -145,7 +145,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 071dfd7b5..b1a52545f 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 @@ -146,7 +146,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 87c09d98d..45d0a7e9d 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 @@ -146,7 +146,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 19aec65ea..d41c87c21 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 @@ -183,7 +183,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a74af9150..91786521d 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 @@ -183,7 +183,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 b5a458f5a..c73d4ffdc 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 @@ -183,7 +183,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f9b06aee3..66449fc21 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 @@ -185,7 +185,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 18c1835b8..b528eefbe 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 @@ -185,7 +185,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5fda3596e..7abb690c3 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 @@ -145,7 +145,7 @@ public class IllusionerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 253e55b62..49e5ee240 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 @@ -145,7 +145,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 087176f07..22ec18ba5 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 @@ -169,7 +169,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c38126048..1b9538334 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 @@ -166,7 +166,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c49ff73e1..85dec6466 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 @@ -166,7 +166,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 34ef05aa1..02a950e4b 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 @@ -164,7 +164,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java index 97beb4e9d..af9dffd8d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java @@ -58,7 +58,7 @@ public class ParrotController extends MobEntityController { @Override public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.a(paramEntityHuman, paramEnumHand); } return false; @@ -133,7 +133,7 @@ public class ParrotController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 eee1c64e0..a9e2d48f3 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 @@ -164,7 +164,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 292c58b95..92ca4e9ae 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 @@ -146,7 +146,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java index 117bfe6b3..f0c607a36 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java @@ -133,7 +133,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4697ca31c..f38a2fa7c 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 @@ -163,7 +163,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ab9451e55..cf36ade1b 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 @@ -156,7 +156,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a78554954..6f51bc084 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 @@ -154,7 +154,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f4e6d6d8b..6ece97c6e 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 @@ -142,7 +142,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d9c737214..2c581f2f7 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 @@ -144,7 +144,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 8eca635d0..f6b847c38 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 @@ -144,7 +144,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 179e40920..942df5874 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 @@ -144,7 +144,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4acf20732..438dcf3de 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 @@ -166,7 +166,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d9e3b4442..e67c73c60 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 @@ -144,7 +144,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 2dd4ec2d6..13792ccb0 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 @@ -144,7 +144,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f30124b77..1cb02f88a 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 @@ -144,7 +144,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java index 320f2f1e1..260816943 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java @@ -124,7 +124,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 fbe7b338f..c8ff5b086 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 @@ -185,7 +185,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 aed8949f2..89f3364c4 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 @@ -156,7 +156,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0ebf22a4b..9b92319a8 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 @@ -144,7 +144,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 9e8630e0a..973a33566 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 @@ -125,7 +125,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c7c4df78d..c74b5da20 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 @@ -158,7 +158,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 bec74125a..11dcd2b2d 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 @@ -144,7 +144,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 857bf24ff..c0d6000dd 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 @@ -144,7 +144,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 50476bb44..707b4f6e2 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 @@ -144,7 +144,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java index bbba09e7e..a14f2380f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java @@ -57,7 +57,7 @@ public class DragonFireballController extends MobEntityController { public void B_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.B_(); } } else { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java index 95138fbd3..5bf821b67 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java @@ -72,7 +72,7 @@ public class EggController extends AbstractEntityController { public void B_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.B_(); } } else { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java index 633cd3bab..8eb362d54 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java @@ -56,7 +56,7 @@ public class EnderPearlController extends MobEntityController { public void B_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.B_(); } } else { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java index 02a5c56ef..bc5c9d899 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java @@ -43,7 +43,7 @@ public class LargeFireballController extends MobEntityController { public void B_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.B_(); } } else { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java index ba696e2db..433518aa3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java @@ -60,7 +60,7 @@ public class LlamaSpitController extends AbstractEntityController { public void B_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.B_(); } } else { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java index 19bc61a91..db973e9a9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java @@ -42,7 +42,7 @@ public class SmallFireballController extends MobEntityController { public void B_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.B_(); } } else { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java index ce07da27c..6c7efe92c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java @@ -42,7 +42,7 @@ public class ThrownExpBottleController extends MobEntityController { public void B_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.B_(); } } else { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java index 32eb9bbfe..403f0b60f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java @@ -164,7 +164,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -186,7 +186,7 @@ public class BatController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 bb5e903d4..8cdd96de3 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 @@ -160,7 +160,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -179,7 +179,7 @@ public class BlazeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java index a94557863..e748c4cd8 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java @@ -186,7 +186,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } @@ -207,7 +207,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 37e4b6515..d3eabccae 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 @@ -199,7 +199,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -235,7 +235,7 @@ public class ChickenController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 13024752e..bde0f8709 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 @@ -204,7 +204,7 @@ public class CodController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -239,7 +239,7 @@ public class CodController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c9293edad..07a9dadcf 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 @@ -211,7 +211,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -231,7 +231,7 @@ public class CowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 2d040a919..5577d2f85 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 @@ -187,7 +187,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -207,7 +207,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8a2456621..4689257ef 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 @@ -191,7 +191,7 @@ public class DolphinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class DolphinController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4964cfe30..bb378400e 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 @@ -183,7 +183,7 @@ public class DrownedController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class DrownedController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 2aa1431fa..a43a48218 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 @@ -162,7 +162,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class EnderDragonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 dddd7caef..9759a15f9 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 @@ -184,7 +184,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -212,7 +212,7 @@ public class EndermanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b70bf41e6..53ea9e663 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 @@ -184,7 +184,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class EndermiteController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 7eedce9b0..b648044a0 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 @@ -171,7 +171,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -191,7 +191,7 @@ public class EvokerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 91ab03cb0..00e63eeb5 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 @@ -146,7 +146,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -171,7 +171,7 @@ public class GhastController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 88f8f4e99..447d84b13 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 @@ -170,7 +170,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -190,7 +190,7 @@ public class GiantController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 095c61244..8aeed1865 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 @@ -174,7 +174,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -204,7 +204,7 @@ public class GuardianController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 7e2593b23..aa055e51b 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 @@ -174,7 +174,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -204,7 +204,7 @@ public class GuardianElderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 2fcda9550..1426bdc51 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 @@ -209,7 +209,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -240,7 +240,7 @@ public class HorseController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 cec0508ce..6004107cf 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 @@ -209,7 +209,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -240,7 +240,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 858607a8b..6b9d32823 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 @@ -209,7 +209,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -240,7 +240,7 @@ public class HorseMuleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ee9c94c9c..2a00048b5 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 @@ -210,7 +210,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -241,7 +241,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 779b32f2b..1c78b4ec3 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 @@ -210,7 +210,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -241,7 +241,7 @@ public class HorseZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 581c1fe40..c7c48d330 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 @@ -170,7 +170,7 @@ public class IllusionerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -190,7 +190,7 @@ public class IllusionerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 87d911f80..47655e165 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 @@ -170,7 +170,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -190,7 +190,7 @@ public class IronGolemController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b1753ee11..640a4e0e7 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 @@ -194,7 +194,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -216,7 +216,7 @@ public class LlamaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c6311b5da..ffbbd1e0d 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 @@ -183,7 +183,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -195,7 +195,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f49d6d27d..f61f732b1 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 @@ -191,7 +191,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -210,7 +210,7 @@ public class MushroomCowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 507c96085..32aa4a856 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 @@ -189,7 +189,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -209,7 +209,7 @@ public class OcelotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java index 6eebcbc61..a1aba5bf4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java @@ -62,7 +62,7 @@ public class ParrotController extends MobEntityController { @Override public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.a(paramEntityHuman, paramEnumHand); } return false; @@ -158,7 +158,7 @@ public class ParrotController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -180,7 +180,7 @@ public class ParrotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8e2241105..cc976ca8e 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 @@ -188,7 +188,7 @@ public class PhantomController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -219,7 +219,7 @@ public class PhantomController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3ec6e7a76..f75aa3b53 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 @@ -189,7 +189,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -209,7 +209,7 @@ public class PigController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 385955450..d24b818fe 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 @@ -171,7 +171,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -191,7 +191,7 @@ public class PigZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java index 791b31cf7..4eeb570f0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java @@ -158,7 +158,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -178,7 +178,7 @@ public class PolarBearController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b41e36fe4..115bf82e3 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 @@ -192,7 +192,7 @@ public class PufferFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -227,7 +227,7 @@ public class PufferFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6713747ab..7c77da060 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 @@ -189,7 +189,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class RabbitController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c03375387..979f535de 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 @@ -190,7 +190,7 @@ public class SalmonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -225,7 +225,7 @@ public class SalmonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f74370604..da948aab1 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 @@ -181,7 +181,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SheepController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 de49a3419..d4a7aa97c 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 @@ -173,7 +173,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class ShulkerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 29e9377e8..7da478bcd 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 @@ -167,7 +167,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -186,7 +186,7 @@ public class SilverfishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8143391f7..e732be71d 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 @@ -169,7 +169,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -189,7 +189,7 @@ public class SkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 fe1b3ea43..acb5c3a3a 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 @@ -169,7 +169,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -189,7 +189,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 49456695c..b9704682a 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 @@ -169,7 +169,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -189,7 +189,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 53f8fb63d..e448a9a34 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 @@ -183,7 +183,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -195,7 +195,7 @@ public class SlimeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 265828d26..c89201783 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 @@ -172,7 +172,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -213,7 +213,7 @@ public class SnowmanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ac9c880ef..f5e95aaff 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 @@ -169,7 +169,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -188,7 +188,7 @@ public class SpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b0ea5d5b0..63150e31e 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 @@ -169,7 +169,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -189,7 +189,7 @@ public class SquidController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 482abb4b0..80d588f45 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 @@ -190,7 +190,7 @@ public class TropicalFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -225,7 +225,7 @@ public class TropicalFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 1d97bc191..543d44e43 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 @@ -178,7 +178,7 @@ public class TurtleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -198,7 +198,7 @@ public class TurtleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java index 380ff240c..8f95afed1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java @@ -149,7 +149,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -169,7 +169,7 @@ public class VexController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 5e9ecb3ee..e6d9f389a 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 @@ -210,7 +210,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -230,7 +230,7 @@ public class VillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c8773f6a6..ce94c2095 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 @@ -181,7 +181,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class VindicatorController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6966d20ac..078313838 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 @@ -169,7 +169,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -188,7 +188,7 @@ public class WitchController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 e83a6e526..618fa954a 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 @@ -150,7 +150,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -176,7 +176,7 @@ public class WitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 69070719e..65c9d2f49 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 @@ -183,7 +183,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class WolfController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3c2272ef2..6f3aef41f 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 @@ -169,7 +169,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -189,7 +189,7 @@ public class ZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 32403db70..e5d4ccef9 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 @@ -169,7 +169,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -189,7 +189,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b936ccac9..12da701f4 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 @@ -169,7 +169,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -189,7 +189,7 @@ public class ZombieVillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java index 4f4efbacd..aa83fba71 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java @@ -118,7 +118,7 @@ public class DragonFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java index 31aa52d6d..04533458f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java @@ -124,7 +124,7 @@ public class EggController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java index 47f7fa18b..4477058d6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java @@ -108,7 +108,7 @@ public class EnderPearlController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java index 7501cf2e0..5bf45bd06 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java @@ -104,7 +104,7 @@ public class LargeFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java index 25b15916e..40dfc1ceb 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java @@ -112,7 +112,7 @@ public class LlamaSpitController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java index d63123b1f..458ff4a2f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java @@ -94,7 +94,7 @@ public class SmallFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java index bedecaa69..05d9eee33 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java @@ -94,7 +94,7 @@ public class ThrownExpBottleController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java index 5dc32956b..9b0d6cb1a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java @@ -162,7 +162,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -184,7 +184,7 @@ public class BatController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4c01dc4bb..51928d79d 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 @@ -158,7 +158,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -177,7 +177,7 @@ public class BlazeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 80eee3cb9..148db5841 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 @@ -205,7 +205,7 @@ public class CatController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -225,7 +225,7 @@ public class CatController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java index 401859f0c..966d61b86 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java @@ -193,7 +193,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } @@ -214,7 +214,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b96674a77..0e061f380 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 @@ -206,7 +206,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -234,7 +234,7 @@ public class ChickenController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 28d4990bb..61a33849d 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 @@ -212,7 +212,7 @@ public class CodController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -247,7 +247,7 @@ public class CodController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3889652c0..1bab3775e 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 @@ -220,7 +220,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -240,7 +240,7 @@ public class CowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6d165da81..e2b8595e4 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 @@ -194,7 +194,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 431136177..0652740f6 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 @@ -200,7 +200,7 @@ public class DolphinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -212,7 +212,7 @@ public class DolphinController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f0ea75f0a..1111b60fb 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 @@ -191,7 +191,7 @@ public class DrownedController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -211,7 +211,7 @@ public class DrownedController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4ed0620ac..4b11717bd 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 @@ -157,7 +157,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -190,7 +190,7 @@ public class EnderDragonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8b733c1b4..f59cb9a36 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 @@ -199,7 +199,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -219,7 +219,7 @@ public class EndermanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3080151a0..e4470681f 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 @@ -191,7 +191,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -211,7 +211,7 @@ public class EndermiteController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 091649a94..bd0f571b8 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 @@ -178,7 +178,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -198,7 +198,7 @@ public class EvokerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 43c2ad42a..6c6456cdd 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 @@ -191,7 +191,7 @@ public class FoxController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -211,7 +211,7 @@ public class FoxController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 a556c98bf..91d77fc24 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 @@ -144,7 +144,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -169,7 +169,7 @@ public class GhastController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 46ed87c71..37f875dda 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 @@ -177,7 +177,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class GiantController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6a7492601..fe802261e 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 @@ -178,7 +178,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class GuardianController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 11d245d18..a771cbe23 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 @@ -178,7 +178,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class GuardianElderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 80d816e00..3b63fb449 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 @@ -224,7 +224,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -259,7 +259,7 @@ public class HorseController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 0e5847215..15067a97c 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 @@ -223,7 +223,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -258,7 +258,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c87496ecd..7e551fe52 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 @@ -223,7 +223,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -258,7 +258,7 @@ public class HorseMuleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3f75fd20e..d56073c0a 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 @@ -224,7 +224,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -259,7 +259,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d5349b9b3..234b8935f 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 @@ -224,7 +224,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -259,7 +259,7 @@ public class HorseZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f70e892c8..b80c66bd6 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 @@ -178,7 +178,7 @@ public class IllusionerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -198,7 +198,7 @@ public class IllusionerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 386ed0eb7..12f754baf 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 @@ -177,7 +177,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class IronGolemController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f5c35d816..f7eafcb04 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 @@ -204,7 +204,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -226,7 +226,7 @@ public class LlamaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 bc13ab798..0777654ba 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 @@ -183,7 +183,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -195,7 +195,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 1ef887160..ab145078c 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 @@ -201,7 +201,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -220,7 +220,7 @@ public class MushroomCowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d5e55d67c..8bac3c567 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 @@ -199,7 +199,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -219,7 +219,7 @@ public class OcelotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 55e17afcf..ca2ddebce 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 @@ -191,7 +191,7 @@ public class PandaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -211,7 +211,7 @@ public class PandaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java index 640621402..814178304 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java @@ -64,7 +64,7 @@ public class ParrotController extends MobEntityController { @Override public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.a(paramEntityHuman, paramEnumHand); } return false; @@ -156,7 +156,7 @@ public class ParrotController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -178,7 +178,7 @@ public class ParrotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c292c2e4b..1303514e9 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 @@ -193,7 +193,7 @@ public class PhantomController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -216,7 +216,7 @@ public class PhantomController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 2c598031c..04d53a7dc 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 @@ -199,7 +199,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -219,7 +219,7 @@ public class PigController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b47edbb0a..6bf08b420 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 @@ -178,7 +178,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -198,7 +198,7 @@ public class PigZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6f824ee82..ee443c8c7 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 @@ -191,7 +191,7 @@ public class PillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -211,7 +211,7 @@ public class PillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java index 1049a5c86..d36e5d5a0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java @@ -159,7 +159,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -179,7 +179,7 @@ public class PolarBearController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ceeb75843..da2fd6f80 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 @@ -210,7 +210,7 @@ public class PufferFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -245,7 +245,7 @@ public class PufferFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3ebe61a36..0a0ba5940 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 @@ -199,7 +199,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -224,7 +224,7 @@ public class RabbitController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 fce84ab71..1dfbab0fd 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 @@ -191,7 +191,7 @@ public class RavagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -211,7 +211,7 @@ public class RavagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 227e84e48..43633e5c8 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 @@ -198,7 +198,7 @@ public class SalmonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -233,7 +233,7 @@ public class SalmonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 91630ba88..53de1203c 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 @@ -191,7 +191,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -210,7 +210,7 @@ public class SheepController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9f3012fe4..900748f0a 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 @@ -178,7 +178,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class ShulkerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8aaf8c8ab..585b96052 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 @@ -175,7 +175,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -194,7 +194,7 @@ public class SilverfishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 121ef6aa1..26b705dcd 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 @@ -177,7 +177,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class SkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 dcb878e72..aeeba001b 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 @@ -177,7 +177,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 a739ecb1b..7f9e22fa0 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 @@ -177,7 +177,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f332f6d06..29fc42cf7 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 @@ -184,7 +184,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -196,7 +196,7 @@ public class SlimeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8563a75d4..9263e6cbc 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 @@ -178,7 +178,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -210,7 +210,7 @@ public class SnowmanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d3567db68..fd845c795 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 @@ -177,7 +177,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -196,7 +196,7 @@ public class SpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 efe973075..dc12123e6 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 @@ -177,7 +177,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class SquidController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6e289ecbe..4748733a7 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 @@ -207,7 +207,7 @@ public class TraderLlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -235,7 +235,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ffe5d2d19..f4a81b928 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 @@ -198,7 +198,7 @@ public class TropicalFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -233,7 +233,7 @@ public class TropicalFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b343fbdf0..daa54980d 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 @@ -186,7 +186,7 @@ public class TurtleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -206,7 +206,7 @@ public class TurtleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java index c50488f36..a471a3bbe 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java @@ -148,7 +148,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -168,7 +168,7 @@ public class VexController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 84cb2a028..1072de5f8 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 @@ -225,7 +225,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -255,7 +255,7 @@ public class VillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 82b4ec30d..37bdee846 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 @@ -192,7 +192,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -212,7 +212,7 @@ public class VindicatorController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3963a9246..9cb448ccd 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 @@ -228,7 +228,7 @@ public class WanderingTraderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -256,7 +256,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b4e08ae04..e167de9f6 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 @@ -177,7 +177,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -196,7 +196,7 @@ public class WitchController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 61e053325..15bc751f9 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 @@ -149,7 +149,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -175,7 +175,7 @@ public class WitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 e5c6438b1..5620df72d 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 @@ -194,7 +194,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class WolfController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4bfda7c61..3604a71d7 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 @@ -177,7 +177,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class ZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 3f8cdfc8d..498676a99 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 @@ -177,7 +177,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 5498f2f59..e1eb8cda6 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 @@ -177,7 +177,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -197,7 +197,7 @@ public class ZombieVillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java index 66754d858..a4dc9d43c 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java @@ -107,7 +107,7 @@ public class DragonFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java index a999196ce..c52715d60 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java @@ -123,7 +123,7 @@ public class EggController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java index 0a6a25625..8a085c677 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java @@ -107,7 +107,7 @@ public class EnderPearlController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java index d18470e25..2b3da6c85 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java @@ -93,7 +93,7 @@ public class LargeFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java index 0efd5b8e5..26372c8b2 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java @@ -112,7 +112,7 @@ public class LlamaSpitController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java index 19791fd30..81ae0058e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java @@ -93,7 +93,7 @@ public class SmallFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java index 950fbe653..657aa94c0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java @@ -93,7 +93,7 @@ public class ThrownExpBottleController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java index 69460c8fb..cb53631ba 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java @@ -155,7 +155,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -180,7 +180,7 @@ public class BatController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java index a8a3419a2..464227b14 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java @@ -152,7 +152,7 @@ public class BeeController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -177,7 +177,7 @@ public class BeeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6fa4fb6d8..e15639a22 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 @@ -151,7 +151,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -171,7 +171,7 @@ public class BlazeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6d57e02a3..eeb4d05cc 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 @@ -199,7 +199,7 @@ public class CatController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -220,7 +220,7 @@ public class CatController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java index 35850a24d..7d1c9de14 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java @@ -187,7 +187,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } @@ -209,7 +209,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 395351032..ca7a48e9e 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 @@ -200,7 +200,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -229,7 +229,7 @@ public class ChickenController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 acbae75a4..1e28886fc 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 @@ -210,7 +210,7 @@ public class CodController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -254,7 +254,7 @@ public class CodController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9142a29e6..f62f4a98f 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 @@ -214,7 +214,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -235,7 +235,7 @@ public class CowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 34ee8ba6b..a66d833d1 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 @@ -188,7 +188,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -209,7 +209,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 97e8c1caf..949db2589 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 @@ -198,7 +198,7 @@ public class DolphinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -210,7 +210,7 @@ public class DolphinController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b1354ca2a..291a4b010 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 @@ -185,7 +185,7 @@ public class DrownedController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -206,7 +206,7 @@ public class DrownedController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9591d2538..e5336aedc 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 @@ -150,7 +150,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -186,7 +186,7 @@ public class EnderDragonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c38e9cad2..418e10fe3 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 @@ -193,7 +193,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class EndermanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d90c36d08..c7358b8f7 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 @@ -185,7 +185,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -206,7 +206,7 @@ public class EndermiteController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 99bd7ffa8..be5472008 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 @@ -180,7 +180,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class EvokerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 174e7d315..5649967e3 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 @@ -193,7 +193,7 @@ public class FoxController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class FoxController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 13cc60c03..5350137a5 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 @@ -145,7 +145,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -171,7 +171,7 @@ public class GhastController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b9a7d55fe..00b8087b2 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 @@ -179,7 +179,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class GiantController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ebed2119b..8d9084290 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 @@ -180,7 +180,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -207,7 +207,7 @@ public class GuardianController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d00fb17cc..4c0877d71 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 @@ -180,7 +180,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -207,7 +207,7 @@ public class GuardianElderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 bc710ac5d..a5610a33c 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 @@ -226,7 +226,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -263,7 +263,7 @@ public class HorseController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 bc5a63f5e..d444aef6d 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 @@ -225,7 +225,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -261,7 +261,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8e1c4a211..48780db21 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 @@ -225,7 +225,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -261,7 +261,7 @@ public class HorseMuleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8e100719f..41506e06c 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 @@ -226,7 +226,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -262,7 +262,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6d3b7ac18..43c53023f 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 @@ -226,7 +226,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -262,7 +262,7 @@ public class HorseZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 43a5fb6b2..537d4b7a7 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 @@ -180,7 +180,7 @@ public class IllusionerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class IllusionerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 36fd28a68..372706b4c 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 @@ -179,7 +179,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class IronGolemController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4c9783ca5..552178632 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 @@ -206,7 +206,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -232,7 +232,7 @@ public class LlamaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 0463e9147..99da9f3b9 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 @@ -189,7 +189,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6d4678705..a6ccb2505 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 @@ -203,7 +203,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -224,7 +224,7 @@ public class MushroomCowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 e2b377df9..2350697a1 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 @@ -195,7 +195,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -221,7 +221,7 @@ public class OcelotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 cb548d6d7..dfd3e08bb 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 @@ -193,7 +193,7 @@ public class PandaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class PandaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java index 05aa74305..9f94d2715 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java @@ -65,7 +65,7 @@ public class ParrotController extends MobEntityController { @Override public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.a(paramEntityHuman, paramEnumHand); } return false; @@ -157,7 +157,7 @@ public class ParrotController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -184,7 +184,7 @@ public class ParrotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 cac694d00..20bd5dfe4 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 @@ -202,7 +202,7 @@ public class PhantomController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -236,7 +236,7 @@ public class PhantomController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 793be2934..34a37432f 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 @@ -201,7 +201,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -222,7 +222,7 @@ public class PigController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 0c9e9a5a0..288b3d6f2 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 @@ -180,7 +180,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class PigZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4cafc23c7..07f65df87 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 @@ -193,7 +193,7 @@ public class PillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class PillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java index 07a3c8a27..853d63719 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java @@ -160,7 +160,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -181,7 +181,7 @@ public class PolarBearController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f1c62220c..67812d73e 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 @@ -216,7 +216,7 @@ public class PufferFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -258,7 +258,7 @@ public class PufferFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 987934572..0d187b999 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 @@ -201,7 +201,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -225,7 +225,7 @@ public class RabbitController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f97eac644..33d456706 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 @@ -193,7 +193,7 @@ public class RavagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class RavagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 fd47809bf..4b83c6ce8 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 @@ -204,7 +204,7 @@ public class SalmonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -246,7 +246,7 @@ public class SalmonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 89946bc83..421c51932 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 @@ -193,7 +193,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class SheepController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 495f0218a..f45317d87 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 @@ -180,7 +180,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -199,7 +199,7 @@ public class ShulkerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 63fa6a80a..76c6107f6 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 @@ -177,7 +177,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -198,7 +198,7 @@ public class SilverfishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d5144941f..f0e425b50 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 @@ -179,7 +179,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 883c69cb1..7c699fa64 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 @@ -179,7 +179,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9e51e9d88..86b3b6ffe 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 @@ -179,7 +179,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 a0fbe891a..43a3fadc0 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 @@ -190,7 +190,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -202,7 +202,7 @@ public class SlimeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 633ff8e89..3c1b33b57 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 @@ -180,7 +180,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -213,7 +213,7 @@ public class SnowmanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 041500906..b9571eb87 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 @@ -179,7 +179,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 2561f41e8..8352613a4 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 @@ -179,7 +179,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SquidController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9d44e28e1..e67e7c888 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 @@ -209,7 +209,7 @@ public class TraderLlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -241,7 +241,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 97a80bfee..f771ecd41 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 @@ -204,7 +204,7 @@ public class TropicalFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -248,7 +248,7 @@ public class TropicalFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f091e8941..004fd6bfc 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 @@ -195,7 +195,7 @@ public class TurtleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -224,7 +224,7 @@ public class TurtleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java index 6d4ad305f..fd21356f8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java @@ -149,7 +149,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -170,7 +170,7 @@ public class VexController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 77ee083c0..3eb0cc430 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 @@ -227,7 +227,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -250,7 +250,7 @@ public class VillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 78c9c5a94..bcf635973 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 @@ -194,7 +194,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -215,7 +215,7 @@ public class VindicatorController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 e852a4420..80b7ace4d 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 @@ -228,7 +228,7 @@ public class WanderingTraderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -251,7 +251,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 00c60510c..49fa19b01 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 @@ -178,7 +178,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -199,7 +199,7 @@ public class WitchController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b277f5571..f7e3d5888 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 @@ -144,7 +144,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -180,7 +180,7 @@ public class WitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 0003f6c57..b5d3c404d 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 @@ -196,7 +196,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -217,7 +217,7 @@ public class WolfController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 197e55c35..37b9c718e 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 @@ -179,7 +179,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class ZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d27207766..02d4c17d7 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 @@ -179,7 +179,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 a58343602..ccfb95fad 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 @@ -179,7 +179,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class ZombieVillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java index 93559ee32..7941e0ecd 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java @@ -100,7 +100,7 @@ public class DragonFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java index c15c632ac..35311ca5d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java @@ -116,7 +116,7 @@ public class EggController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java index 79a515fe8..f398176e4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java @@ -100,7 +100,7 @@ public class EnderPearlController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java index 4de92f1d4..5b3cc5091 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java @@ -94,7 +94,7 @@ public class LargeFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java index 36f0b4158..d8d5a8158 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java @@ -113,7 +113,7 @@ public class LlamaSpitController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java index 95f88e81e..da262d042 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java @@ -94,7 +94,7 @@ public class SmallFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java index 18d20b9f7..daffd4935 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java @@ -94,7 +94,7 @@ public class ThrownExpBottleController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java index 118580e1d..e087da045 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java @@ -155,7 +155,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -180,7 +180,7 @@ public class BatController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java index 55f6d3bc5..00b00a587 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java @@ -152,7 +152,7 @@ public class BeeController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -177,7 +177,7 @@ public class BeeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 544acf279..9b0e52b4a 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 @@ -151,7 +151,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -171,7 +171,7 @@ public class BlazeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 7c8fbf1dc..dec0d931c 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 @@ -199,7 +199,7 @@ public class CatController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -220,7 +220,7 @@ public class CatController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java index 9311f2b02..958238053 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java @@ -187,7 +187,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } @@ -209,7 +209,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6308ae236..ef1894214 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 @@ -200,7 +200,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -229,7 +229,7 @@ public class ChickenController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 1c01d7739..8508a0e24 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 @@ -211,7 +211,7 @@ public class CodController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -255,7 +255,7 @@ public class CodController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4912250cd..5a3ac6f90 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 @@ -215,7 +215,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -236,7 +236,7 @@ public class CowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c075173c0..af4f276a4 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 @@ -189,7 +189,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -210,7 +210,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b627441e1..e6c408079 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 @@ -198,7 +198,7 @@ public class DolphinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -210,7 +210,7 @@ public class DolphinController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9de52c609..162f75595 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 @@ -185,7 +185,7 @@ public class DrownedController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -206,7 +206,7 @@ public class DrownedController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 a1f96c20e..b0c49cb44 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 @@ -150,7 +150,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -186,7 +186,7 @@ public class EnderDragonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d6e073cb7..625d9c7a5 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 @@ -193,7 +193,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -218,7 +218,7 @@ public class EndermanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 08ba8dff3..6da394b58 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 @@ -185,7 +185,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -206,7 +206,7 @@ public class EndermiteController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 1074e8481..72c15e92b 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 @@ -180,7 +180,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class EvokerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 764945b45..c6cf46afc 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 @@ -193,7 +193,7 @@ public class FoxController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class FoxController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ae75c8486..64328d854 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 @@ -145,7 +145,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -171,7 +171,7 @@ public class GhastController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 026e0b6ba..603051e9f 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 @@ -179,7 +179,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class GiantController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 e8866eca0..ccfecaf32 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 @@ -180,7 +180,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -207,7 +207,7 @@ public class GuardianController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 a5386660f..3936d6ede 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 @@ -180,7 +180,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -207,7 +207,7 @@ public class GuardianElderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 666aee3a6..427bbb118 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 @@ -179,7 +179,7 @@ public class HoglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class HoglinController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 090d42ca1..ffe6f6ad0 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 @@ -226,7 +226,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -263,7 +263,7 @@ public class HorseController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 232ca76af..a490af697 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 @@ -224,7 +224,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -260,7 +260,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 0efe6450c..1f043cf5e 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 @@ -225,7 +225,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -261,7 +261,7 @@ public class HorseMuleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 c1655a56d..9d033d90a 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 @@ -226,7 +226,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -262,7 +262,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 82bddbc6a..7c0a8e318 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 @@ -226,7 +226,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -262,7 +262,7 @@ public class HorseZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 581db310e..5dc247689 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 @@ -180,7 +180,7 @@ public class IllusionerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class IllusionerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4a39c302f..9973c16e0 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 @@ -179,7 +179,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class IronGolemController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 7121b96e5..7d1375200 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 @@ -206,7 +206,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -232,7 +232,7 @@ public class LlamaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9c834df74..50bccf1e0 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 @@ -189,7 +189,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 be400331f..583e41f26 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 @@ -204,7 +204,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -225,7 +225,7 @@ public class MushroomCowController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 5be019647..a8dd5f5ed 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 @@ -195,7 +195,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -221,7 +221,7 @@ public class OcelotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 46cdb7106..c5d2c3b6e 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 @@ -193,7 +193,7 @@ public class PandaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class PandaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java index 7f48cf4a7..f7552cad0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java @@ -76,7 +76,7 @@ public class ParrotController extends MobEntityController { @Override public EnumInteractionResult b(EntityHuman paramEntityHuman, EnumHand paramEnumHand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.b(paramEntityHuman, paramEnumHand); } return EnumInteractionResult.FAIL; @@ -158,7 +158,7 @@ public class ParrotController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -185,7 +185,7 @@ public class ParrotController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b007564cc..b19dcbc21 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 @@ -217,7 +217,7 @@ public class PhantomController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -251,7 +251,7 @@ public class PhantomController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 60b49dbde..8f495c166 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 @@ -202,7 +202,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -223,7 +223,7 @@ public class PigController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ae33114ba..2203f577b 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 @@ -180,7 +180,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -201,7 +201,7 @@ public class PigZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6635747b5..90d708e02 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 @@ -179,7 +179,7 @@ public class PiglinBruteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class PiglinBruteController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 8774b4acb..4fc782e8e 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 @@ -179,7 +179,7 @@ public class PiglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -203,7 +203,7 @@ public class PiglinController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 eefaf3302..8eda0f6bf 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 @@ -193,7 +193,7 @@ public class PillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class PillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java index e23e66bda..71f0a5c1b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java @@ -160,7 +160,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -181,7 +181,7 @@ public class PolarBearController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d661ff936..8d70ec98f 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 @@ -217,7 +217,7 @@ public class PufferFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -259,7 +259,7 @@ public class PufferFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9fc2fea07..70a0b493f 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 @@ -201,7 +201,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -225,7 +225,7 @@ public class RabbitController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f2e79ac08..94cfeaa66 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 @@ -193,7 +193,7 @@ public class RavagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class RavagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 295493275..8a68f839e 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 @@ -205,7 +205,7 @@ public class SalmonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -247,7 +247,7 @@ public class SalmonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 79b03fc5a..7decf656b 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 @@ -193,7 +193,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -214,7 +214,7 @@ public class SheepController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 49b8adbdf..b513a6dd1 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 @@ -180,7 +180,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -199,7 +199,7 @@ public class ShulkerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 88c10a67d..7db4dbb91 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 @@ -177,7 +177,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -198,7 +198,7 @@ public class SilverfishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f7603e97a..c7995b06a 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 @@ -179,7 +179,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SkeletonController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 0f63332e7..93877dcb6 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 @@ -179,7 +179,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 7c7a8f4d2..1999757ef 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 @@ -179,7 +179,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 b805f9bb7..56646bae7 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 @@ -190,7 +190,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -202,7 +202,7 @@ public class SlimeController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 20acd15fc..bc32b6330 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 @@ -180,7 +180,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -213,7 +213,7 @@ public class SnowmanController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 5e06ef570..7b0bf1456 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 @@ -179,7 +179,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SpiderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 60de0fc02..34d2ceced 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 @@ -179,7 +179,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class SquidController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 ff8818bb0..5992b29a0 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 @@ -179,7 +179,7 @@ public class StriderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class StriderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 a786c2b8e..08eb15c38 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 @@ -209,7 +209,7 @@ public class TraderLlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -241,7 +241,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 5636ff28a..a89f7b13a 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 @@ -205,7 +205,7 @@ public class TropicalFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -249,7 +249,7 @@ public class TropicalFishController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 eacb30841..fbccf4fdf 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 @@ -195,7 +195,7 @@ public class TurtleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -224,7 +224,7 @@ public class TurtleController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java index 638344b6e..6a45e4299 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java @@ -149,7 +149,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -170,7 +170,7 @@ public class VexController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f6ac0fd34..c6e7f88a6 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 @@ -229,7 +229,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -252,7 +252,7 @@ public class VillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 d7097b4aa..ae5eb2bbc 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 @@ -194,7 +194,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -215,7 +215,7 @@ public class VindicatorController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 628472faa..782dad808 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 @@ -230,7 +230,7 @@ public class WanderingTraderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -253,7 +253,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 9b24fdb05..76a956445 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 @@ -179,7 +179,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class WitchController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6e3754e7e..313c04a58 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 @@ -144,7 +144,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -174,7 +174,7 @@ public class WitherController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 f223e3c47..f1373b9d4 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 @@ -196,7 +196,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -217,7 +217,7 @@ public class WolfController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 4c77b6949..737ea4676 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 @@ -179,7 +179,7 @@ public class ZoglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -202,7 +202,7 @@ public class ZoglinController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 102ccb023..8a9f4ed3b 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 @@ -179,7 +179,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class ZombieController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 7d1e2a9ce..b7e157ed1 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 @@ -179,7 +179,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } 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 6ceb35fc6..b9546bd49 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 @@ -179,7 +179,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -200,7 +200,7 @@ public class ZombieVillagerController extends MobEntityController { @Override protected boolean n(Entity entity) { if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.n(entity); } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java index 7ca9530d6..9707df6e4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java @@ -100,7 +100,7 @@ public class DragonFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java index 1633872e8..dbff9a089 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java @@ -116,7 +116,7 @@ public class EggController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java index 7340dd094..d2dbafef9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java @@ -100,7 +100,7 @@ public class EnderPearlController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java index 0e6c97f81..1bd7de158 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java @@ -94,7 +94,7 @@ public class LargeFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java index cb9116733..122ac5173 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java @@ -113,7 +113,7 @@ public class LlamaSpitController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java index f4d6bcc66..e39ee2291 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java @@ -94,7 +94,7 @@ public class SmallFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java index 0ae6f8a80..08ea62fd8 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java @@ -94,7 +94,7 @@ public class ThrownExpBottleController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { 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 a42c90399..32450ecdd 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 @@ -79,7 +79,7 @@ public class AxolotlController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -151,7 +151,7 @@ public class AxolotlController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java index 1177c9a5f..101b0cc72 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java @@ -61,7 +61,7 @@ public class BatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -132,7 +132,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java index 50422c7a6..54085469d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java @@ -58,7 +58,7 @@ public class BeeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -129,7 +129,7 @@ public class BeeController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5dcd12e15..e72d51f27 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 @@ -58,7 +58,7 @@ public class BlazeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -123,7 +123,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 9ff0a1d64..c7bc09738 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 @@ -63,7 +63,7 @@ public class CatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -144,7 +144,7 @@ public class CatController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java index 272fe9e23..03210244b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java @@ -60,7 +60,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -142,7 +142,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } 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 7b2a610e7..d69cf991e 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 @@ -71,7 +71,7 @@ public class ChickenController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -152,7 +152,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5c55a9578..5097e6f43 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 @@ -85,7 +85,7 @@ public class CodController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -177,7 +177,7 @@ public class CodController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 278cb6e9a..625ae9413 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 @@ -68,7 +68,7 @@ public class CowController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -149,7 +149,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 8fe8a5236..17f4491be 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 @@ -64,7 +64,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -145,7 +145,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 2211b2372..94c4a8bdb 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 @@ -71,7 +71,7 @@ public class DolphinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -143,7 +143,7 @@ public class DolphinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 996383ec3..4ea632a78 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 @@ -60,7 +60,7 @@ public class DrownedController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -141,7 +141,7 @@ public class DrownedController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 877bd9d01..f9f830bcc 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 @@ -82,7 +82,7 @@ public class EnderDragonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0b232be4a..15fce7e24 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 @@ -63,7 +63,7 @@ public class EndermanController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -148,7 +148,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 61c4714d3..087f13978 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 @@ -60,7 +60,7 @@ public class EndermiteController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -141,7 +141,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 23dc71aca..b474c2a10 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 @@ -54,7 +54,7 @@ public class EvokerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 865b094ca..1790ed1f5 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 @@ -57,7 +57,7 @@ public class FoxController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class FoxController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 97e6f7f51..c2b693261 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 @@ -52,7 +52,7 @@ public class GhastController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -123,7 +123,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6f281bf61..d755ed39f 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 @@ -54,7 +54,7 @@ public class GiantController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5ccb9f650..f7b3b7376 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 @@ -54,7 +54,7 @@ public class GlowSquidController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class GlowSquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 16e381e2e..a5f0dccad 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 @@ -57,7 +57,7 @@ public class GoatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class GoatController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 83929c84b..f340bee10 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 @@ -69,7 +69,7 @@ public class GuardianController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -141,7 +141,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 086648cfd..981e79bab 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 @@ -69,7 +69,7 @@ public class GuardianElderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -141,7 +141,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 bcccdf591..60c0468c8 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 @@ -54,7 +54,7 @@ public class HoglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class HoglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 529d177f9..ead04657d 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 @@ -81,7 +81,7 @@ public class HorseController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -186,7 +186,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 9e1a2d6e9..c9661665a 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 @@ -81,7 +81,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -185,7 +185,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 cc88071be..792482a45 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 @@ -81,7 +81,7 @@ public class HorseMuleController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -185,7 +185,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ab1e01736..1e5e8b850 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 @@ -81,7 +81,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -185,7 +185,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 7b9c1bddd..f97277344 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 @@ -81,7 +81,7 @@ public class HorseZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -185,7 +185,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 da53a4ce0..b0ee889e0 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 @@ -54,7 +54,7 @@ public class IllusionerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class IllusionerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c20a8f6fa..6cc6a4f3e 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 @@ -54,7 +54,7 @@ public class IronGolemController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 2ebe4690b..6df62dfcf 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 @@ -70,7 +70,7 @@ public class LlamaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -156,7 +156,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 b181ff058..f716c829d 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 @@ -64,7 +64,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 8606b3f40..b87f36b82 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 @@ -60,7 +60,7 @@ public class MushroomCowController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -141,7 +141,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 3c267caa9..19e2e4960 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 @@ -58,7 +58,7 @@ public class OcelotController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -144,7 +144,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5d75f82f1..b3aa5f270 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 @@ -57,7 +57,7 @@ public class PandaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class PandaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java index 93822ae6f..55edc8d6e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java @@ -55,7 +55,7 @@ public class ParrotController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -128,7 +128,7 @@ public class ParrotController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -150,7 +150,7 @@ public class ParrotController extends MobEntityController { @Override public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.mobInteract(entityhuman, enumhand); } return InteractionResult.FAIL; 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 7237f8a8b..3e4ea79eb 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 @@ -95,7 +95,7 @@ public class PhantomController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -167,7 +167,7 @@ public class PhantomController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 bd781fa04..dd29b23aa 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 @@ -65,7 +65,7 @@ public class PigController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -146,7 +146,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 901eb2018..bd6ab740c 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 @@ -55,7 +55,7 @@ public class PigZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c2cbdd590..e49b3ce7a 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 @@ -54,7 +54,7 @@ public class PiglinBruteController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class PiglinBruteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 7ddb61252..3ff9af682 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 @@ -54,7 +54,7 @@ public class PiglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class PiglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 b64b7ff7e..7f2c71b18 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 @@ -57,7 +57,7 @@ public class PillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class PillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java index c3b4b7b62..9648ed51c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java @@ -55,7 +55,7 @@ public class PolarBearController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -122,7 +122,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 2ca0d0d68..90767107a 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 @@ -85,7 +85,7 @@ public class PufferFishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -180,7 +180,7 @@ public class PufferFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0a7746145..089e3faf3 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 @@ -59,7 +59,7 @@ public class RabbitController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -148,7 +148,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d74beddc9..acfeb96c0 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 @@ -57,7 +57,7 @@ public class RavagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class RavagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 01588423d..711f75b69 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 @@ -79,7 +79,7 @@ public class SalmonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -169,7 +169,7 @@ public class SalmonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ba3ce239b..472f52a89 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 @@ -57,7 +57,7 @@ public class SheepController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a410f4dfd..35acfd12a 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 @@ -62,7 +62,7 @@ public class ShulkerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 433b61109..0d73db262 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 @@ -54,7 +54,7 @@ public class SilverfishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -133,7 +133,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 33f52b8ad..ea612193d 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 @@ -54,7 +54,7 @@ public class SkeletonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e9c974701..22265ca69 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 @@ -54,7 +54,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6dcfc70fd..3bf6993fb 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 @@ -54,7 +54,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 1c5aaa1d4..64907dbbc 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 @@ -64,7 +64,7 @@ public class SlimeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 65dc9ec08..520cac0d0 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 @@ -67,7 +67,7 @@ public class SnowmanController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -148,7 +148,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a76ae0535..2454cfc7a 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 @@ -54,7 +54,7 @@ public class SpiderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 cd8e93fa2..87d411d1a 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 @@ -54,7 +54,7 @@ public class SquidController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 3f149dd1c..697ef1c2b 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 @@ -54,7 +54,7 @@ public class StriderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class StriderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 47fe0ac62..d90efbc34 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 @@ -70,7 +70,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -157,7 +157,7 @@ public class TraderLlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d24e1d83d..f671e19f4 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 @@ -79,7 +79,7 @@ public class TropicalFishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -171,7 +171,7 @@ public class TropicalFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 8c493b4b1..a1707fa8b 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 @@ -68,7 +68,7 @@ public class TurtleController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -157,7 +157,7 @@ public class TurtleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java index 907773b92..c58dd75ea 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java @@ -55,7 +55,7 @@ public class VexController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -122,7 +122,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5ed444f76..055195840 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 @@ -69,7 +69,7 @@ public class VillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -152,7 +152,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ec8b462b4..7cc983d06 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 @@ -57,7 +57,7 @@ public class VindicatorController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d0caa0292..a30d78f04 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 @@ -66,7 +66,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -153,7 +153,7 @@ public class WanderingTraderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 fabc487fc..434c514a3 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 @@ -54,7 +54,7 @@ public class WitchController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a79f430a2..64b3aeae0 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 @@ -52,7 +52,7 @@ public class WitherController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -127,7 +127,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 148f34390..f4b6c579b 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 @@ -59,7 +59,7 @@ public class WolfController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -140,7 +140,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 037d7791f..79f36acf4 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 @@ -54,7 +54,7 @@ public class ZoglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -137,7 +137,7 @@ public class ZoglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6c20e5107..9633dcaf8 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 @@ -54,7 +54,7 @@ public class ZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 3398cbfbb..34885efd8 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 @@ -54,7 +54,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 20e2ad665..f61af0da5 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 @@ -54,7 +54,7 @@ public class ZombieVillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -135,7 +135,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java index 663c96831..a47e8f175 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java @@ -99,7 +99,7 @@ public class DragonFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java index 1f3645423..b617be3ff 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java @@ -105,7 +105,7 @@ public class EggController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java index 29a00859d..f81b563b3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java @@ -91,7 +91,7 @@ public class EnderPearlController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java index 7ad1f2471..b3020c8fe 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java @@ -93,7 +93,7 @@ public class LargeFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java index 9ce223881..8f554f0e9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java @@ -102,7 +102,7 @@ public class LlamaSpitController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java index 143d2c0fe..5c153d551 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java @@ -84,7 +84,7 @@ public class SmallFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java index bce2c0251..bbd0ec672 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java @@ -85,7 +85,7 @@ public class ThrownExpBottleController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { 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 07f8fb3d2..bdd648b71 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 @@ -79,7 +79,7 @@ public class AxolotlController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -151,7 +151,7 @@ public class AxolotlController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java index cb450003d..2211ac791 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java @@ -63,7 +63,7 @@ public class BatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -134,7 +134,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java index f6cdcbc11..27f0ac148 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java @@ -60,7 +60,7 @@ public class BeeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -131,7 +131,7 @@ public class BeeController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4484e6350..8b3536589 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 @@ -60,7 +60,7 @@ public class BlazeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -125,7 +125,7 @@ public class BlazeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 7177065ec..c25c12aa0 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 @@ -64,7 +64,7 @@ public class CatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -145,7 +145,7 @@ public class CatController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java index ccf96ed5e..baf88db74 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java @@ -61,7 +61,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -143,7 +143,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.isLeashed(); } 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 7ec722b72..bdfe485fb 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 @@ -72,7 +72,7 @@ public class ChickenController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -153,7 +153,7 @@ public class ChickenController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0ca01ad6a..7a40da32b 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 @@ -86,7 +86,7 @@ public class CodController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -178,7 +178,7 @@ public class CodController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c21cc8492..55d832ef0 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 @@ -69,7 +69,7 @@ public class CowController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -150,7 +150,7 @@ public class CowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 8935f2e78..21fa0b588 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 @@ -64,7 +64,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -145,7 +145,7 @@ public class CreeperController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 cfe70113d..938a5bcc2 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 @@ -71,7 +71,7 @@ public class DolphinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -143,7 +143,7 @@ public class DolphinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 8b1d0a6fb..e3da1f293 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 @@ -61,7 +61,7 @@ public class DrownedController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -142,7 +142,7 @@ public class DrownedController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 56a80125c..81a0503e5 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 @@ -84,7 +84,7 @@ public class EnderDragonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -141,7 +141,7 @@ public class EnderDragonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 17e5e3af5..d2d043198 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 @@ -64,7 +64,7 @@ public class EndermanController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -145,7 +145,7 @@ public class EndermanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e39d34b48..ab56a15bc 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 @@ -61,7 +61,7 @@ public class EndermiteController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -142,7 +142,7 @@ public class EndermiteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 dbeb88aff..2a10c145a 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 @@ -55,7 +55,7 @@ public class EvokerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class EvokerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 fd9978b0d..2f0c5f066 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 @@ -58,7 +58,7 @@ public class FoxController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class FoxController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a9873e076..57f8337b9 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 @@ -54,7 +54,7 @@ public class GhastController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -125,7 +125,7 @@ public class GhastController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 2e1ae061b..612f2f33f 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 @@ -55,7 +55,7 @@ public class GiantController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class GiantController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a162f3986..a23452d7b 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 @@ -55,7 +55,7 @@ public class GlowSquidController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class GlowSquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 262523533..c1b5ba57b 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 @@ -58,7 +58,7 @@ public class GoatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class GoatController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 417b0d0a9..3e7854be2 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 @@ -70,7 +70,7 @@ public class GuardianController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -142,7 +142,7 @@ public class GuardianController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c10a027c3..e4eff442d 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 @@ -70,7 +70,7 @@ public class GuardianElderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -142,7 +142,7 @@ public class GuardianElderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 beee6af04..adc9f7c32 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 @@ -55,7 +55,7 @@ public class HoglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class HoglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d13f2d5e0..b0f20a5c7 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 @@ -82,7 +82,7 @@ public class HorseController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -187,7 +187,7 @@ public class HorseController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4d8bcbe75..e0a78acff 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 @@ -82,7 +82,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -186,7 +186,7 @@ public class HorseDonkeyController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 1b839a62f..8a555a849 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 @@ -82,7 +82,7 @@ public class HorseMuleController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -186,7 +186,7 @@ public class HorseMuleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6bd30d8d3..6b2da7770 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 @@ -82,7 +82,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -186,7 +186,7 @@ public class HorseSkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d2d4a8a7c..dfe3a2a10 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 @@ -82,7 +82,7 @@ public class HorseZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -186,7 +186,7 @@ public class HorseZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 d885cc043..138087c3a 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 @@ -55,7 +55,7 @@ public class IllusionerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class IllusionerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 2d8d1f7e7..eabd14cbb 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 @@ -55,7 +55,7 @@ public class IronGolemController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class IronGolemController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ab255fd2d..116e7a608 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 @@ -71,7 +71,7 @@ public class LlamaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -157,7 +157,7 @@ public class LlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 3a4cbca68..b2a82d9ad 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 @@ -65,7 +65,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -137,7 +137,7 @@ public class MagmaCubeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 08ca2433f..846ea6ea7 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 @@ -61,7 +61,7 @@ public class MushroomCowController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -142,7 +142,7 @@ public class MushroomCowController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 21da6bb81..82009443e 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 @@ -59,7 +59,7 @@ public class OcelotController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -145,7 +145,7 @@ public class OcelotController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c907ff576..3ada23a15 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 @@ -58,7 +58,7 @@ public class PandaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class PandaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java index 542f1c19b..1db6d19e4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java @@ -57,7 +57,7 @@ public class ParrotController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -130,7 +130,7 @@ public class ParrotController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { @@ -152,7 +152,7 @@ public class ParrotController extends MobEntityController { @Override public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.mobInteract(entityhuman, enumhand); } return InteractionResult.FAIL; 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 827a62c55..712b6cfe8 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 @@ -96,7 +96,7 @@ public class PhantomController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -168,7 +168,7 @@ public class PhantomController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 1d41a87df..ecd97b9f4 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 @@ -65,7 +65,7 @@ public class PigController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -146,7 +146,7 @@ public class PigController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c2944a39c..d67f09915 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 @@ -56,7 +56,7 @@ public class PigZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -137,7 +137,7 @@ public class PigZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 695349dce..346335345 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 @@ -55,7 +55,7 @@ public class PiglinBruteController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class PiglinBruteController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 02ab2313f..a222cea07 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 @@ -55,7 +55,7 @@ public class PiglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class PiglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a57aa9de8..81992bb2a 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 @@ -58,7 +58,7 @@ public class PillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class PillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java index e74b132f3..d72811007 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java @@ -57,7 +57,7 @@ public class PolarBearController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -124,7 +124,7 @@ public class PolarBearController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6e9db4f6f..f6720abea 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 @@ -86,7 +86,7 @@ public class PufferFishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -181,7 +181,7 @@ public class PufferFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 3491600ad..caf735b62 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 @@ -60,7 +60,7 @@ public class RabbitController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -149,7 +149,7 @@ public class RabbitController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f7d1182f4..f5ce3da22 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 @@ -63,7 +63,7 @@ public class RavagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -144,7 +144,7 @@ public class RavagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 b0ed28405..a07f81ed6 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 @@ -80,7 +80,7 @@ public class SalmonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -170,7 +170,7 @@ public class SalmonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 033359c34..f3d027a7a 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 @@ -58,7 +58,7 @@ public class SheepController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class SheepController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ad27dce05..5d2042753 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 @@ -63,7 +63,7 @@ public class ShulkerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -140,7 +140,7 @@ public class ShulkerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0750b1854..24d33581a 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 @@ -55,7 +55,7 @@ public class SilverfishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -134,7 +134,7 @@ public class SilverfishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 ad8ee4af9..8739755d6 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 @@ -55,7 +55,7 @@ public class SkeletonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class SkeletonController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e5f46d240..484f265ef 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 @@ -55,7 +55,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class SkeletonStrayController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 54b64ef2d..116dfc42c 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 @@ -55,7 +55,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class SkeletonWitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 791252fcb..4c021e91d 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 @@ -65,7 +65,7 @@ public class SlimeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -137,7 +137,7 @@ public class SlimeController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 59f97ad16..7f59cc8ee 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 @@ -68,7 +68,7 @@ public class SnowmanController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -149,7 +149,7 @@ public class SnowmanController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 f17b462da..15fc773db 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 @@ -55,7 +55,7 @@ public class SpiderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class SpiderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 a2efce7dd..3fd93f72a 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 @@ -55,7 +55,7 @@ public class SquidController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class SquidController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 6e65407c0..91e145a9b 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 @@ -55,7 +55,7 @@ public class StriderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class StriderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 78de32280..3a20dddb4 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 @@ -71,7 +71,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -158,7 +158,7 @@ public class TraderLlamaController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 8d457dbbe..85e4d5f01 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 @@ -80,7 +80,7 @@ public class TropicalFishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -172,7 +172,7 @@ public class TropicalFishController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 c9ae2be17..5f6ef89c6 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 @@ -69,7 +69,7 @@ public class TurtleController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -158,7 +158,7 @@ public class TurtleController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java index 7939162bd..8060532e0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java @@ -57,7 +57,7 @@ public class VexController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -124,7 +124,7 @@ public class VexController extends MobEntityController { if (npc == null) { return super.isLeashed(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 4b5dfb898..565e80a92 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 @@ -69,7 +69,7 @@ public class VillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -152,7 +152,7 @@ public class VillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 cc58bdd6d..0a7a0921d 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 @@ -58,7 +58,7 @@ public class VindicatorController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -139,7 +139,7 @@ public class VindicatorController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 5c6df911d..69fc7cc82 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 @@ -66,7 +66,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -153,7 +153,7 @@ public class WanderingTraderController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 041b66ab8..9dc2944c6 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 @@ -55,7 +55,7 @@ public class WitchController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class WitchController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 e2fc36b0c..45d903e76 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 @@ -54,7 +54,7 @@ public class WitherController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -129,7 +129,7 @@ public class WitherController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 50abe68e8..6dd77dd5f 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 @@ -60,7 +60,7 @@ public class WolfController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -141,7 +141,7 @@ public class WolfController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 0a5b5c90d..a9516ff12 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 @@ -55,7 +55,7 @@ public class ZoglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -138,7 +138,7 @@ public class ZoglinController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 782b56b2d..e61db73c6 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 @@ -55,7 +55,7 @@ public class ZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class ZombieController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 3d4c10f85..df8b65625 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 @@ -55,7 +55,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class ZombieHuskController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { 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 db46b5a9a..49287ab6b 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 @@ -55,7 +55,7 @@ public class ZombieVillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -136,7 +136,7 @@ public class ZombieVillagerController extends MobEntityController { public boolean isLeashed() { if (npc == null) return super.isLeashed(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java index 9d77ec468..892c9a512 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java @@ -108,7 +108,7 @@ public class DragonFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java index 66fb696d0..c479a886c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java @@ -113,7 +113,7 @@ public class EggController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java index c35e6e86e..8934817ad 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java @@ -100,7 +100,7 @@ public class EnderPearlController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java index ed33ee72d..dace4fc33 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java @@ -102,7 +102,7 @@ public class LargeFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java index e506dcefc..d7665d518 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java @@ -110,7 +110,7 @@ public class LlamaSpitController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java index 4c0e195aa..b263f24dc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java @@ -93,7 +93,7 @@ public class SmallFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java index 5c3e1cc83..e61900226 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java @@ -94,7 +94,7 @@ public class ThrownExpBottleController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { 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 a1779a9ec..b8028265f 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 @@ -71,7 +71,7 @@ public class AllayController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 53e4a42dc..3e2b00cd1 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 @@ -80,7 +80,7 @@ public class AxolotlController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 bffff7e2d..cd179bfb5 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 @@ -63,7 +63,7 @@ public class BatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 4b8baa4a5..6f656555f 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 @@ -60,7 +60,7 @@ public class BeeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 706721d2d..9738e9d70 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 @@ -60,7 +60,7 @@ public class BlazeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 db250fb9e..9ad1946dc 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 @@ -65,7 +65,7 @@ public class CatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 0b96c75ea..d0962e112 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 @@ -62,7 +62,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 32c4e589d..38e2b4c7c 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 @@ -73,7 +73,7 @@ public class ChickenController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 21ae12317..60213b12e 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 @@ -87,7 +87,7 @@ public class CodController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 b69ca73cc..acd262ab6 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 @@ -70,7 +70,7 @@ public class CowController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 cb75cd49f..713212c5f 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 @@ -65,7 +65,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 b05fdf9c8..fb75912f5 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 @@ -72,7 +72,7 @@ public class DolphinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 2dedd6c08..62166e44f 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 @@ -62,7 +62,7 @@ public class DrownedController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 f86b53666..2d9f91707 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 @@ -84,7 +84,7 @@ public class EnderDragonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 0627abac7..76976f95f 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 @@ -65,7 +65,7 @@ public class EndermanController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 92553b840..fe82ef712 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 @@ -62,7 +62,7 @@ public class EndermiteController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 b7cf3e000..34723f6ff 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 @@ -56,7 +56,7 @@ public class EvokerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 f95b2c78c..28b0e3e22 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 @@ -59,7 +59,7 @@ public class FoxController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 af4a63d65..935315aae 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 @@ -62,7 +62,7 @@ public class FrogController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 46792364f..3c2895122 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 @@ -54,7 +54,7 @@ public class GhastController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 2885ae30b..7d292ceef 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 @@ -56,7 +56,7 @@ public class GiantController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 09589777e..ee32d21e1 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 @@ -56,7 +56,7 @@ public class GlowSquidController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 07fbea690..601159ae0 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 @@ -59,7 +59,7 @@ public class GoatController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 6f0a42c6f..76024e98b 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 @@ -71,7 +71,7 @@ public class GuardianController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 d26bc3af7..e8959cfdd 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 @@ -71,7 +71,7 @@ public class GuardianElderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 f60102b7b..c89757865 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 @@ -59,7 +59,7 @@ public class HoglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 942996508..825f29221 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 @@ -77,7 +77,7 @@ public class HorseController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 4f00cd154..7bccc8471 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 @@ -77,7 +77,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 50f174796..a6d2c0080 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 @@ -77,7 +77,7 @@ public class HorseMuleController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 4ea071ea4..7ae27aa99 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 @@ -77,7 +77,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 845dd3d18..e9eff67bd 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 @@ -77,7 +77,7 @@ public class HorseZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 54beccd11..42ca7e985 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 @@ -56,7 +56,7 @@ public class IllusionerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 2325432ff..1744a2280 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 @@ -56,7 +56,7 @@ public class IronGolemController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 41cebfb57..ba9913a14 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 @@ -72,7 +72,7 @@ public class LlamaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 de1d7d5c6..3464954e3 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 @@ -66,7 +66,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 a7e919fc5..47ad98c79 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 @@ -62,7 +62,7 @@ public class MushroomCowController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 dc609b3f3..7698dc751 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 @@ -60,7 +60,7 @@ public class OcelotController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 002150a6c..bb99d4507 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 @@ -59,7 +59,7 @@ public class PandaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 c397807ce..44508a1c5 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 @@ -57,7 +57,7 @@ public class ParrotController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } @@ -143,7 +143,7 @@ public class ParrotController extends MobEntityController { @Override public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) { // block feeding - if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (npc == null || !npc.isProtected()) { return super.mobInteract(entityhuman, enumhand); } return InteractionResult.FAIL; 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 587d2bc19..610584e00 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 @@ -96,7 +96,7 @@ public class PhantomController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 2e7124ab1..87f7c204e 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 @@ -60,7 +60,7 @@ public class PigController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 2a6a8c489..45c6c32ef 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 @@ -57,7 +57,7 @@ public class PigZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 15ef1d8de..170433ce4 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 @@ -56,7 +56,7 @@ public class PiglinBruteController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 a17ee5205..4e133bb9b 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 @@ -56,7 +56,7 @@ public class PiglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 6f46ffe96..367aa3f9f 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 @@ -59,7 +59,7 @@ public class PillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 10b4aeb9b..9f08413f4 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 @@ -57,7 +57,7 @@ public class PolarBearController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 29db5abe3..7da17d8fe 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 @@ -87,7 +87,7 @@ public class PufferFishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 85dd70e09..1c68d8651 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 @@ -61,7 +61,7 @@ public class RabbitController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 294d2f5dd..694401590 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 @@ -59,7 +59,7 @@ public class RavagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 55913dc38..9cf4f7fbd 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 @@ -81,7 +81,7 @@ public class SalmonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 715e6ee46..452da9d17 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 @@ -59,7 +59,7 @@ public class SheepController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 1e6448334..fc8341005 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 @@ -64,7 +64,7 @@ public class ShulkerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 c3fafe35c..16e284652 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 @@ -56,7 +56,7 @@ public class SilverfishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 b905edbd1..3eeb160f2 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 @@ -56,7 +56,7 @@ public class SkeletonController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 6d38ce27c..4c741aeef 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 @@ -56,7 +56,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 efa80e0bf..a3e5832a7 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 @@ -56,7 +56,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 c07ff88a7..a3dcb0a98 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 @@ -66,7 +66,7 @@ public class SlimeController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 666174f70..1ce173eea 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 @@ -69,7 +69,7 @@ public class SnowmanController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 8d1cd79ea..34cfa4515 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 @@ -56,7 +56,7 @@ public class SpiderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 efd863781..ba5d403ba 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 @@ -56,7 +56,7 @@ public class SquidController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 390848121..244c58f99 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 @@ -56,7 +56,7 @@ public class StriderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 7739dd1ec..151f95750 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 @@ -82,7 +82,7 @@ public class TadpoleController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 386d46f02..3e6fc2612 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 @@ -72,7 +72,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 9b964ba95..04f744291 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 @@ -81,7 +81,7 @@ public class TropicalFishController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 ae5ceda53..20895db27 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 @@ -69,7 +69,7 @@ public class TurtleController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 55f4a0fd7..a186244a0 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 @@ -57,7 +57,7 @@ public class VexController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 257e704e7..a93e27855 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 @@ -69,7 +69,7 @@ public class VillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 582d91ea4..731063c0b 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 @@ -59,7 +59,7 @@ public class VindicatorController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 9aa68e6c1..6e0fbf46c 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 @@ -66,7 +66,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 20e43b494..0ea93b7f1 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 @@ -59,7 +59,7 @@ public class WardenController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 2da687c96..b973e96fb 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 @@ -56,7 +56,7 @@ public class WitchController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 1fbdeeaab..0deabbdcb 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 @@ -54,7 +54,7 @@ public class WitherController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 4f9cfab25..5b2f170d9 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 @@ -61,7 +61,7 @@ public class WolfController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 f14843827..4913627df 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 @@ -56,7 +56,7 @@ public class ZoglinController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 633bb09a4..c3f5d0ff8 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 @@ -56,7 +56,7 @@ public class ZombieController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 9d89529ea..8a215120d 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 @@ -56,7 +56,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } 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 6d3337719..1af65c656 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 @@ -56,7 +56,7 @@ public class ZombieVillagerController extends MobEntityController { @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) { - return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + return !npc.isProtected(); } return super.canRide(entity); } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java index 3aa9a96ce..a365ffb11 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java @@ -108,7 +108,7 @@ public class DragonFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java index 3a9d2f0ed..9e2c561d2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java @@ -113,7 +113,7 @@ public class EggController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java index bb17d1249..386075696 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java @@ -100,7 +100,7 @@ public class EnderPearlController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java index 156ed2f56..ba068d712 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java @@ -102,7 +102,7 @@ public class LargeFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java index c0148aee6..12277ba80 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java @@ -110,7 +110,7 @@ public class LlamaSpitController extends AbstractEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java index 7146213d8..fffe1eccc 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java @@ -93,7 +93,7 @@ public class SmallFireballController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java index 821e3b93b..e49b61b5d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java @@ -94,7 +94,7 @@ public class ThrownExpBottleController extends MobEntityController { public void tick() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.tick(); } } else { 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 ff168b28c..fdcdacb0d 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 @@ -2064,7 +2064,7 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) entity).getNPC(); if (npc == null) return superLeashed; - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return superLeashed; if (superLeashed) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java index 6a6c4047d..8d600067a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java @@ -83,7 +83,7 @@ public class BatController extends MobEntityController { if (npc == null) { return super.cc(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 ebad88582..dfa377396 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java index 6c74175b6..3e3e4b085 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java @@ -89,7 +89,7 @@ public class CaveSpiderController extends MobEntityController { if (npc == null) { return super.cc(); } - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { return super.cc(); } 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 f26605e3a..727b2d4e5 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 ef76b5a8e..bad1862a8 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 9ff4b1b61..c9c722dba 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 @@ -80,7 +80,7 @@ public class CreeperController extends MobEntityController { @Override protected boolean a(EntityHuman entityhuman) { - return npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true) ? super.a(entityhuman) : false; + return npc == null || !npc.isProtected() ? super.a(entityhuman) : false; } @Override @@ -97,7 +97,7 @@ public class CreeperController extends MobEntityController { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 002d07d54..5bcdc7d15 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 f464d5870..cde5d40f9 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 277940785..513f403e7 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 7e1e178c4..be8089a01 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 011824c6a..300ac9a4c 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 c6cae876a..8aceed766 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 879d2f030..d36c1f30e 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 @@ -97,7 +97,7 @@ public class HorseController extends MobEntityController { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { @@ -120,7 +120,7 @@ public class HorseController extends MobEntityController { public boolean cp() { if (npc == null) return super.cp(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); return super.cp() && !protectedDefault; } 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 07658e5b6..18cb8d5dc 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 4601d509e..da27c9dd3 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 b22d38415..3637c6551 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 5ca9b7749..01049deb0 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 068becf9f..44c1c5040 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 bc70d60b9..c6d65901c 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 10aa097c1..f469883f1 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 4054a5fd2..b934b7f46 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 7b735d276..9956a36da 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 7d32a43fa..0e4a1f320 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 0808433c6..85e0c6689 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 1f1d05bd9..ae284e56c 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 d40aa4a87..a28dc8a24 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 47c8fc0d7..f96b15d17 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 cb30d321a..839f586f6 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 9c16d466c..80a144b7c 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 f9b9a8567..063da741e 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 964fb708a..b9d6fee86 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { 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 8f8a310b7..f76906f66 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 { public boolean cc() { if (npc == null) return super.cc(); - boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + boolean protectedDefault = npc.isProtected(); if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.cc(); if (super.cc()) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java index be335fb6f..559dafbf7 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java @@ -108,7 +108,7 @@ public class EggController extends AbstractEntityController { public void t_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.t_(); } } else { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java index a08bdd741..8b8065b4d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java @@ -92,7 +92,7 @@ public class EnderPearlController extends MobEntityController { public void t_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.t_(); } } else { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java index d633ee7c9..b528e8150 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java @@ -88,7 +88,7 @@ public class LargeFireballController extends MobEntityController { public void t_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.t_(); } } else { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java index 5755cb6fd..8bffab047 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java @@ -78,7 +78,7 @@ public class SmallFireballController extends MobEntityController { public void t_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.t_(); } } else { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java index 3ce165082..4947ff734 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java @@ -78,7 +78,7 @@ public class SplashPotionController extends MobEntityController { public void t_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.t_(); } } else { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java index 45e59d972..815ff075b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java @@ -78,7 +78,7 @@ public class ThrownExpBottleController extends MobEntityController { public void t_() { if (npc != null) { npc.update(); - if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + if (!npc.isProtected()) { super.t_(); } } else {