From 871c7c02594bedc15cb12b81ac072d862c17094e Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 13 Feb 2023 22:20:13 +0800 Subject: [PATCH] More code refactoring --- .../java/net/citizensnpcs/trait/HologramTrait.java | 1 + .../nms/v1_13_R2/entity/BatController.java | 11 +---------- .../nms/v1_13_R2/entity/BlazeController.java | 11 +---------- .../nms/v1_13_R2/entity/CaveSpiderController.java | 11 +---------- .../nms/v1_13_R2/entity/ChickenController.java | 11 +---------- .../nms/v1_13_R2/entity/CodController.java | 11 +---------- .../nms/v1_13_R2/entity/CowController.java | 11 +---------- .../nms/v1_13_R2/entity/CreeperController.java | 11 +---------- .../nms/v1_13_R2/entity/DolphinController.java | 11 +---------- .../nms/v1_13_R2/entity/DrownedController.java | 11 +---------- .../nms/v1_13_R2/entity/EnderDragonController.java | 11 +---------- .../nms/v1_13_R2/entity/EndermanController.java | 11 +---------- .../nms/v1_13_R2/entity/EndermiteController.java | 11 +---------- .../nms/v1_13_R2/entity/EvokerController.java | 11 +---------- .../nms/v1_13_R2/entity/GhastController.java | 11 +---------- .../nms/v1_13_R2/entity/GiantController.java | 11 +---------- .../nms/v1_13_R2/entity/GuardianController.java | 11 +---------- .../v1_13_R2/entity/GuardianElderController.java | 11 +---------- .../nms/v1_13_R2/entity/HorseController.java | 11 +---------- .../nms/v1_13_R2/entity/HorseDonkeyController.java | 11 +---------- .../nms/v1_13_R2/entity/HorseMuleController.java | 11 +---------- .../v1_13_R2/entity/HorseSkeletonController.java | 11 +---------- .../nms/v1_13_R2/entity/HorseZombieController.java | 11 +---------- .../nms/v1_13_R2/entity/IllusionerController.java | 11 +---------- .../nms/v1_13_R2/entity/IronGolemController.java | 11 +---------- .../nms/v1_13_R2/entity/LlamaController.java | 11 +---------- .../nms/v1_13_R2/entity/MagmaCubeController.java | 11 +---------- .../nms/v1_13_R2/entity/MushroomCowController.java | 11 +---------- .../nms/v1_13_R2/entity/OcelotController.java | 11 +---------- .../nms/v1_13_R2/entity/ParrotController.java | 11 +---------- .../nms/v1_13_R2/entity/PhantomController.java | 11 +---------- .../nms/v1_13_R2/entity/PigController.java | 11 +---------- .../nms/v1_13_R2/entity/PigZombieController.java | 11 +---------- .../nms/v1_13_R2/entity/PolarBearController.java | 11 +---------- .../nms/v1_13_R2/entity/PufferFishController.java | 11 +---------- .../nms/v1_13_R2/entity/RabbitController.java | 11 +---------- .../nms/v1_13_R2/entity/SalmonController.java | 11 +---------- .../nms/v1_13_R2/entity/SheepController.java | 11 +---------- .../nms/v1_13_R2/entity/ShulkerController.java | 11 +---------- .../nms/v1_13_R2/entity/SilverfishController.java | 11 +---------- .../nms/v1_13_R2/entity/SkeletonController.java | 11 +---------- .../v1_13_R2/entity/SkeletonStrayController.java | 11 +---------- .../v1_13_R2/entity/SkeletonWitherController.java | 11 +---------- .../nms/v1_13_R2/entity/SlimeController.java | 11 +---------- .../nms/v1_13_R2/entity/SnowmanController.java | 11 +---------- .../nms/v1_13_R2/entity/SpiderController.java | 11 +---------- .../nms/v1_13_R2/entity/SquidController.java | 11 +---------- .../v1_13_R2/entity/TropicalFishController.java | 11 +---------- .../nms/v1_13_R2/entity/TurtleController.java | 11 +---------- .../nms/v1_13_R2/entity/VexController.java | 11 +---------- .../nms/v1_13_R2/entity/VillagerController.java | 11 +---------- .../nms/v1_13_R2/entity/VindicatorController.java | 11 +---------- .../nms/v1_13_R2/entity/WitchController.java | 11 +---------- .../nms/v1_13_R2/entity/WitherController.java | 11 +---------- .../nms/v1_13_R2/entity/WolfController.java | 11 +---------- .../nms/v1_13_R2/entity/ZombieController.java | 11 +---------- .../nms/v1_13_R2/entity/ZombieHuskController.java | 11 +---------- .../v1_13_R2/entity/ZombieVillagerController.java | 11 +---------- .../nonliving/AreaEffectCloudController.java | 12 ++---------- .../entity/nonliving/ArmorStandController.java | 12 ++---------- .../v1_13_R2/entity/nonliving/BoatController.java | 11 +---------- .../entity/nonliving/DragonFireballController.java | 11 +---------- .../v1_13_R2/entity/nonliving/EggController.java | 12 ++---------- .../entity/nonliving/EnderCrystalController.java | 12 ++---------- .../entity/nonliving/EnderPearlController.java | 12 ++---------- .../entity/nonliving/EnderSignalController.java | 12 ++---------- .../entity/nonliving/EvokerFangsController.java | 12 ++---------- .../entity/nonliving/ExperienceOrbController.java | 12 ++---------- .../entity/nonliving/FallingBlockController.java | 11 +---------- .../entity/nonliving/FireworkController.java | 12 ++---------- .../entity/nonliving/FishingHookController.java | 12 ++---------- .../v1_13_R2/entity/nonliving/ItemController.java | 12 ++---------- .../entity/nonliving/ItemFrameController.java | 12 ++---------- .../entity/nonliving/LargeFireballController.java | 11 +---------- .../v1_13_R2/entity/nonliving/LeashController.java | 12 ++---------- .../entity/nonliving/LlamaSpitController.java | 12 ++---------- .../entity/nonliving/MinecartChestController.java | 11 +---------- .../nonliving/MinecartCommandController.java | 11 +---------- .../nonliving/MinecartFurnaceController.java | 11 +---------- .../entity/nonliving/MinecartHopperController.java | 11 +---------- .../nonliving/MinecartRideableController.java | 11 +---------- .../nonliving/MinecartSpawnerController.java | 11 +---------- .../entity/nonliving/MinecartTNTController.java | 11 +---------- .../entity/nonliving/PaintingController.java | 12 ++---------- .../entity/nonliving/ShulkerBulletController.java | 12 ++---------- .../entity/nonliving/SmallFireballController.java | 12 ++---------- .../entity/nonliving/SnowballController.java | 12 ++---------- .../entity/nonliving/SpectralArrowController.java | 12 ++---------- .../entity/nonliving/TNTPrimedController.java | 12 ++---------- .../nonliving/ThrownExpBottleController.java | 12 ++---------- .../entity/nonliving/ThrownPotionController.java | 12 ++---------- .../entity/nonliving/ThrownTridentController.java | 12 ++---------- .../entity/nonliving/TippedArrowController.java | 12 ++---------- .../entity/nonliving/WitherSkullController.java | 12 ++---------- .../citizensnpcs/nms/v1_13_R2/util/NMSImpl.java | 14 ++++++++++++++ .../nms/v1_14_R1/entity/BatController.java | 8 +------- .../nms/v1_14_R1/entity/BlazeController.java | 8 +------- .../nms/v1_14_R1/entity/CatController.java | 7 +------ .../nms/v1_14_R1/entity/CaveSpiderController.java | 7 +------ .../nms/v1_14_R1/entity/ChickenController.java | 7 +------ .../nms/v1_14_R1/entity/CodController.java | 7 +------ .../nms/v1_14_R1/entity/CowController.java | 7 +------ .../nms/v1_14_R1/entity/CreeperController.java | 7 +------ .../nms/v1_14_R1/entity/DolphinController.java | 7 +------ .../nms/v1_14_R1/entity/DrownedController.java | 7 +------ .../nms/v1_14_R1/entity/EnderDragonController.java | 7 +------ .../nms/v1_14_R1/entity/EndermanController.java | 7 +------ .../nms/v1_14_R1/entity/EndermiteController.java | 7 +------ .../nms/v1_14_R1/entity/EvokerController.java | 7 +------ .../nms/v1_14_R1/entity/FoxController.java | 7 +------ .../nms/v1_14_R1/entity/GhastController.java | 8 +------- .../nms/v1_14_R1/entity/GiantController.java | 7 +------ .../nms/v1_14_R1/entity/GuardianController.java | 7 +------ .../v1_14_R1/entity/GuardianElderController.java | 7 +------ .../nms/v1_14_R1/entity/HorseController.java | 7 +------ .../nms/v1_14_R1/entity/HorseDonkeyController.java | 7 +------ .../nms/v1_14_R1/entity/HorseMuleController.java | 7 +------ .../v1_14_R1/entity/HorseSkeletonController.java | 7 +------ .../nms/v1_14_R1/entity/HorseZombieController.java | 7 +------ .../nms/v1_14_R1/entity/IllusionerController.java | 7 +------ .../nms/v1_14_R1/entity/IronGolemController.java | 7 +------ .../nms/v1_14_R1/entity/LlamaController.java | 7 +------ .../nms/v1_14_R1/entity/MagmaCubeController.java | 7 +------ .../nms/v1_14_R1/entity/MushroomCowController.java | 7 +------ .../nms/v1_14_R1/entity/OcelotController.java | 7 +------ .../nms/v1_14_R1/entity/PandaController.java | 7 +------ .../nms/v1_14_R1/entity/ParrotController.java | 8 +------- .../nms/v1_14_R1/entity/PhantomController.java | 7 +------ .../nms/v1_14_R1/entity/PigController.java | 7 +------ .../nms/v1_14_R1/entity/PigZombieController.java | 7 +------ .../nms/v1_14_R1/entity/PillagerController.java | 7 +------ .../nms/v1_14_R1/entity/PolarBearController.java | 8 +------- .../nms/v1_14_R1/entity/PufferFishController.java | 7 +------ .../nms/v1_14_R1/entity/RabbitController.java | 7 +------ .../nms/v1_14_R1/entity/RavagerController.java | 7 +------ .../nms/v1_14_R1/entity/SalmonController.java | 7 +------ .../nms/v1_14_R1/entity/SheepController.java | 7 +------ .../nms/v1_14_R1/entity/ShulkerController.java | 7 +------ .../nms/v1_14_R1/entity/SilverfishController.java | 7 +------ .../nms/v1_14_R1/entity/SkeletonController.java | 7 +------ .../v1_14_R1/entity/SkeletonStrayController.java | 7 +------ .../v1_14_R1/entity/SkeletonWitherController.java | 7 +------ .../nms/v1_14_R1/entity/SlimeController.java | 7 +------ .../nms/v1_14_R1/entity/SnowmanController.java | 7 +------ .../nms/v1_14_R1/entity/SpiderController.java | 7 +------ .../nms/v1_14_R1/entity/SquidController.java | 7 +------ .../nms/v1_14_R1/entity/TraderLlamaController.java | 7 +------ .../v1_14_R1/entity/TropicalFishController.java | 7 +------ .../nms/v1_14_R1/entity/TurtleController.java | 7 +------ .../nms/v1_14_R1/entity/VexController.java | 8 +------- .../nms/v1_14_R1/entity/VillagerController.java | 7 +------ .../nms/v1_14_R1/entity/VindicatorController.java | 7 +------ .../v1_14_R1/entity/WanderingTraderController.java | 7 +------ .../nms/v1_14_R1/entity/WitchController.java | 7 +------ .../nms/v1_14_R1/entity/WitherController.java | 8 +------- .../nms/v1_14_R1/entity/WolfController.java | 7 +------ .../nms/v1_14_R1/entity/ZombieController.java | 7 +------ .../nms/v1_14_R1/entity/ZombieHuskController.java | 7 +------ .../v1_14_R1/entity/ZombieVillagerController.java | 7 +------ .../nonliving/AreaEffectCloudController.java | 8 +------- .../entity/nonliving/ArmorStandController.java | 7 +------ .../v1_14_R1/entity/nonliving/BoatController.java | 8 +------- .../entity/nonliving/DragonFireballController.java | 8 +------- .../v1_14_R1/entity/nonliving/EggController.java | 8 +------- .../entity/nonliving/EnderCrystalController.java | 8 +------- .../entity/nonliving/EnderPearlController.java | 8 +------- .../entity/nonliving/EnderSignalController.java | 8 +------- .../entity/nonliving/EvokerFangsController.java | 7 +------ .../entity/nonliving/ExperienceOrbController.java | 8 +------- .../entity/nonliving/FallingBlockController.java | 7 +------ .../entity/nonliving/FireworkController.java | 8 +------- .../entity/nonliving/FishingHookController.java | 8 +------- .../v1_14_R1/entity/nonliving/ItemController.java | 8 +------- .../entity/nonliving/ItemFrameController.java | 8 +------- .../entity/nonliving/LargeFireballController.java | 8 +------- .../v1_14_R1/entity/nonliving/LeashController.java | 8 +------- .../entity/nonliving/LlamaSpitController.java | 8 +------- .../entity/nonliving/MinecartChestController.java | 8 +------- .../nonliving/MinecartCommandController.java | 8 +------- .../nonliving/MinecartFurnaceController.java | 8 +------- .../entity/nonliving/MinecartHopperController.java | 8 +------- .../nonliving/MinecartRideableController.java | 8 +------- .../nonliving/MinecartSpawnerController.java | 8 +------- .../entity/nonliving/MinecartTNTController.java | 8 +------- .../entity/nonliving/PaintingController.java | 8 +------- .../entity/nonliving/ShulkerBulletController.java | 8 +------- .../entity/nonliving/SmallFireballController.java | 8 +------- .../entity/nonliving/SnowballController.java | 8 +------- .../entity/nonliving/SpectralArrowController.java | 8 +------- .../entity/nonliving/TNTPrimedController.java | 8 +------- .../nonliving/ThrownExpBottleController.java | 8 +------- .../entity/nonliving/ThrownPotionController.java | 8 +------- .../entity/nonliving/ThrownTridentController.java | 8 +------- .../entity/nonliving/TippedArrowController.java | 8 +------- .../entity/nonliving/WitherSkullController.java | 8 +------- .../citizensnpcs/nms/v1_14_R1/util/NMSImpl.java | 10 ++++++++++ .../nms/v1_15_R1/entity/BatController.java | 8 +------- .../nms/v1_15_R1/entity/BeeController.java | 8 +------- .../nms/v1_15_R1/entity/BlazeController.java | 8 +------- .../nms/v1_15_R1/entity/CatController.java | 7 +------ .../nms/v1_15_R1/entity/CaveSpiderController.java | 7 +------ .../nms/v1_15_R1/entity/ChickenController.java | 7 +------ .../nms/v1_15_R1/entity/CodController.java | 7 +------ .../nms/v1_15_R1/entity/CowController.java | 7 +------ .../nms/v1_15_R1/entity/CreeperController.java | 7 +------ .../nms/v1_15_R1/entity/DolphinController.java | 7 +------ .../nms/v1_15_R1/entity/DrownedController.java | 7 +------ .../nms/v1_15_R1/entity/EnderDragonController.java | 7 +------ .../nms/v1_15_R1/entity/EndermanController.java | 7 +------ .../nms/v1_15_R1/entity/EndermiteController.java | 7 +------ .../nms/v1_15_R1/entity/EvokerController.java | 7 +------ .../nms/v1_15_R1/entity/FoxController.java | 7 +------ .../nms/v1_15_R1/entity/GhastController.java | 8 +------- .../nms/v1_15_R1/entity/GiantController.java | 7 +------ .../nms/v1_15_R1/entity/GuardianController.java | 7 +------ .../v1_15_R1/entity/GuardianElderController.java | 7 +------ .../nms/v1_15_R1/entity/HorseController.java | 7 +------ .../nms/v1_15_R1/entity/HorseDonkeyController.java | 7 +------ .../nms/v1_15_R1/entity/HorseMuleController.java | 7 +------ .../v1_15_R1/entity/HorseSkeletonController.java | 7 +------ .../nms/v1_15_R1/entity/HorseZombieController.java | 7 +------ .../nms/v1_15_R1/entity/IllusionerController.java | 7 +------ .../nms/v1_15_R1/entity/IronGolemController.java | 7 +------ .../nms/v1_15_R1/entity/LlamaController.java | 7 +------ .../nms/v1_15_R1/entity/MagmaCubeController.java | 7 +------ .../nms/v1_15_R1/entity/MushroomCowController.java | 7 +------ .../nms/v1_15_R1/entity/OcelotController.java | 7 +------ .../nms/v1_15_R1/entity/PandaController.java | 7 +------ .../nms/v1_15_R1/entity/ParrotController.java | 8 +------- .../nms/v1_15_R1/entity/PhantomController.java | 7 +------ .../nms/v1_15_R1/entity/PigController.java | 7 +------ .../nms/v1_15_R1/entity/PigZombieController.java | 7 +------ .../nms/v1_15_R1/entity/PillagerController.java | 7 +------ .../nms/v1_15_R1/entity/PolarBearController.java | 8 +------- .../nms/v1_15_R1/entity/PufferFishController.java | 7 +------ .../nms/v1_15_R1/entity/RabbitController.java | 7 +------ .../nms/v1_15_R1/entity/RavagerController.java | 7 +------ .../nms/v1_15_R1/entity/SalmonController.java | 7 +------ .../nms/v1_15_R1/entity/SheepController.java | 7 +------ .../nms/v1_15_R1/entity/ShulkerController.java | 7 +------ .../nms/v1_15_R1/entity/SilverfishController.java | 7 +------ .../nms/v1_15_R1/entity/SkeletonController.java | 7 +------ .../v1_15_R1/entity/SkeletonStrayController.java | 7 +------ .../v1_15_R1/entity/SkeletonWitherController.java | 7 +------ .../nms/v1_15_R1/entity/SlimeController.java | 7 +------ .../nms/v1_15_R1/entity/SnowmanController.java | 7 +------ .../nms/v1_15_R1/entity/SpiderController.java | 7 +------ .../nms/v1_15_R1/entity/SquidController.java | 7 +------ .../nms/v1_15_R1/entity/TraderLlamaController.java | 7 +------ .../v1_15_R1/entity/TropicalFishController.java | 7 +------ .../nms/v1_15_R1/entity/TurtleController.java | 7 +------ .../nms/v1_15_R1/entity/VexController.java | 8 +------- .../nms/v1_15_R1/entity/VillagerController.java | 7 +------ .../nms/v1_15_R1/entity/VindicatorController.java | 7 +------ .../v1_15_R1/entity/WanderingTraderController.java | 7 +------ .../nms/v1_15_R1/entity/WitchController.java | 7 +------ .../nms/v1_15_R1/entity/WitherController.java | 8 +------- .../nms/v1_15_R1/entity/WolfController.java | 7 +------ .../nms/v1_15_R1/entity/ZombieController.java | 7 +------ .../nms/v1_15_R1/entity/ZombieHuskController.java | 7 +------ .../v1_15_R1/entity/ZombieVillagerController.java | 7 +------ .../nonliving/AreaEffectCloudController.java | 8 +------- .../entity/nonliving/ArmorStandController.java | 7 +------ .../v1_15_R1/entity/nonliving/BoatController.java | 7 +------ .../entity/nonliving/DragonFireballController.java | 8 +------- .../v1_15_R1/entity/nonliving/EggController.java | 8 +------- .../entity/nonliving/EnderCrystalController.java | 8 +------- .../entity/nonliving/EnderPearlController.java | 8 +------- .../entity/nonliving/EnderSignalController.java | 8 +------- .../entity/nonliving/EvokerFangsController.java | 7 +------ .../entity/nonliving/ExperienceOrbController.java | 8 +------- .../entity/nonliving/FallingBlockController.java | 7 +------ .../entity/nonliving/FireworkController.java | 8 +------- .../entity/nonliving/FishingHookController.java | 8 +------- .../v1_15_R1/entity/nonliving/ItemController.java | 8 +------- .../entity/nonliving/ItemFrameController.java | 8 +------- .../entity/nonliving/LargeFireballController.java | 8 +------- .../v1_15_R1/entity/nonliving/LeashController.java | 8 +------- .../entity/nonliving/LlamaSpitController.java | 8 +------- .../entity/nonliving/MinecartChestController.java | 8 +------- .../nonliving/MinecartCommandController.java | 8 +------- .../nonliving/MinecartFurnaceController.java | 8 +------- .../entity/nonliving/MinecartHopperController.java | 8 +------- .../nonliving/MinecartRideableController.java | 8 +------- .../nonliving/MinecartSpawnerController.java | 8 +------- .../entity/nonliving/MinecartTNTController.java | 8 +------- .../entity/nonliving/PaintingController.java | 8 +------- .../entity/nonliving/ShulkerBulletController.java | 8 +------- .../entity/nonliving/SmallFireballController.java | 8 +------- .../entity/nonliving/SnowballController.java | 8 +------- .../entity/nonliving/SpectralArrowController.java | 8 +------- .../entity/nonliving/TNTPrimedController.java | 8 +------- .../nonliving/ThrownExpBottleController.java | 8 +------- .../entity/nonliving/ThrownPotionController.java | 8 +------- .../entity/nonliving/ThrownTridentController.java | 8 +------- .../entity/nonliving/TippedArrowController.java | 8 +------- .../entity/nonliving/WitherSkullController.java | 8 +------- .../citizensnpcs/nms/v1_15_R1/util/NMSImpl.java | 10 ++++++++++ .../nms/v1_16_R3/entity/BatController.java | 8 +------- .../nms/v1_16_R3/entity/BeeController.java | 8 +------- .../nms/v1_16_R3/entity/BlazeController.java | 8 +------- .../nms/v1_16_R3/entity/CatController.java | 7 +------ .../nms/v1_16_R3/entity/CaveSpiderController.java | 7 +------ .../nms/v1_16_R3/entity/ChickenController.java | 7 +------ .../nms/v1_16_R3/entity/CodController.java | 7 +------ .../nms/v1_16_R3/entity/CowController.java | 7 +------ .../nms/v1_16_R3/entity/CreeperController.java | 7 +------ .../nms/v1_16_R3/entity/DolphinController.java | 7 +------ .../nms/v1_16_R3/entity/DrownedController.java | 7 +------ .../nms/v1_16_R3/entity/EnderDragonController.java | 7 +------ .../nms/v1_16_R3/entity/EndermanController.java | 7 +------ .../nms/v1_16_R3/entity/EndermiteController.java | 7 +------ .../nms/v1_16_R3/entity/EvokerController.java | 7 +------ .../nms/v1_16_R3/entity/FoxController.java | 7 +------ .../nms/v1_16_R3/entity/GhastController.java | 8 +------- .../nms/v1_16_R3/entity/GiantController.java | 7 +------ .../nms/v1_16_R3/entity/GuardianController.java | 7 +------ .../v1_16_R3/entity/GuardianElderController.java | 7 +------ .../nms/v1_16_R3/entity/HoglinController.java | 7 +------ .../nms/v1_16_R3/entity/HorseController.java | 7 +------ .../nms/v1_16_R3/entity/HorseDonkeyController.java | 7 +------ .../nms/v1_16_R3/entity/HorseMuleController.java | 7 +------ .../v1_16_R3/entity/HorseSkeletonController.java | 7 +------ .../nms/v1_16_R3/entity/HorseZombieController.java | 7 +------ .../nms/v1_16_R3/entity/IllusionerController.java | 7 +------ .../nms/v1_16_R3/entity/IronGolemController.java | 7 +------ .../nms/v1_16_R3/entity/LlamaController.java | 7 +------ .../nms/v1_16_R3/entity/MagmaCubeController.java | 7 +------ .../nms/v1_16_R3/entity/MushroomCowController.java | 7 +------ .../nms/v1_16_R3/entity/OcelotController.java | 7 +------ .../nms/v1_16_R3/entity/PandaController.java | 7 +------ .../nms/v1_16_R3/entity/ParrotController.java | 8 +------- .../nms/v1_16_R3/entity/PhantomController.java | 7 +------ .../nms/v1_16_R3/entity/PigController.java | 7 +------ .../nms/v1_16_R3/entity/PigZombieController.java | 7 +------ .../nms/v1_16_R3/entity/PiglinBruteController.java | 7 +------ .../nms/v1_16_R3/entity/PiglinController.java | 7 +------ .../nms/v1_16_R3/entity/PillagerController.java | 7 +------ .../nms/v1_16_R3/entity/PolarBearController.java | 8 +------- .../nms/v1_16_R3/entity/PufferFishController.java | 7 +------ .../nms/v1_16_R3/entity/RabbitController.java | 7 +------ .../nms/v1_16_R3/entity/RavagerController.java | 7 +------ .../nms/v1_16_R3/entity/SalmonController.java | 7 +------ .../nms/v1_16_R3/entity/SheepController.java | 7 +------ .../nms/v1_16_R3/entity/ShulkerController.java | 7 +------ .../nms/v1_16_R3/entity/SilverfishController.java | 7 +------ .../nms/v1_16_R3/entity/SkeletonController.java | 7 +------ .../v1_16_R3/entity/SkeletonStrayController.java | 7 +------ .../v1_16_R3/entity/SkeletonWitherController.java | 7 +------ .../nms/v1_16_R3/entity/SlimeController.java | 7 +------ .../nms/v1_16_R3/entity/SnowmanController.java | 7 +------ .../nms/v1_16_R3/entity/SpiderController.java | 7 +------ .../nms/v1_16_R3/entity/SquidController.java | 7 +------ .../nms/v1_16_R3/entity/StriderController.java | 7 +------ .../nms/v1_16_R3/entity/TraderLlamaController.java | 7 +------ .../v1_16_R3/entity/TropicalFishController.java | 7 +------ .../nms/v1_16_R3/entity/TurtleController.java | 7 +------ .../nms/v1_16_R3/entity/VexController.java | 8 +------- .../nms/v1_16_R3/entity/VillagerController.java | 7 +------ .../nms/v1_16_R3/entity/VindicatorController.java | 7 +------ .../v1_16_R3/entity/WanderingTraderController.java | 7 +------ .../nms/v1_16_R3/entity/WitchController.java | 7 +------ .../nms/v1_16_R3/entity/WitherController.java | 8 +------- .../nms/v1_16_R3/entity/WolfController.java | 7 +------ .../nms/v1_16_R3/entity/ZoglinController.java | 7 +------ .../nms/v1_16_R3/entity/ZombieController.java | 7 +------ .../nms/v1_16_R3/entity/ZombieHuskController.java | 7 +------ .../v1_16_R3/entity/ZombieVillagerController.java | 7 +------ .../nonliving/AreaEffectCloudController.java | 8 +------- .../entity/nonliving/ArmorStandController.java | 7 +------ .../v1_16_R3/entity/nonliving/BoatController.java | 7 +------ .../entity/nonliving/DragonFireballController.java | 8 +------- .../v1_16_R3/entity/nonliving/EggController.java | 8 +------- .../entity/nonliving/EnderCrystalController.java | 8 +------- .../entity/nonliving/EnderPearlController.java | 8 +------- .../entity/nonliving/EnderSignalController.java | 8 +------- .../entity/nonliving/EvokerFangsController.java | 7 +------ .../entity/nonliving/ExperienceOrbController.java | 8 +------- .../entity/nonliving/FallingBlockController.java | 7 +------ .../entity/nonliving/FireworkController.java | 8 +------- .../entity/nonliving/FishingHookController.java | 8 +------- .../v1_16_R3/entity/nonliving/ItemController.java | 8 +------- .../entity/nonliving/ItemFrameController.java | 8 +------- .../entity/nonliving/LargeFireballController.java | 8 +------- .../v1_16_R3/entity/nonliving/LeashController.java | 8 +------- .../entity/nonliving/LlamaSpitController.java | 8 +------- .../entity/nonliving/MinecartChestController.java | 8 +------- .../nonliving/MinecartCommandController.java | 8 +------- .../nonliving/MinecartFurnaceController.java | 8 +------- .../entity/nonliving/MinecartHopperController.java | 8 +------- .../nonliving/MinecartRideableController.java | 8 +------- .../nonliving/MinecartSpawnerController.java | 8 +------- .../entity/nonliving/MinecartTNTController.java | 8 +------- .../entity/nonliving/PaintingController.java | 8 +------- .../entity/nonliving/ShulkerBulletController.java | 8 +------- .../entity/nonliving/SmallFireballController.java | 8 +------- .../entity/nonliving/SnowballController.java | 8 +------- .../entity/nonliving/SpectralArrowController.java | 8 +------- .../entity/nonliving/TNTPrimedController.java | 8 +------- .../nonliving/ThrownExpBottleController.java | 8 +------- .../entity/nonliving/ThrownPotionController.java | 8 +------- .../entity/nonliving/ThrownTridentController.java | 8 +------- .../entity/nonliving/TippedArrowController.java | 8 +------- .../entity/nonliving/WitherSkullController.java | 8 +------- .../citizensnpcs/nms/v1_16_R3/util/NMSImpl.java | 11 +++++++++++ .../nms/v1_17_R1/entity/AxolotlController.java | 7 +------ .../nms/v1_17_R1/entity/BatController.java | 7 +------ .../nms/v1_17_R1/entity/BeeController.java | 7 +------ .../nms/v1_17_R1/entity/BlazeController.java | 7 +------ .../nms/v1_17_R1/entity/CatController.java | 7 +------ .../nms/v1_17_R1/entity/CaveSpiderController.java | 7 +------ .../nms/v1_17_R1/entity/ChickenController.java | 7 +------ .../nms/v1_17_R1/entity/CodController.java | 7 +------ .../nms/v1_17_R1/entity/CowController.java | 7 +------ .../nms/v1_17_R1/entity/CreeperController.java | 7 +------ .../nms/v1_17_R1/entity/DolphinController.java | 7 +------ .../nms/v1_17_R1/entity/DrownedController.java | 7 +------ .../nms/v1_17_R1/entity/EnderDragonController.java | 7 +------ .../nms/v1_17_R1/entity/EndermanController.java | 7 +------ .../nms/v1_17_R1/entity/EndermiteController.java | 7 +------ .../nms/v1_17_R1/entity/EvokerController.java | 7 +------ .../nms/v1_17_R1/entity/FoxController.java | 7 +------ .../nms/v1_17_R1/entity/GhastController.java | 7 +------ .../nms/v1_17_R1/entity/GiantController.java | 7 +------ .../nms/v1_17_R1/entity/GlowSquidController.java | 7 +------ .../nms/v1_17_R1/entity/GoatController.java | 7 +------ .../nms/v1_17_R1/entity/GuardianController.java | 7 +------ .../v1_17_R1/entity/GuardianElderController.java | 7 +------ .../nms/v1_17_R1/entity/HoglinController.java | 7 +------ .../nms/v1_17_R1/entity/HorseController.java | 7 +------ .../nms/v1_17_R1/entity/HorseDonkeyController.java | 7 +------ .../nms/v1_17_R1/entity/HorseMuleController.java | 7 +------ .../v1_17_R1/entity/HorseSkeletonController.java | 7 +------ .../nms/v1_17_R1/entity/HorseZombieController.java | 7 +------ .../nms/v1_17_R1/entity/IllusionerController.java | 7 +------ .../nms/v1_17_R1/entity/IronGolemController.java | 7 +------ .../nms/v1_17_R1/entity/LlamaController.java | 7 +------ .../nms/v1_17_R1/entity/MagmaCubeController.java | 7 +------ .../nms/v1_17_R1/entity/MushroomCowController.java | 7 +------ .../nms/v1_17_R1/entity/OcelotController.java | 7 +------ .../nms/v1_17_R1/entity/PandaController.java | 7 +------ .../nms/v1_17_R1/entity/ParrotController.java | 7 +------ .../nms/v1_17_R1/entity/PhantomController.java | 7 +------ .../nms/v1_17_R1/entity/PigController.java | 7 +------ .../nms/v1_17_R1/entity/PigZombieController.java | 7 +------ .../nms/v1_17_R1/entity/PiglinBruteController.java | 7 +------ .../nms/v1_17_R1/entity/PiglinController.java | 7 +------ .../nms/v1_17_R1/entity/PillagerController.java | 7 +------ .../nms/v1_17_R1/entity/PolarBearController.java | 7 +------ .../nms/v1_17_R1/entity/PufferFishController.java | 7 +------ .../nms/v1_17_R1/entity/RabbitController.java | 7 +------ .../nms/v1_17_R1/entity/RavagerController.java | 7 +------ .../nms/v1_17_R1/entity/SalmonController.java | 7 +------ .../nms/v1_17_R1/entity/SheepController.java | 7 +------ .../nms/v1_17_R1/entity/ShulkerController.java | 7 +------ .../nms/v1_17_R1/entity/SilverfishController.java | 7 +------ .../nms/v1_17_R1/entity/SkeletonController.java | 7 +------ .../v1_17_R1/entity/SkeletonStrayController.java | 7 +------ .../v1_17_R1/entity/SkeletonWitherController.java | 7 +------ .../nms/v1_17_R1/entity/SlimeController.java | 7 +------ .../nms/v1_17_R1/entity/SnowmanController.java | 7 +------ .../nms/v1_17_R1/entity/SpiderController.java | 7 +------ .../nms/v1_17_R1/entity/SquidController.java | 7 +------ .../nms/v1_17_R1/entity/StriderController.java | 7 +------ .../nms/v1_17_R1/entity/TraderLlamaController.java | 7 +------ .../v1_17_R1/entity/TropicalFishController.java | 7 +------ .../nms/v1_17_R1/entity/TurtleController.java | 7 +------ .../nms/v1_17_R1/entity/VexController.java | 7 +------ .../nms/v1_17_R1/entity/VillagerController.java | 7 +------ .../nms/v1_17_R1/entity/VindicatorController.java | 7 +------ .../v1_17_R1/entity/WanderingTraderController.java | 7 +------ .../nms/v1_17_R1/entity/WitchController.java | 7 +------ .../nms/v1_17_R1/entity/WitherController.java | 7 +------ .../nms/v1_17_R1/entity/WolfController.java | 7 +------ .../nms/v1_17_R1/entity/ZoglinController.java | 7 +------ .../nms/v1_17_R1/entity/ZombieController.java | 7 +------ .../nms/v1_17_R1/entity/ZombieHuskController.java | 7 +------ .../v1_17_R1/entity/ZombieVillagerController.java | 7 +------ .../nonliving/AreaEffectCloudController.java | 7 +------ .../entity/nonliving/ArmorStandController.java | 7 +------ .../v1_17_R1/entity/nonliving/BoatController.java | 7 +------ .../entity/nonliving/DragonFireballController.java | 7 +------ .../v1_17_R1/entity/nonliving/EggController.java | 7 +------ .../entity/nonliving/EnderCrystalController.java | 7 +------ .../entity/nonliving/EnderPearlController.java | 7 +------ .../entity/nonliving/EnderSignalController.java | 7 +------ .../entity/nonliving/EvokerFangsController.java | 7 +------ .../entity/nonliving/ExperienceOrbController.java | 7 +------ .../entity/nonliving/FallingBlockController.java | 7 +------ .../entity/nonliving/FireworkController.java | 7 +------ .../entity/nonliving/FishingHookController.java | 7 +------ .../entity/nonliving/GlowItemFrameController.java | 7 +------ .../v1_17_R1/entity/nonliving/ItemController.java | 7 +------ .../entity/nonliving/ItemFrameController.java | 7 +------ .../entity/nonliving/LargeFireballController.java | 7 +------ .../v1_17_R1/entity/nonliving/LeashController.java | 7 +------ .../entity/nonliving/LlamaSpitController.java | 7 +------ .../entity/nonliving/MarkerController.java | 7 +------ .../entity/nonliving/MinecartChestController.java | 7 +------ .../nonliving/MinecartCommandController.java | 7 +------ .../nonliving/MinecartFurnaceController.java | 7 +------ .../entity/nonliving/MinecartHopperController.java | 7 +------ .../nonliving/MinecartRideableController.java | 7 +------ .../nonliving/MinecartSpawnerController.java | 7 +------ .../entity/nonliving/MinecartTNTController.java | 7 +------ .../entity/nonliving/PaintingController.java | 7 +------ .../entity/nonliving/ShulkerBulletController.java | 7 +------ .../entity/nonliving/SmallFireballController.java | 7 +------ .../entity/nonliving/SnowballController.java | 7 +------ .../entity/nonliving/SpectralArrowController.java | 7 +------ .../entity/nonliving/TNTPrimedController.java | 7 +------ .../nonliving/ThrownExpBottleController.java | 7 +------ .../entity/nonliving/ThrownPotionController.java | 7 +------ .../entity/nonliving/ThrownTridentController.java | 7 +------ .../entity/nonliving/TippedArrowController.java | 7 +------ .../entity/nonliving/WitherSkullController.java | 7 +------ .../citizensnpcs/nms/v1_17_R1/util/NMSImpl.java | 11 ++++++++++- .../nms/v1_18_R2/entity/AxolotlController.java | 7 +------ .../nms/v1_18_R2/entity/BatController.java | 7 +------ .../nms/v1_18_R2/entity/BeeController.java | 7 +------ .../nms/v1_18_R2/entity/BlazeController.java | 7 +------ .../nms/v1_18_R2/entity/CatController.java | 7 +------ .../nms/v1_18_R2/entity/CaveSpiderController.java | 7 +------ .../nms/v1_18_R2/entity/ChickenController.java | 7 +------ .../nms/v1_18_R2/entity/CodController.java | 7 +------ .../nms/v1_18_R2/entity/CowController.java | 7 +------ .../nms/v1_18_R2/entity/CreeperController.java | 7 +------ .../nms/v1_18_R2/entity/DolphinController.java | 7 +------ .../nms/v1_18_R2/entity/DrownedController.java | 7 +------ .../nms/v1_18_R2/entity/EnderDragonController.java | 7 +------ .../nms/v1_18_R2/entity/EndermanController.java | 7 +------ .../nms/v1_18_R2/entity/EndermiteController.java | 7 +------ .../nms/v1_18_R2/entity/EvokerController.java | 7 +------ .../nms/v1_18_R2/entity/FoxController.java | 7 +------ .../nms/v1_18_R2/entity/GhastController.java | 7 +------ .../nms/v1_18_R2/entity/GiantController.java | 7 +------ .../nms/v1_18_R2/entity/GlowSquidController.java | 7 +------ .../nms/v1_18_R2/entity/GoatController.java | 7 +------ .../nms/v1_18_R2/entity/GuardianController.java | 7 +------ .../v1_18_R2/entity/GuardianElderController.java | 7 +------ .../nms/v1_18_R2/entity/HoglinController.java | 7 +------ .../nms/v1_18_R2/entity/HorseController.java | 7 +------ .../nms/v1_18_R2/entity/HorseDonkeyController.java | 7 +------ .../nms/v1_18_R2/entity/HorseMuleController.java | 7 +------ .../v1_18_R2/entity/HorseSkeletonController.java | 7 +------ .../nms/v1_18_R2/entity/HorseZombieController.java | 7 +------ .../nms/v1_18_R2/entity/IllusionerController.java | 7 +------ .../nms/v1_18_R2/entity/IronGolemController.java | 7 +------ .../nms/v1_18_R2/entity/LlamaController.java | 7 +------ .../nms/v1_18_R2/entity/MagmaCubeController.java | 7 +------ .../nms/v1_18_R2/entity/MushroomCowController.java | 7 +------ .../nms/v1_18_R2/entity/OcelotController.java | 7 +------ .../nms/v1_18_R2/entity/PandaController.java | 7 +------ .../nms/v1_18_R2/entity/ParrotController.java | 7 +------ .../nms/v1_18_R2/entity/PhantomController.java | 7 +------ .../nms/v1_18_R2/entity/PigController.java | 7 +------ .../nms/v1_18_R2/entity/PigZombieController.java | 7 +------ .../nms/v1_18_R2/entity/PiglinBruteController.java | 7 +------ .../nms/v1_18_R2/entity/PiglinController.java | 7 +------ .../nms/v1_18_R2/entity/PillagerController.java | 7 +------ .../nms/v1_18_R2/entity/PolarBearController.java | 7 +------ .../nms/v1_18_R2/entity/PufferFishController.java | 7 +------ .../nms/v1_18_R2/entity/RabbitController.java | 7 +------ .../nms/v1_18_R2/entity/RavagerController.java | 7 +------ .../nms/v1_18_R2/entity/SalmonController.java | 7 +------ .../nms/v1_18_R2/entity/SheepController.java | 7 +------ .../nms/v1_18_R2/entity/ShulkerController.java | 7 +------ .../nms/v1_18_R2/entity/SilverfishController.java | 7 +------ .../nms/v1_18_R2/entity/SkeletonController.java | 7 +------ .../v1_18_R2/entity/SkeletonStrayController.java | 7 +------ .../v1_18_R2/entity/SkeletonWitherController.java | 7 +------ .../nms/v1_18_R2/entity/SlimeController.java | 7 +------ .../nms/v1_18_R2/entity/SnowmanController.java | 7 +------ .../nms/v1_18_R2/entity/SpiderController.java | 7 +------ .../nms/v1_18_R2/entity/SquidController.java | 7 +------ .../nms/v1_18_R2/entity/StriderController.java | 7 +------ .../nms/v1_18_R2/entity/TraderLlamaController.java | 7 +------ .../v1_18_R2/entity/TropicalFishController.java | 7 +------ .../nms/v1_18_R2/entity/TurtleController.java | 7 +------ .../nms/v1_18_R2/entity/VexController.java | 7 +------ .../nms/v1_18_R2/entity/VillagerController.java | 7 +------ .../nms/v1_18_R2/entity/VindicatorController.java | 7 +------ .../v1_18_R2/entity/WanderingTraderController.java | 7 +------ .../nms/v1_18_R2/entity/WitchController.java | 7 +------ .../nms/v1_18_R2/entity/WitherController.java | 7 +------ .../nms/v1_18_R2/entity/WolfController.java | 7 +------ .../nms/v1_18_R2/entity/ZoglinController.java | 7 +------ .../nms/v1_18_R2/entity/ZombieController.java | 7 +------ .../nms/v1_18_R2/entity/ZombieHuskController.java | 7 +------ .../v1_18_R2/entity/ZombieVillagerController.java | 7 +------ .../nonliving/AreaEffectCloudController.java | 7 +------ .../entity/nonliving/ArmorStandController.java | 7 +------ .../v1_18_R2/entity/nonliving/BoatController.java | 7 +------ .../entity/nonliving/DragonFireballController.java | 7 +------ .../v1_18_R2/entity/nonliving/EggController.java | 7 +------ .../entity/nonliving/EnderCrystalController.java | 7 +------ .../entity/nonliving/EnderPearlController.java | 7 +------ .../entity/nonliving/EnderSignalController.java | 7 +------ .../entity/nonliving/EvokerFangsController.java | 7 +------ .../entity/nonliving/ExperienceOrbController.java | 7 +------ .../entity/nonliving/FallingBlockController.java | 7 +------ .../entity/nonliving/FireworkController.java | 7 +------ .../entity/nonliving/FishingHookController.java | 7 +------ .../entity/nonliving/GlowItemFrameController.java | 7 +------ .../v1_18_R2/entity/nonliving/ItemController.java | 7 +------ .../entity/nonliving/ItemFrameController.java | 7 +------ .../entity/nonliving/LargeFireballController.java | 7 +------ .../v1_18_R2/entity/nonliving/LeashController.java | 7 +------ .../entity/nonliving/LlamaSpitController.java | 7 +------ .../entity/nonliving/MarkerController.java | 7 +------ .../entity/nonliving/MinecartChestController.java | 7 +------ .../nonliving/MinecartCommandController.java | 7 +------ .../nonliving/MinecartFurnaceController.java | 7 +------ .../entity/nonliving/MinecartHopperController.java | 7 +------ .../nonliving/MinecartRideableController.java | 7 +------ .../nonliving/MinecartSpawnerController.java | 7 +------ .../entity/nonliving/MinecartTNTController.java | 7 +------ .../entity/nonliving/PaintingController.java | 7 +------ .../entity/nonliving/ShulkerBulletController.java | 7 +------ .../entity/nonliving/SmallFireballController.java | 7 +------ .../entity/nonliving/SnowballController.java | 7 +------ .../entity/nonliving/SpectralArrowController.java | 7 +------ .../entity/nonliving/TNTPrimedController.java | 7 +------ .../nonliving/ThrownExpBottleController.java | 7 +------ .../entity/nonliving/ThrownPotionController.java | 7 +------ .../entity/nonliving/ThrownTridentController.java | 7 +------ .../entity/nonliving/TippedArrowController.java | 7 +------ .../entity/nonliving/WitherSkullController.java | 7 +------ .../citizensnpcs/nms/v1_18_R2/util/NMSImpl.java | 10 ++++++++++ .../nms/v1_18_R2/util/PlayerNavigation.java | 2 +- .../nms/v1_19_R2/entity/AllayController.java | 7 +------ .../nms/v1_19_R2/entity/AxolotlController.java | 7 +------ .../nms/v1_19_R2/entity/BatController.java | 7 +------ .../nms/v1_19_R2/entity/BeeController.java | 7 +------ .../nms/v1_19_R2/entity/BlazeController.java | 7 +------ .../nms/v1_19_R2/entity/CamelController.java | 7 +------ .../nms/v1_19_R2/entity/CatController.java | 7 +------ .../nms/v1_19_R2/entity/CaveSpiderController.java | 7 +------ .../nms/v1_19_R2/entity/ChickenController.java | 7 +------ .../nms/v1_19_R2/entity/CodController.java | 7 +------ .../nms/v1_19_R2/entity/CowController.java | 7 +------ .../nms/v1_19_R2/entity/CreeperController.java | 7 +------ .../nms/v1_19_R2/entity/DolphinController.java | 7 +------ .../nms/v1_19_R2/entity/DrownedController.java | 7 +------ .../nms/v1_19_R2/entity/EnderDragonController.java | 7 +------ .../nms/v1_19_R2/entity/EndermanController.java | 7 +------ .../nms/v1_19_R2/entity/EndermiteController.java | 7 +------ .../nms/v1_19_R2/entity/EvokerController.java | 7 +------ .../nms/v1_19_R2/entity/FoxController.java | 7 +------ .../nms/v1_19_R2/entity/FrogController.java | 7 +------ .../nms/v1_19_R2/entity/GhastController.java | 7 +------ .../nms/v1_19_R2/entity/GiantController.java | 7 +------ .../nms/v1_19_R2/entity/GlowSquidController.java | 7 +------ .../nms/v1_19_R2/entity/GoatController.java | 7 +------ .../nms/v1_19_R2/entity/GuardianController.java | 7 +------ .../v1_19_R2/entity/GuardianElderController.java | 7 +------ .../nms/v1_19_R2/entity/HoglinController.java | 7 +------ .../nms/v1_19_R2/entity/HorseController.java | 7 +------ .../nms/v1_19_R2/entity/HorseDonkeyController.java | 7 +------ .../nms/v1_19_R2/entity/HorseMuleController.java | 7 +------ .../v1_19_R2/entity/HorseSkeletonController.java | 7 +------ .../nms/v1_19_R2/entity/HorseZombieController.java | 7 +------ .../nms/v1_19_R2/entity/IllusionerController.java | 7 +------ .../nms/v1_19_R2/entity/IronGolemController.java | 7 +------ .../nms/v1_19_R2/entity/LlamaController.java | 7 +------ .../nms/v1_19_R2/entity/MagmaCubeController.java | 7 +------ .../nms/v1_19_R2/entity/MushroomCowController.java | 7 +------ .../nms/v1_19_R2/entity/OcelotController.java | 7 +------ .../nms/v1_19_R2/entity/PandaController.java | 7 +------ .../nms/v1_19_R2/entity/ParrotController.java | 7 +------ .../nms/v1_19_R2/entity/PhantomController.java | 7 +------ .../nms/v1_19_R2/entity/PigController.java | 7 +------ .../nms/v1_19_R2/entity/PigZombieController.java | 7 +------ .../nms/v1_19_R2/entity/PiglinBruteController.java | 7 +------ .../nms/v1_19_R2/entity/PiglinController.java | 7 +------ .../nms/v1_19_R2/entity/PillagerController.java | 7 +------ .../nms/v1_19_R2/entity/PolarBearController.java | 7 +------ .../nms/v1_19_R2/entity/PufferFishController.java | 7 +------ .../nms/v1_19_R2/entity/RabbitController.java | 7 +------ .../nms/v1_19_R2/entity/RavagerController.java | 7 +------ .../nms/v1_19_R2/entity/SalmonController.java | 7 +------ .../nms/v1_19_R2/entity/SheepController.java | 7 +------ .../nms/v1_19_R2/entity/ShulkerController.java | 7 +------ .../nms/v1_19_R2/entity/SilverfishController.java | 7 +------ .../nms/v1_19_R2/entity/SkeletonController.java | 7 +------ .../v1_19_R2/entity/SkeletonStrayController.java | 7 +------ .../v1_19_R2/entity/SkeletonWitherController.java | 7 +------ .../nms/v1_19_R2/entity/SlimeController.java | 7 +------ .../nms/v1_19_R2/entity/SnowmanController.java | 7 +------ .../nms/v1_19_R2/entity/SpiderController.java | 7 +------ .../nms/v1_19_R2/entity/SquidController.java | 7 +------ .../nms/v1_19_R2/entity/StriderController.java | 7 +------ .../nms/v1_19_R2/entity/TadpoleController.java | 7 +------ .../nms/v1_19_R2/entity/TraderLlamaController.java | 7 +------ .../v1_19_R2/entity/TropicalFishController.java | 7 +------ .../nms/v1_19_R2/entity/TurtleController.java | 7 +------ .../nms/v1_19_R2/entity/VexController.java | 7 +------ .../nms/v1_19_R2/entity/VillagerController.java | 7 +------ .../nms/v1_19_R2/entity/VindicatorController.java | 7 +------ .../v1_19_R2/entity/WanderingTraderController.java | 7 +------ .../nms/v1_19_R2/entity/WardenController.java | 7 +------ .../nms/v1_19_R2/entity/WitchController.java | 7 +------ .../nms/v1_19_R2/entity/WitherController.java | 7 +------ .../nms/v1_19_R2/entity/WolfController.java | 7 +------ .../nms/v1_19_R2/entity/ZoglinController.java | 7 +------ .../nms/v1_19_R2/entity/ZombieController.java | 7 +------ .../nms/v1_19_R2/entity/ZombieHuskController.java | 7 +------ .../v1_19_R2/entity/ZombieVillagerController.java | 7 +------ .../nonliving/AreaEffectCloudController.java | 7 +------ .../entity/nonliving/ArmorStandController.java | 7 +------ .../v1_19_R2/entity/nonliving/BoatController.java | 7 +------ .../entity/nonliving/ChestBoatController.java | 7 +------ .../entity/nonliving/DragonFireballController.java | 7 +------ .../v1_19_R2/entity/nonliving/EggController.java | 7 +------ .../entity/nonliving/EnderCrystalController.java | 7 +------ .../entity/nonliving/EnderPearlController.java | 7 +------ .../entity/nonliving/EnderSignalController.java | 7 +------ .../entity/nonliving/EvokerFangsController.java | 7 +------ .../entity/nonliving/ExperienceOrbController.java | 7 +------ .../entity/nonliving/FallingBlockController.java | 7 +------ .../entity/nonliving/FireworkController.java | 7 +------ .../entity/nonliving/FishingHookController.java | 7 +------ .../entity/nonliving/GlowItemFrameController.java | 7 +------ .../v1_19_R2/entity/nonliving/ItemController.java | 7 +------ .../entity/nonliving/ItemFrameController.java | 7 +------ .../entity/nonliving/LargeFireballController.java | 7 +------ .../v1_19_R2/entity/nonliving/LeashController.java | 7 +------ .../entity/nonliving/LlamaSpitController.java | 7 +------ .../entity/nonliving/MarkerController.java | 7 +------ .../entity/nonliving/MinecartChestController.java | 7 +------ .../nonliving/MinecartCommandController.java | 7 +------ .../nonliving/MinecartFurnaceController.java | 7 +------ .../entity/nonliving/MinecartHopperController.java | 7 +------ .../nonliving/MinecartRideableController.java | 7 +------ .../nonliving/MinecartSpawnerController.java | 7 +------ .../entity/nonliving/MinecartTNTController.java | 7 +------ .../entity/nonliving/PaintingController.java | 7 +------ .../entity/nonliving/ShulkerBulletController.java | 7 +------ .../entity/nonliving/SmallFireballController.java | 7 +------ .../entity/nonliving/SnowballController.java | 7 +------ .../entity/nonliving/SpectralArrowController.java | 7 +------ .../entity/nonliving/TNTPrimedController.java | 7 +------ .../nonliving/ThrownExpBottleController.java | 7 +------ .../entity/nonliving/ThrownPotionController.java | 7 +------ .../entity/nonliving/ThrownTridentController.java | 7 +------ .../entity/nonliving/TippedArrowController.java | 7 +------ .../entity/nonliving/WitherSkullController.java | 7 +------ .../citizensnpcs/nms/v1_19_R2/util/NMSImpl.java | 10 ++++++++++ .../nms/v1_19_R2/util/PlayerNavigation.java | 2 +- 749 files changed, 842 insertions(+), 4929 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java index 173d70112..2cd4d6eea 100644 --- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java @@ -98,6 +98,7 @@ public class HologramTrait extends Trait { Material item = SpigotUtil.isUsing1_13API() ? Material.matchMaterial(itemMatcher.group(1), false) : Material.matchMaterial(itemMatcher.group(1)); NPC itemNPC = registry.createNPCUsingItem(EntityType.DROPPED_ITEM, "", new ItemStack(item, 1)); + itemNPC.data().setPersistent(NPC.Metadata.NAMEPLATE_VISIBLE, false); if (itemMatcher.group(2) != null) { itemNPC.getOrAddTrait(ScoreboardTrait.class) .setColor(Util.matchEnum(ChatColor.values(), itemMatcher.group(2).substring(1))); 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 7fec00daa..fdfbce125 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 @@ -78,16 +78,7 @@ public class BatController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java index 7cc25d297..d79bbc488 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 @@ -75,16 +75,7 @@ public class BlazeController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java index e187b147e..270229058 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 @@ -93,16 +93,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java index 2c606b20c..9612684b7 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 @@ -106,16 +106,7 @@ public class ChickenController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java index d477860b7..c331852b7 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 @@ -114,16 +114,7 @@ public class CodController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java index 6bc4d1395..9dabcfec0 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 @@ -119,16 +119,7 @@ public class CowController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java index eeaf8d288..f129d39c8 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 @@ -96,16 +96,7 @@ public class CreeperController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java index 47893f203..2049566cd 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 @@ -108,16 +108,7 @@ public class DolphinController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java index 41afcf32d..bd6641ba4 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 @@ -93,16 +93,7 @@ public class DrownedController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java index c7f68d69f..25d6e4849 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 @@ -77,16 +77,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java index 65a8ea763..aec61c71b 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 @@ -93,16 +93,7 @@ public class EndermanController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java index 7c3d10a46..462c20a0d 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 @@ -93,16 +93,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java index 73c39c554..08b7521f8 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 @@ -79,16 +79,7 @@ public class EvokerController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java index 1614af2e1..cf885cd96 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 @@ -61,16 +61,7 @@ public class GhastController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java index 45432c142..2cce4e7a2 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 @@ -79,16 +79,7 @@ public class GiantController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java index 08cfb47a4..f00262405 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 @@ -81,16 +81,7 @@ public class GuardianController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java index 0ee7924be..450a6b689 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 @@ -81,16 +81,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java index 20e7b4c20..087519ed8 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 @@ -108,16 +108,7 @@ public class HorseController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java index ecf65744e..d5743c3de 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 @@ -108,16 +108,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java index 287be44cc..395dd4015 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 @@ -108,16 +108,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java index 8b02c0d5e..c35646ce9 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 @@ -109,16 +109,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java index d56a5f702..5ec197cf3 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 @@ -109,16 +109,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java index bca4a1845..4e8483cbf 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 @@ -79,16 +79,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java index ab6078217..65f125cca 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 @@ -79,16 +79,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java index 7daaa1692..c71015be7 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 @@ -101,16 +101,7 @@ public class LlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java index fbb3f0ab0..65f2dd7ff 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 @@ -85,16 +85,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java index 6eee24856..8bb5d54ad 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 @@ -100,16 +100,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java index 950afb8f8..fd0269a67 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 @@ -90,16 +90,7 @@ public class OcelotController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java index 79082aebb..400eabe34 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 @@ -72,16 +72,7 @@ public class ParrotController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java index b622556e4..9dcbfbc6e 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 @@ -90,16 +90,7 @@ public class PhantomController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java index eda4d1f8d..d1487d88b 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 @@ -91,16 +91,7 @@ public class PigController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java index 3fca00dd4..73f635246 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 @@ -80,16 +80,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java index 26d78c7d4..180df8d17 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 @@ -72,16 +72,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java index 9999e2ff1..eaa40c204 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 @@ -101,16 +101,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java index c6a2d403e..a80e5ae3f 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 @@ -91,16 +91,7 @@ public class RabbitController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java index bacf11063..192c75aa4 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 @@ -100,16 +100,7 @@ public class SalmonController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java index 4a575e901..85aee7844 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 @@ -90,16 +90,7 @@ public class SheepController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java index c347ab09c..4db3cdce3 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 @@ -82,16 +82,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java index d40c80c73..caf70974a 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 @@ -79,16 +79,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java index 11e816def..df2c48ae1 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 @@ -79,16 +79,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java index f2f11084e..7ab902de4 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 @@ -79,16 +79,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java index bf549ab59..7dac97a17 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 @@ -79,16 +79,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java index 5f995db0c..66e462012 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 @@ -85,16 +85,7 @@ public class SlimeController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java index 6bc2d721c..fadb484ff 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 @@ -79,16 +79,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java index 8aa65d54a..6a566fb09 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 @@ -79,16 +79,7 @@ public class SpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java index 0de110f09..0b6466c54 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 @@ -79,16 +79,7 @@ public class SquidController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java index ff6a71dd9..855d078b5 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 @@ -100,16 +100,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java index a575a6257..5971ad6d5 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 @@ -88,16 +88,7 @@ public class TurtleController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java index 6fc49b262..d584b38d8 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 @@ -64,16 +64,7 @@ public class VexController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java index cfe77895b..dab9cb3e4 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 @@ -110,16 +110,7 @@ public class VillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java index 5c875d007..bcbe2f1a5 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 @@ -90,16 +90,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java index ccd5827bd..e2585441e 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 @@ -79,16 +79,7 @@ public class WitchController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java index 21964053d..c7bafb513 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 @@ -61,16 +61,7 @@ public class WitherController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java index eb8f3a7fa..27e1d16dd 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 @@ -92,16 +92,7 @@ public class WolfController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java index acf1f8314..27d418e9c 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 @@ -79,16 +79,7 @@ public class ZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java index 374994768..0b5b6c0fb 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 @@ -79,16 +79,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java index a73e756ef..7a5119e58 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 @@ -79,16 +79,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java index 961771ffb..29441edb4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -63,16 +64,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java index 04948abde..c2b1308be 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java @@ -12,6 +12,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -80,16 +81,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java index 0011ee848..1470e7fc5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java @@ -64,16 +64,7 @@ public class BoatController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 273a33847..53840c47c 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 @@ -64,16 +64,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 13cd1a288..a189f0a76 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 @@ -12,6 +12,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -79,16 +80,7 @@ public class EggController extends AbstractEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java index 56362d6a0..675eef0a3 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -63,16 +64,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 e2fb9bc43..9ebcc846d 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 @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -63,16 +64,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java index a1d0f16e6..0afa742d4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -63,16 +64,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java index 196a0be7d..7e1d9dfd5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java @@ -12,6 +12,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -66,16 +67,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java index edd6099d8..c097bcdff 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java index d07b18041..67c7175da 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java @@ -72,16 +72,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java index 069c7d08b..ea2f1ab44 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class FireworkController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java index 47806ff57..1a5253378 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java @@ -14,6 +14,7 @@ import com.mojang.authlib.GameProfile; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -58,16 +59,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java index e002b6dd0..350006c0f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java @@ -12,6 +12,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -62,16 +63,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java index 26d40a912..36ee6e0ef 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java @@ -12,6 +12,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -62,16 +63,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 4d047cc05..18c1b8469 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 @@ -50,16 +50,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java index fd4d4c4ca..f492f467f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class LeashController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 1ca8c082c..47e37d396 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 @@ -12,6 +12,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -67,16 +68,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java index 120fdc32f..cf2ab95e0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java @@ -50,16 +50,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java index 32875e82d..317fbbd33 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java @@ -50,16 +50,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java index 6d76fb996..9fb2e7c96 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java @@ -50,16 +50,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java index 24dff06f1..36699234c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java @@ -46,16 +46,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java index 18db17dd5..f4d17b6ad 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java @@ -50,16 +50,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java index 4422e04c8..0f2f3ef79 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java @@ -46,16 +46,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java index dec4c4c9a..82ab055a0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java @@ -46,16 +46,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java index 300b1ed3a..c809a689f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class PaintingController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java index 3a37ba025..3fc7a13ee 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 c927a55af..2e5ac746c 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 @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java index c0987889c..514c38b62 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class SnowballController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java index 26ef1a1b0..8a23238f1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java index 83c1e90dd..f80a63706 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 8508f9422..0d49f15c4 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 @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java index 94d8c82e8..a61f8e948 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -50,16 +51,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java index 2d1dfa66d..22c37a02c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java index b7ae79442..25f51f469 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java index 1f1ad589e..05c5d421f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java @@ -10,6 +10,7 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -49,16 +50,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean b(Tag tag) { - double mx = motX; - double my = motY; - double mz = motZ; - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - motX = mx; - motY = my; - motZ = mz; - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index 124b8f5d2..62f5a4b9d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -259,6 +259,7 @@ import net.minecraft.server.v1_13_R2.EntityTurtle; import net.minecraft.server.v1_13_R2.EntityTypes; import net.minecraft.server.v1_13_R2.EntityWither; import net.minecraft.server.v1_13_R2.EnumMoveType; +import net.minecraft.server.v1_13_R2.FluidType; import net.minecraft.server.v1_13_R2.GenericAttributes; import net.minecraft.server.v1_13_R2.IBlockData; import net.minecraft.server.v1_13_R2.IChatBaseComponent; @@ -1708,6 +1709,19 @@ public class NMSImpl implements NMSBridge { return null; } + public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.server.v1_13_R2.Tag tag) { + double mx = entity.motX; + double my = entity.motY; + double mz = entity.motZ; + boolean res = entity.b(tag); + if (!npc.isPushableByFluids()) { + entity.motX = mx; + entity.motY = my; + entity.motZ = mz; + } + return res; + } + public static void flyingMoveLogic(EntityLiving entity, float f, float f1, float f2) { if ((entity.cP()) || (entity.bT())) { double d0 = 0.08D; 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 14118570f..9533a9415 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 @@ -25,7 +25,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.SoundEffect; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class BatController extends MobEntityController { @@ -80,12 +79,7 @@ public class BatController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java index 56c4bc58b..ddb2bfb2c 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 @@ -25,7 +25,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.SoundEffect; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class BlazeController extends MobEntityController { @@ -77,12 +76,7 @@ public class BlazeController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java index 52db94a17..17fee61b6 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 @@ -106,12 +106,7 @@ public class CatController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java index 62946dde4..8f5c70be7 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 @@ -93,12 +93,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java index b529f16d8..49716a6e5 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 @@ -107,12 +107,7 @@ public class ChickenController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java index d2a03fa26..3e1d18d88 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 @@ -112,12 +112,7 @@ public class CodController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java index dfc548bac..be7bc3b65 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 @@ -121,12 +121,7 @@ public class CowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java index 05bc3d216..87a99f635 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 @@ -96,12 +96,7 @@ public class CreeperController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java index d8e7c07a1..842111700 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 @@ -107,12 +107,7 @@ public class DolphinController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java index 63944b502..4ce055e0e 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 @@ -93,12 +93,7 @@ public class DrownedController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java index fa096d2c1..d782e8fc9 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 @@ -77,12 +77,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java index 722990fe6..12deefc24 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 @@ -101,12 +101,7 @@ public class EndermanController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java index 4c2e23e93..d883f55fa 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 @@ -93,12 +93,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java index 87e049a09..b2c2625ef 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 @@ -79,12 +79,7 @@ public class EvokerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java index 347339346..5ab687abf 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 @@ -92,12 +92,7 @@ public class FoxController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java index d5c597985..b81d2a26c 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 @@ -25,7 +25,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.SoundEffect; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class GhastController extends MobEntityController { @@ -63,12 +62,7 @@ public class GhastController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java index a3d22c781..457735576 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 @@ -79,12 +79,7 @@ public class GiantController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java index 472de7bf9..31ba6df45 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 @@ -79,12 +79,7 @@ public class GuardianController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java index c343f2591..9b063922f 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 @@ -79,12 +79,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java index c8aaf8522..1101892da 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 @@ -112,12 +112,7 @@ public class HorseController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java index e455d9521..01a103473 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 @@ -111,12 +111,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java index 91d2a92de..3b54e4572 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 @@ -111,12 +111,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java index c88ebcb90..52ad29db9 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 @@ -112,12 +112,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java index df5b6a8c3..e08a1261d 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 @@ -112,12 +112,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java index 1987d8e0e..f32b32418 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 @@ -79,12 +79,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java index ed8ec16c5..dab98ac23 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 @@ -79,12 +79,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java index ec598203a..8ff53bbaf 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 @@ -104,12 +104,7 @@ public class LlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java index a03c6c76a..ebf34da4f 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 @@ -85,12 +85,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java index 604b9cbc8..413a7e0bf 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 @@ -103,12 +103,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java index 0d5d6ac14..2df293f82 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 @@ -93,12 +93,7 @@ public class OcelotController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java index a73bc20dc..aced8e021 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 @@ -92,12 +92,7 @@ public class PandaController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java index c3f54ddac..88f771db8 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 @@ -27,7 +27,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.SoundEffect; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ParrotController extends MobEntityController { @@ -74,12 +73,7 @@ public class ParrotController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java index 13f9bb584..8f4bdfd2b 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 @@ -87,12 +87,7 @@ public class PhantomController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java index 8dcc0ce3a..fddd93095 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 @@ -94,12 +94,7 @@ public class PigController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java index b3afd8e40..f1de1b14c 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 @@ -80,12 +80,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java index ebf98bb80..2acb49538 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 @@ -92,12 +92,7 @@ public class PillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java index 6f0c240ef..e422f9d2c 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.SoundEffect; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class PolarBearController extends MobEntityController { @@ -77,12 +76,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java index 02f3e4035..5dfc3a50a 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 @@ -109,12 +109,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java index d9b40770b..3202bdee5 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 @@ -94,12 +94,7 @@ public class RabbitController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java index 782c729fa..a24be9305 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 @@ -92,12 +92,7 @@ public class RavagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java index 47b0246c1..3d803e6ab 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 @@ -98,12 +98,7 @@ public class SalmonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java index ed76bbc30..961758ca2 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 @@ -93,12 +93,7 @@ public class SheepController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java index 4df245ba1..20e087611 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 @@ -80,12 +80,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java index 00464ba20..9cefe4c9b 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 @@ -79,12 +79,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java index df4c32a6a..e27e3d600 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 @@ -79,12 +79,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java index 2e5a75856..5109c41f1 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 @@ -79,12 +79,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java index fef13b19a..06c798069 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 @@ -79,12 +79,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java index d84c3f26c..050f5b3e7 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 @@ -85,12 +85,7 @@ public class SlimeController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java index d890cf317..2561c5e8b 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 @@ -79,12 +79,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java index 47fcf9dbe..22f59d23b 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 @@ -79,12 +79,7 @@ public class SpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java index 3e778d51f..d346311e3 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 @@ -79,12 +79,7 @@ public class SquidController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java index 591880a7a..bae3168d8 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 @@ -107,12 +107,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java index 983a78a8b..93cd8273d 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 @@ -98,12 +98,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java index aae64fd68..6f77e4fc8 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 @@ -86,12 +86,7 @@ public class TurtleController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 3b1ac8a0c..b63ff145c 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 @@ -25,7 +25,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.SoundEffect; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class VexController extends MobEntityController { @@ -66,12 +65,7 @@ public class VexController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java index 7ee380651..a74b8cfde 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 @@ -118,12 +118,7 @@ public class VillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java index 0a147c79b..69665e610 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 @@ -93,12 +93,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java index d7b684d0c..52247b8a7 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 @@ -116,12 +116,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java index 43b3583cc..bbb91ea05 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 @@ -79,12 +79,7 @@ public class WitchController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java index 2097a9c70..99bd1005d 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 @@ -25,7 +25,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.SoundEffect; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class WitherController extends MobEntityController { @@ -63,12 +62,7 @@ public class WitherController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java index 23461a99c..779d56e45 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 @@ -95,12 +95,7 @@ public class WolfController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java index 3f99306e7..546215ae5 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 @@ -79,12 +79,7 @@ public class ZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java index 9675f5a4d..833582557 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 @@ -79,12 +79,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java index 926199b20..e9144da3e 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 @@ -79,12 +79,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java index c115e6347..a917433cc 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class AreaEffectCloudController extends MobEntityController { @@ -66,12 +65,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java index b5eae1144..ee2bb3525 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java @@ -82,12 +82,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java index 9dd9c09e5..3f5aec599 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class BoatController extends MobEntityController { @@ -66,12 +65,7 @@ public class BoatController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 e665f3bc8..e7ce80795 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 @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class DragonFireballController extends MobEntityController { @@ -66,12 +65,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 0269e14bb..7752361e4 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 @@ -23,7 +23,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; import net.minecraft.server.v1_14_R1.WorldServer; @@ -82,12 +81,7 @@ public class EggController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java index c5ef12234..88a62bfca 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class EnderCrystalController extends MobEntityController { @@ -66,12 +65,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 58e7224e6..73a56f424 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 @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class EnderPearlController extends MobEntityController { @@ -66,12 +65,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java index 74198a209..0ddaa6d2f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class EnderSignalController extends MobEntityController { @@ -66,12 +65,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java index c724310a0..4bee5d7c2 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java @@ -68,12 +68,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java index f31af12e5..5225b8ab8 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ExperienceOrbController extends MobEntityController { @@ -52,12 +51,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java index 296f7382c..71d268e8f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java @@ -74,12 +74,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java index 56ab64106..64df0a778 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class FireworkController extends MobEntityController { @@ -52,12 +51,7 @@ public class FireworkController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java index 95a2b55ac..c4c1d94d9 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java @@ -30,7 +30,6 @@ import net.minecraft.server.v1_14_R1.Items; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.PlayerInteractManager; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; import net.minecraft.server.v1_14_R1.WorldServer; @@ -66,12 +65,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java index 4691340a9..3a087e57d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java @@ -25,7 +25,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.ItemStack; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ItemController extends AbstractEntityController { @@ -65,12 +64,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java index 8ab8f2cdc..d0ca71d27 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java @@ -24,7 +24,6 @@ import net.minecraft.server.v1_14_R1.EnumDirection; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ItemFrameController extends MobEntityController { @@ -65,12 +64,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 c95e3a53b..fd572992f 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 @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class LargeFireballController extends MobEntityController { @@ -52,12 +51,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java index 47a03d99a..95f8cb754 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class LeashController extends MobEntityController { @@ -52,12 +51,7 @@ public class LeashController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 75ff8f738..b2b5aa35a 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 @@ -24,7 +24,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; import net.minecraft.server.v1_14_R1.WorldServer; @@ -71,12 +70,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java index 9cce83b5b..bee6f57e5 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class MinecartChestController extends MobEntityController { @@ -52,12 +51,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java index d4718b18e..6d3857c1a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class MinecartCommandController extends MobEntityController { @@ -52,12 +51,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java index ec8f6f44b..7273d65ef 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class MinecartFurnaceController extends MobEntityController { @@ -52,12 +51,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java index a1d7cef5f..4b219da4b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class MinecartHopperController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java index 70d4a2019..7046a1fe2 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class MinecartRideableController extends MobEntityController { @@ -52,12 +51,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java index a47baa583..d18e5d4d8 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class MinecartSpawnerController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java index 3ec520c9c..d2186bdc7 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class MinecartTNTController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java index d996c82de..a0c5fdbac 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class PaintingController extends MobEntityController { @@ -52,12 +51,7 @@ public class PaintingController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java index 69b3c3d89..9eacf8968 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ShulkerBulletController extends MobEntityController { @@ -52,12 +51,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 7e13ebbbe..5ffb67606 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 @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class SmallFireballController extends MobEntityController { @@ -52,12 +51,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java index 68176694d..9a31f8eac 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class SnowballController extends MobEntityController { @@ -52,12 +51,7 @@ public class SnowballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java index 2aacb8419..b19def72f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class SpectralArrowController extends MobEntityController { @@ -52,12 +51,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java index 1f88b5c28..5afca2fcc 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class TNTPrimedController extends MobEntityController { @@ -52,12 +51,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 4ed262700..b07760c7c 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 @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ThrownExpBottleController extends MobEntityController { @@ -52,12 +51,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java index 0c61cfae3..17235cf16 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.Items; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ThrownPotionController extends MobEntityController { @@ -53,12 +52,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java index fbb980682..ab786d66e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class ThrownTridentController extends MobEntityController { @@ -52,12 +51,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java index 8d8a309bd..b12172d50 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class TippedArrowController extends MobEntityController { @@ -52,12 +51,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java index 5c3f73ea0..31ab7d19c 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java @@ -20,7 +20,6 @@ import net.minecraft.server.v1_14_R1.EntityWitherSkull; import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.Tag; -import net.minecraft.server.v1_14_R1.Vec3D; import net.minecraft.server.v1_14_R1.World; public class WitherSkullController extends MobEntityController { @@ -52,12 +51,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index dde82016c..87d604145 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -276,6 +276,7 @@ import net.minecraft.server.v1_14_R1.EntityTurtle; import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.EntityWither; import net.minecraft.server.v1_14_R1.EnumMoveType; +import net.minecraft.server.v1_14_R1.FluidType; import net.minecraft.server.v1_14_R1.GenericAttributes; import net.minecraft.server.v1_14_R1.IBlockData; import net.minecraft.server.v1_14_R1.IChatBaseComponent; @@ -1799,6 +1800,15 @@ public class NMSImpl implements NMSBridge { return null; } + public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.server.v1_14_R1.Tag tag) { + Vec3D old = entity.getMot().add(0, 0, 0); + boolean res = entity.b(tag); + if (!npc.isPushableByFluids()) { + entity.setMot(old); + } + return res; + } + public static void flyingMoveLogic(EntityLiving entity, Vec3D vec3d) { double d0; float f; 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 0578b578e..d81e0162d 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class BatController extends MobEntityController { @@ -73,12 +72,7 @@ public class BatController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java index dd0a99f6a..50f49162b 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class BeeController extends MobEntityController { @@ -70,12 +69,7 @@ public class BeeController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java index ad54c07a8..3a5de561c 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class BlazeController extends MobEntityController { @@ -70,12 +69,7 @@ public class BlazeController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java index 8d6f3c7a9..1f13f98d3 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 @@ -100,12 +100,7 @@ public class CatController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java index 9d6a8aabe..eb9d47bd4 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 @@ -87,12 +87,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java index 79dd64434..004762387 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 @@ -101,12 +101,7 @@ public class ChickenController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java index fd23533c2..9570413ca 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 @@ -110,12 +110,7 @@ public class CodController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java index 9d7921415..b6d7e151b 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 @@ -115,12 +115,7 @@ public class CowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java index 0ac6bb9f2..82dd9195a 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 @@ -90,12 +90,7 @@ public class CreeperController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java index 1361f3b41..a2929ea0e 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 @@ -105,12 +105,7 @@ public class DolphinController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java index 342a27733..97ba4f5ac 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 @@ -87,12 +87,7 @@ public class DrownedController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java index e820f36a8..fbf41c4a5 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 @@ -70,12 +70,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java index 175fcb709..7e8ca62c9 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 @@ -95,12 +95,7 @@ public class EndermanController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java index e26745781..3970cc189 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 @@ -87,12 +87,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java index 9556fe4eb..26ac6456a 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 @@ -81,12 +81,7 @@ public class EvokerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java index c3e09928f..36b543478 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 @@ -94,12 +94,7 @@ public class FoxController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java index 075fd0a0d..05ca851a8 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class GhastController extends MobEntityController { @@ -64,12 +63,7 @@ public class GhastController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java index 2cad8627c..191543030 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 @@ -81,12 +81,7 @@ public class GiantController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java index ab93e2ba0..f5887d848 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 @@ -81,12 +81,7 @@ public class GuardianController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java index efe0e755c..c3f79c8ae 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 @@ -81,12 +81,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java index 2bba4ba44..e5b9c149e 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 @@ -114,12 +114,7 @@ public class HorseController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java index 9288efee8..18a4ca867 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 @@ -113,12 +113,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java index 877dc3339..28e4a5cf5 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 @@ -113,12 +113,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java index 010361a0f..ad927304a 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 @@ -114,12 +114,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java index e0db11f3f..c17daded1 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 @@ -114,12 +114,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java index f0199002d..2ea29cd38 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 @@ -81,12 +81,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java index e3d7f6175..638f8d8f5 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 @@ -81,12 +81,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java index d2bc0448c..9d554c7da 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 @@ -106,12 +106,7 @@ public class LlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java index 17fffc98b..0ff0234d9 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 @@ -91,12 +91,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java index d393f132b..d296295d2 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 @@ -105,12 +105,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java index 3c14c1958..4e70a642a 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 @@ -96,12 +96,7 @@ public class OcelotController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java index 6ed428502..07f6aeee5 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 @@ -94,12 +94,7 @@ public class PandaController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java index 1d462db31..5b5f75572 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 @@ -28,7 +28,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ParrotController extends MobEntityController { @@ -75,12 +74,7 @@ public class ParrotController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java index ab7997410..f00ea421d 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 @@ -95,12 +95,7 @@ public class PhantomController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java index 905a38876..7903d43f8 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 @@ -96,12 +96,7 @@ public class PigController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java index 2761247ed..ad5548a56 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 @@ -82,12 +82,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java index d48a5498b..1ab94e46d 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 @@ -94,12 +94,7 @@ public class PillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java index 2e9f3edb4..358b4ac58 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 @@ -27,7 +27,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class PolarBearController extends MobEntityController { @@ -78,12 +77,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java index c2961561e..2594ce37b 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 @@ -115,12 +115,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java index 7046cb15e..76b4fba59 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 @@ -96,12 +96,7 @@ public class RabbitController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java index db56ede10..4146b43b9 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 @@ -94,12 +94,7 @@ public class RavagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java index e697565b1..479fcafff 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 @@ -104,12 +104,7 @@ public class SalmonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java index 13449606e..a5023443d 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 @@ -95,12 +95,7 @@ public class SheepController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java index c68c28d2a..5942d8dcd 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 @@ -82,12 +82,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java index 0a2351947..cbf41c68e 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 @@ -81,12 +81,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java index 5e3b436e3..595de22e6 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 @@ -81,12 +81,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java index 88c2bab25..58b2f56eb 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 @@ -81,12 +81,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java index b8381475a..f863b5b8d 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 @@ -81,12 +81,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java index 462b0bf63..2512899bb 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 @@ -91,12 +91,7 @@ public class SlimeController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java index eaf181d18..6fb56de13 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 @@ -81,12 +81,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java index 3ea91ac6a..643a46e1d 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 @@ -81,12 +81,7 @@ public class SpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java index f12a99b55..153082faa 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 @@ -81,12 +81,7 @@ public class SquidController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java index 4e0172517..d2f575088 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 @@ -109,12 +109,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java index db219d214..f69cf7e28 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 @@ -104,12 +104,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java index f21fa654b..503c14a37 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 @@ -95,12 +95,7 @@ public class TurtleController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java index 8d373ee59..e24a67356 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class VexController extends MobEntityController { @@ -67,12 +66,7 @@ public class VexController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java index 1df4c85c7..1df0e2459 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 @@ -119,12 +119,7 @@ public class VillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java index dcf18be11..96213f533 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 @@ -95,12 +95,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java index c04253c07..59c51e0f6 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 @@ -116,12 +116,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java index d8912a732..7e47690d5 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 @@ -80,12 +80,7 @@ public class WitchController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java index 1a6c49ad8..a63715f8d 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.SoundEffect; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class WitherController extends MobEntityController { @@ -64,12 +63,7 @@ public class WitherController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java index e02c014ef..00467c70b 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 @@ -97,12 +97,7 @@ public class WolfController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java index 66ed0918a..8c29b6926 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 @@ -81,12 +81,7 @@ public class ZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java index 37953b85a..773e244ad 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 @@ -81,12 +81,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java index 0198b277f..4d96ad84f 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 @@ -81,12 +81,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java index b0cab7155..641e62859 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class AreaEffectCloudController extends MobEntityController { @@ -59,12 +58,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java index 254dd8f53..509e0026b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java @@ -75,12 +75,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java index 3446c54c9..473d67ef5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java @@ -72,12 +72,7 @@ public class BoatController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 678148f03..c82536a57 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class DragonFireballController extends MobEntityController { @@ -59,12 +58,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 bf25e9b38..d968e419b 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 @@ -24,7 +24,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; import net.minecraft.server.v1_15_R1.WorldServer; @@ -75,12 +74,7 @@ public class EggController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java index 43122e62a..622c42942 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class EnderCrystalController extends MobEntityController { @@ -59,12 +58,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 aef598f46..a4b1c6e75 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class EnderPearlController extends MobEntityController { @@ -59,12 +58,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java index bf6dad5d0..d8e28b81f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class EnderSignalController extends MobEntityController { @@ -59,12 +58,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java index c18d75afd..a261bfc5e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java @@ -69,12 +69,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java index cb441a512..b25338083 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ExperienceOrbController extends MobEntityController { @@ -53,12 +52,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java index 25eedc811..4ea5d58d4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java @@ -74,12 +74,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java index c642fafc4..9dc077901 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class FireworkController extends MobEntityController { @@ -53,12 +52,7 @@ public class FireworkController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java index 5e78e1349..5dee9611a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java @@ -31,7 +31,6 @@ import net.minecraft.server.v1_15_R1.Items; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.PlayerInteractManager; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; import net.minecraft.server.v1_15_R1.WorldServer; @@ -67,12 +66,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java index d50904393..9121090ee 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java @@ -25,7 +25,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.ItemStack; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ItemController extends AbstractEntityController { @@ -65,12 +64,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java index e10dbae2f..62b3e9515 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java @@ -24,7 +24,6 @@ import net.minecraft.server.v1_15_R1.EnumDirection; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ItemFrameController extends MobEntityController { @@ -65,12 +64,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 ca853a24e..59e931e65 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class LargeFireballController extends MobEntityController { @@ -53,12 +52,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java index 695297bdb..8643703bd 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class LeashController extends MobEntityController { @@ -53,12 +52,7 @@ public class LeashController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 325a98333..525044323 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 @@ -25,7 +25,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; import net.minecraft.server.v1_15_R1.WorldServer; @@ -72,12 +71,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java index 57ba0239b..8533ff75e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class MinecartChestController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java index 071754614..050ad1d4f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class MinecartCommandController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java index af8c1b6db..9b0635315 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class MinecartFurnaceController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java index a1508bd15..a8a7952d3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class MinecartHopperController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java index b37f86dac..b88372fd9 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class MinecartRideableController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java index f6aed5f11..dcfb66495 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class MinecartSpawnerController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java index d2f0ade39..3881892f3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class MinecartTNTController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java index 5251f481a..7059a92fb 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class PaintingController extends MobEntityController { @@ -53,12 +52,7 @@ public class PaintingController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java index e0e74defb..b4cae9846 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ShulkerBulletController extends MobEntityController { @@ -53,12 +52,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 314d03eaa..f615b6fa8 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class SmallFireballController extends MobEntityController { @@ -53,12 +52,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java index 6a565a6c4..e13b46f33 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class SnowballController extends MobEntityController { @@ -53,12 +52,7 @@ public class SnowballController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java index 809a39edf..a36fb83e9 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class SpectralArrowController extends MobEntityController { @@ -53,12 +52,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java index 02a7012a0..df1867ac5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class TNTPrimedController extends MobEntityController { @@ -53,12 +52,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override 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 e0f687d53..a71c1b6de 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ThrownExpBottleController extends MobEntityController { @@ -53,12 +52,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java index 5235971c3..fbbcd58f7 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java @@ -22,7 +22,6 @@ import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.Items; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ThrownPotionController extends MobEntityController { @@ -54,12 +53,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java index b63ed3e3c..1a506329d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class ThrownTridentController extends MobEntityController { @@ -53,12 +52,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java index ea89d4caa..743d77dd6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class TippedArrowController extends MobEntityController { @@ -53,12 +52,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java index c54cd69ec..c4678745e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_15_R1.EntityWitherSkull; import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.Tag; -import net.minecraft.server.v1_15_R1.Vec3D; import net.minecraft.server.v1_15_R1.World; public class WitherSkullController extends MobEntityController { @@ -53,12 +52,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean b(Tag tag) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.b(tag); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag); } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index 0cfb02a74..ec57e0d9f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -280,6 +280,7 @@ import net.minecraft.server.v1_15_R1.EntityTurtle; import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.EntityWither; import net.minecraft.server.v1_15_R1.EnumMoveType; +import net.minecraft.server.v1_15_R1.FluidType; import net.minecraft.server.v1_15_R1.GenericAttributes; import net.minecraft.server.v1_15_R1.IBlockData; import net.minecraft.server.v1_15_R1.IChatBaseComponent; @@ -1853,6 +1854,15 @@ public class NMSImpl implements NMSBridge { return null; } + public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.server.v1_15_R1.Tag tag) { + Vec3D old = entity.getMot().add(0, 0, 0); + boolean res = entity.b(tag); + if (!npc.isPushableByFluids()) { + entity.setMot(old); + } + return res; + } + public static void flyingMoveLogic(EntityLiving entity, Vec3D vec3d) { double d0; float f; 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 495935e6a..083c369e1 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class BatController extends MobEntityController { @@ -73,12 +72,7 @@ public class BatController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java index 7d9e458a5..30e8593ba 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class BeeController extends MobEntityController { @@ -70,12 +69,7 @@ public class BeeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java index 59524a505..94141e74e 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class BlazeController extends MobEntityController { @@ -70,12 +69,7 @@ public class BlazeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java index 9497944e3..f9d76bd6f 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 @@ -92,12 +92,7 @@ public class CatController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java index dc43cae57..f388f4d42 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 @@ -79,12 +79,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java index 719a37094..bfc44f3c4 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 @@ -93,12 +93,7 @@ public class ChickenController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java index b1120a846..2b7126dcd 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 @@ -92,12 +92,7 @@ public class CodController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java index 74ea3da9b..d1c492acf 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 @@ -97,12 +97,7 @@ public class CowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java index b1e7732ea..11a0f15ec 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 @@ -83,12 +83,7 @@ public class CreeperController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java index 8cf1a565e..5ec5b9684 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 @@ -92,12 +92,7 @@ public class DolphinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java index b510faf78..d2e409e5a 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 @@ -79,12 +79,7 @@ public class DrownedController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java index ae34275da..29422eb50 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 @@ -70,12 +70,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java index 990c231ff..7e83e8dfc 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 @@ -87,12 +87,7 @@ public class EndermanController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java index 8f8ca9211..4d5190cdb 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 @@ -79,12 +79,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java index 9e12b8b3c..7e7687070 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 @@ -73,12 +73,7 @@ public class EvokerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java index a9f629ae7..1afdc9d03 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 @@ -86,12 +86,7 @@ public class FoxController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java index 4b6f3f787..170df4347 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class GhastController extends MobEntityController { @@ -64,12 +63,7 @@ public class GhastController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java index 1eec0d51d..dd1728c50 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 @@ -73,12 +73,7 @@ public class GiantController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java index 2a7a0b6ab..f4178f9ec 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 @@ -73,12 +73,7 @@ public class GuardianController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java index eadaf9dd7..c2dc714c2 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 @@ -73,12 +73,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java index 9b487c133..3113cfd37 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 @@ -73,12 +73,7 @@ public class HoglinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java index 2bfd9db1e..b3b48a1b4 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 @@ -106,12 +106,7 @@ public class HorseController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java index 26d5c01a8..22cefeef2 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 @@ -102,12 +102,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java index f0bc1a68d..75716c4c2 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 @@ -102,12 +102,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java index 16c24a308..a488a5c95 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 @@ -106,12 +106,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java index 3ddb0e6d3..714e8abf1 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 @@ -103,12 +103,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java index c9c87be2e..de9cd1c47 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 @@ -73,12 +73,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java index 02c6ed03c..9704d3026 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 @@ -73,12 +73,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java index d1b6f3123..211c59d06 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 @@ -98,12 +98,7 @@ public class LlamaController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java index 36bd62635..dae8cac8c 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 @@ -83,12 +83,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java index fd5e588a4..8d13cea72 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 @@ -91,12 +91,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java index 879612d3c..8de6e9e46 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 @@ -88,12 +88,7 @@ public class OcelotController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java index c675b601b..af0593d56 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 @@ -86,12 +86,7 @@ public class PandaController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java index e928d80e5..0048f5e34 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 @@ -29,7 +29,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ParrotController extends MobEntityController { @@ -67,12 +66,7 @@ public class ParrotController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java index 787e72203..6205223d0 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 @@ -101,12 +101,7 @@ public class PhantomController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java index 28605047d..db04796f2 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 @@ -89,12 +89,7 @@ public class PigController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java index c47cab8d1..29e72934d 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 @@ -74,12 +74,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java index 54144af3f..055a0b837 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 @@ -73,12 +73,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java index 31ab59dfa..20559543f 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 @@ -73,12 +73,7 @@ public class PiglinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java index ce1a4c31b..8192638d5 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 @@ -86,12 +86,7 @@ public class PillagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java index ade506546..619777c27 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 @@ -27,7 +27,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class PolarBearController extends MobEntityController { @@ -78,12 +77,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java index 81e0f87ee..8192824f7 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 @@ -97,12 +97,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java index efb379e60..f12ada18d 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 @@ -88,12 +88,7 @@ public class RabbitController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java index 70049aee0..af09793e6 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 @@ -86,12 +86,7 @@ public class RavagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java index e410cead8..d0ab6c137 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 @@ -86,12 +86,7 @@ public class SalmonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java index 9e8d6a878..eb9b8a5d5 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 @@ -87,12 +87,7 @@ public class SheepController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java index 6f36a6257..1c539cd12 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 @@ -74,12 +74,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java index 78ac64c48..6d1beaed3 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 @@ -73,12 +73,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java index 6ad069c73..f01f4ceca 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 @@ -73,12 +73,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java index 2c8be370e..e44acaff3 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 @@ -73,12 +73,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java index 743133fae..b5264b037 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 @@ -73,12 +73,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java index 7de9c634c..f2e8f8da9 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 @@ -83,12 +83,7 @@ public class SlimeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java index 6aa6e4347..d24147eec 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 @@ -73,12 +73,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java index 5f195eb61..38a57df71 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 @@ -73,12 +73,7 @@ public class SpiderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java index b633e8a47..bb6d6c0b4 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 @@ -73,12 +73,7 @@ public class SquidController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java index fa5aa56f3..277b0d9da 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 @@ -73,12 +73,7 @@ public class StriderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java index 0d5f35954..352890e78 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 @@ -101,12 +101,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java index 1d629851a..b16489143 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 @@ -86,12 +86,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java index edd9f1a75..57e11130d 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 @@ -87,12 +87,7 @@ public class TurtleController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java index 84de1dee0..3e31c42e8 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class VexController extends MobEntityController { @@ -67,12 +66,7 @@ public class VexController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java index 46f2fb809..a1968395c 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 @@ -101,12 +101,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java index c8c7e68c4..ece765ea8 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 @@ -87,12 +87,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java index f367b2fc3..2bc14636a 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 @@ -100,12 +100,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java index c03067e70..9f730253b 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 @@ -73,12 +73,7 @@ public class WitchController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java index ab9ffabaa..4e57b56ab 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 @@ -26,7 +26,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.SoundEffect; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class WitherController extends MobEntityController { @@ -64,12 +63,7 @@ public class WitherController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java index ff4c502ab..be9bd5c0f 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 @@ -89,12 +89,7 @@ public class WolfController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java index 140ee9289..17ad5e862 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 @@ -73,12 +73,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java index e84ae1fc2..90c67160b 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 @@ -73,12 +73,7 @@ public class ZombieController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java index a65306968..c6c3ef0bf 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 @@ -73,12 +73,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java index 8474dfc30..23ed805b5 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 @@ -73,12 +73,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java index b42bd0de2..556b9fad6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class AreaEffectCloudController extends MobEntityController { @@ -59,12 +58,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java index 20e868db2..b39f0f481 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java @@ -75,12 +75,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java index 051ffb6f1..a7214b781 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java @@ -73,12 +73,7 @@ public class BoatController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override 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 df3fab584..1a25c66e8 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class DragonFireballController extends MobEntityController { @@ -59,12 +58,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override 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 6e00b4369..21e15c57a 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 @@ -24,7 +24,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; import net.minecraft.server.v1_16_R3.WorldServer; @@ -75,12 +74,7 @@ public class EggController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java index 53e0342b2..cab9e540b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class EnderCrystalController extends MobEntityController { @@ -59,12 +58,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override 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 cbe6410fc..0a55c1513 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class EnderPearlController extends MobEntityController { @@ -59,12 +58,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java index b7c66fe8f..711f8b5e7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class EnderSignalController extends MobEntityController { @@ -59,12 +58,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java index f99943b52..3d69842ae 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java @@ -69,12 +69,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java index 6702e0559..5b858679d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ExperienceOrbController extends MobEntityController { @@ -53,12 +52,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java index b15256f9a..08cabc16f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java @@ -74,12 +74,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java index 614ecc952..e48442bfa 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class FireworkController extends MobEntityController { @@ -53,12 +52,7 @@ public class FireworkController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java index cc54b7408..8d7b784b2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java @@ -33,7 +33,6 @@ import net.minecraft.server.v1_16_R3.Items; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.PlayerInteractManager; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; import net.minecraft.server.v1_16_R3.WorldServer; @@ -69,12 +68,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java index d7dd39c34..5546e9ba6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java @@ -25,7 +25,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.ItemStack; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ItemController extends AbstractEntityController { @@ -65,12 +64,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java index 54660f2a9..0a5660739 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java @@ -24,7 +24,6 @@ import net.minecraft.server.v1_16_R3.EnumDirection; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ItemFrameController extends MobEntityController { @@ -65,12 +64,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override 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 4a335f5ea..957e52d49 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class LargeFireballController extends MobEntityController { @@ -53,12 +52,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java index 0b73c1788..97ebeb428 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class LeashController extends MobEntityController { @@ -53,12 +52,7 @@ public class LeashController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override 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 ab8bd7e71..df6feabad 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 @@ -25,7 +25,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; import net.minecraft.server.v1_16_R3.WorldServer; @@ -72,12 +71,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java index 49f14d74b..8e9bef971 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class MinecartChestController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java index 11dd71c29..ac1e6474f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class MinecartCommandController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java index 446cad51c..018e56cc3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class MinecartFurnaceController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java index 2dcc66e48..5a9377f06 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class MinecartHopperController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java index 0412ba142..36d54271e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class MinecartRideableController extends MobEntityController { @@ -53,12 +52,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java index 820fd6195..120856c92 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class MinecartSpawnerController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java index d852fc162..edc4d942b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java @@ -16,7 +16,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class MinecartTNTController extends MobEntityController { @@ -48,12 +47,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java index dd35b8910..857213d13 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class PaintingController extends MobEntityController { @@ -53,12 +52,7 @@ public class PaintingController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java index 005ab6996..cacd31111 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ShulkerBulletController extends MobEntityController { @@ -53,12 +52,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override 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 2a85a6463..a7c9f72ee 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class SmallFireballController extends MobEntityController { @@ -53,12 +52,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java index e898cca70..43754a1e9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class SnowballController extends MobEntityController { @@ -53,12 +52,7 @@ public class SnowballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java index 6cab2d9ed..edeeda33b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class SpectralArrowController extends MobEntityController { @@ -53,12 +52,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java index 96a44df90..6c1e0662c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class TNTPrimedController extends MobEntityController { @@ -53,12 +52,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override 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 3342da6bb..4ead8a9ce 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 @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ThrownExpBottleController extends MobEntityController { @@ -53,12 +52,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java index b8507fd14..bbb163a38 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java @@ -22,7 +22,6 @@ import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.Items; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ThrownPotionController extends MobEntityController { @@ -54,12 +53,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java index 04b153e3b..b4d74c43e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class ThrownTridentController extends MobEntityController { @@ -53,12 +52,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java index 74dd4c6f9..11a18fc14 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class TippedArrowController extends MobEntityController { @@ -53,12 +52,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java index bc398cd71..330dd5099 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java @@ -21,7 +21,6 @@ import net.minecraft.server.v1_16_R3.EntityWitherSkull; import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.NBTTagCompound; import net.minecraft.server.v1_16_R3.Tag; -import net.minecraft.server.v1_16_R3.Vec3D; import net.minecraft.server.v1_16_R3.World; public class WitherSkullController extends MobEntityController { @@ -53,12 +52,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - Vec3D old = getMot().add(0, 0, 0); - boolean res = super.a(tag, d0); - if (!npc.isPushableByFluids()) { - this.setMot(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tag, d0); } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index c6f961fe5..2dd29fc4b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -289,6 +289,7 @@ import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.EntityWither; import net.minecraft.server.v1_16_R3.EnumMoveType; import net.minecraft.server.v1_16_R3.Fluid; +import net.minecraft.server.v1_16_R3.FluidType; import net.minecraft.server.v1_16_R3.GenericAttributes; import net.minecraft.server.v1_16_R3.IBlockData; import net.minecraft.server.v1_16_R3.IChatBaseComponent; @@ -1877,6 +1878,16 @@ public class NMSImpl implements NMSBridge { return null; } + public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.server.v1_16_R3.Tag tag, + double d0) { + Vec3D old = entity.getMot().add(0, 0, 0); + boolean res = entity.a(tag, d0); + if (!npc.isPushableByFluids()) { + entity.setMot(old); + } + return res; + } + public static void flyingMoveLogic(EntityLiving entity, Vec3D vec3d) { if (entity.doAITick() || entity.cs()) { double d0 = 0.08D; 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 f2cba8354..2e6dc7a2e 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 @@ -234,12 +234,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 c5d1b0864..7cc0c62b1 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 @@ -174,12 +174,7 @@ public class BatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 8e95a28e8..90318c38d 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 @@ -167,12 +167,7 @@ public class BeeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 ccd746e2f..0c2481a9b 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 @@ -153,12 +153,7 @@ public class BlazeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 113e042ad..38c12d679 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 @@ -203,12 +203,7 @@ public class CatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 c215ebaa7..901fd78c1 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 @@ -208,12 +208,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 23766718d..747be6213 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 @@ -212,12 +212,7 @@ public class ChickenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 2974ed226..3f3326a44 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 @@ -237,12 +237,7 @@ public class CodController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 6924a3a11..020862a9a 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 @@ -219,12 +219,7 @@ public class CowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 402b85c0b..9a9826dfa 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 @@ -212,12 +212,7 @@ public class CreeperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 4eb6df3c4..0fa6e5657 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 @@ -217,12 +217,7 @@ public class DolphinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 190cb0e57..92cfe397f 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 @@ -188,12 +188,7 @@ public class DrownedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 59961eda0..145827ce0 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 @@ -168,12 +168,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 aa69effaa..e3d6cf4ab 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 @@ -213,12 +213,7 @@ public class EndermanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 8541f089f..2e9d948e7 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 @@ -197,12 +197,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 d7cbccaf1..e14ff5d38 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 @@ -183,12 +183,7 @@ public class EvokerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 327afc764..341d8d14d 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 @@ -197,12 +197,7 @@ public class FoxController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 44f48ee5e..fa448be6d 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 @@ -153,12 +153,7 @@ public class GhastController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 9c9e1a4c5..d11cd769e 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 @@ -191,12 +191,7 @@ public class GiantController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 998de4f3e..282c41a6e 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 @@ -191,12 +191,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 74a012a00..95a80345b 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 @@ -197,12 +197,7 @@ public class GoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 e5abb6a26..10f686ba2 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 @@ -198,12 +198,7 @@ public class GuardianController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 ba7c5aa4d..cc55810d9 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 @@ -198,12 +198,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 c03aedd13..ac759a52e 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 @@ -185,12 +185,7 @@ public class HoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 365f1a5e5..271e0229c 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 @@ -246,12 +246,7 @@ public class HorseController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 52a50ae2c..c11d76f98 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 @@ -242,12 +242,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 e8639e42f..2b457a9dc 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 @@ -245,12 +245,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 b56587aa3..9407fe801 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 @@ -245,12 +245,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 f4a850f1b..83565ba4d 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 @@ -245,12 +245,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 99c43b20d..a304ac91e 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 @@ -183,12 +183,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 e1e61a1ec..fefae9fad 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 @@ -191,12 +191,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 6d7b6c4f1..377dc80b9 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 @@ -215,12 +215,7 @@ public class LlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 dcbd591fc..f0a4a7205 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 @@ -214,12 +214,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 310b3cd08..d8e3225ba 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 @@ -207,12 +207,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 4586d6d71..eb7de378e 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 @@ -204,12 +204,7 @@ public class OcelotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 b4647756d..4501ee149 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 @@ -197,12 +197,7 @@ public class PandaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 05d012871..0a50945be 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 @@ -175,12 +175,7 @@ public class ParrotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 efbe2fa97..cf5649e3c 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 @@ -234,12 +234,7 @@ public class PhantomController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 8bcc3fece..4c946ff43 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 @@ -213,12 +213,7 @@ public class PigController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 70658fec4..0ebb7b292 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 @@ -185,12 +185,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 af2cdef4e..893d2ed30 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 @@ -185,12 +185,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 399b8cb4e..fef9503d6 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 @@ -185,12 +185,7 @@ public class PiglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 c12036214..4044f2d63 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 @@ -197,12 +197,7 @@ public class PillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 e03981c6f..36c50175b 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 @@ -172,12 +172,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 dd3f417c0..29c4dfbcb 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 @@ -253,12 +253,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } private static float s(int i) { 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 d95b28deb..29f41ece6 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 @@ -218,12 +218,7 @@ public class RabbitController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 f42c9306e..e99848921 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 @@ -197,12 +197,7 @@ public class RavagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 0a581e5c5..5a659c167 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 @@ -229,12 +229,7 @@ public class SalmonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 f9be00261..937bfb37c 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 @@ -197,12 +197,7 @@ public class SheepController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 98d69bc09..3d4daa17d 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 @@ -208,12 +208,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 90c233972..84d35664d 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 @@ -198,12 +198,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 949118c86..bcba896b6 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 @@ -191,12 +191,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 9558264c5..2f46eaace 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 @@ -191,12 +191,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 9bd6853de..dff9ed867 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 @@ -191,12 +191,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 03fca44d8..b8122e89e 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 @@ -215,12 +215,7 @@ public class SlimeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 20d6c5573..1ffe71ff3 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 @@ -191,12 +191,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 530f0c7e9..e154346fd 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 @@ -191,12 +191,7 @@ public class SpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 e4977b2b6..b55990cf5 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 @@ -191,12 +191,7 @@ public class SquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 599844b35..316c85eea 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 @@ -182,12 +182,7 @@ public class StriderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 eb13c9e15..2ae035ee7 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 @@ -216,12 +216,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 9451663c0..74cc65338 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 @@ -231,12 +231,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 0e6fc9b95..af8d48408 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 @@ -207,12 +207,7 @@ public class TurtleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } static class EmptyControllerJump extends JumpControl { 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 4e494bd02..bc5053794 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 @@ -160,12 +160,7 @@ public class VexController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 537bf0c15..0dbd55885 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 @@ -240,12 +240,7 @@ public class VillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 91a69431c..5849fc21f 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 @@ -198,12 +198,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 6ba8f684f..445d7c6db 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 @@ -247,12 +247,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 27d07ceeb..13221fc56 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 @@ -191,12 +191,7 @@ public class WitchController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 1c131320c..09a7119c5 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 @@ -162,12 +162,7 @@ public class WitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 24253b08a..d49155666 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 @@ -205,12 +205,7 @@ public class WolfController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 bb23e819d..a661df9be 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 @@ -184,12 +184,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 05c2fb833..a6bcfbb81 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 @@ -182,12 +182,7 @@ public class ZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 49653d8fd..aeb226189 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 @@ -182,12 +182,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 698491d2b..0d6ad8ace 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 @@ -182,12 +182,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java index 43c406c10..86f1d4262 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java @@ -104,12 +104,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ArmorStandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ArmorStandController.java index d18b11c11..a7e7fc51e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ArmorStandController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ArmorStandController.java @@ -118,12 +118,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java index 3079ccd1d..166f0e91b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java @@ -239,12 +239,7 @@ public class BoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 1fb975468..0857c78f9 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 @@ -116,12 +116,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 8cbc5e3d8..410a4c35d 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 @@ -122,12 +122,7 @@ public class EggController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java index 485396237..b08f1db1e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java @@ -104,12 +104,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } 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 d3e45b735..b22744494 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 @@ -108,12 +108,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java index c57abbcff..03a8af877 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java @@ -105,12 +105,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java index af08b303a..f09023c27 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java @@ -112,12 +112,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java index 39d38cce3..45f56afa5 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java @@ -98,12 +98,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java index deb3fa6aa..1f5b9ed62 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java @@ -134,12 +134,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } private static final double EPSILON = 0.001; diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java index 3011c573b..36c482862 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java @@ -99,12 +99,7 @@ public class FireworkController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java index 3bca2a3a7..f2c25b880 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java @@ -123,12 +123,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java index 65f994be2..02a3c23c2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java @@ -115,12 +115,7 @@ public class GlowItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java index 200a8a14a..17e3fc5c7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java @@ -118,12 +118,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java index 2bcaead5f..132d03e13 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java @@ -114,12 +114,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 c4947a489..44babc6a3 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 @@ -110,12 +110,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java index 2b5c1aa09..cca7efe07 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java @@ -104,12 +104,7 @@ public class LeashController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 f2663dfe4..dfc942407 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 @@ -119,12 +119,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java index 873d988e9..c05d89599 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java @@ -98,12 +98,7 @@ public class MarkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java index 3352d49f0..f771c7e54 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java @@ -99,12 +99,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java index 22a85ea31..b4f5f99e3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java @@ -99,12 +99,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java index bc392abe8..ed83c194b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java @@ -99,12 +99,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java index 3afb7ae52..3f3d2f362 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java @@ -86,12 +86,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } \ No newline at end of file diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java index de03891b7..e5b556acd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java @@ -98,12 +98,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java index 532eebcb8..ca1f79eb1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java @@ -86,12 +86,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } \ No newline at end of file diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java index c0f3c076b..d5cb4c448 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java @@ -86,12 +86,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } } \ No newline at end of file diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java index e7ecb77a7..d36d2f894 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java @@ -103,12 +103,7 @@ public class PaintingController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java index fb8add691..2b49bea46 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java @@ -98,12 +98,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 6cde62969..34847d7f5 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 @@ -101,12 +101,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java index b2ea6c17a..02a1eaf8f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java @@ -98,12 +98,7 @@ public class SnowballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java index ad182b347..e441f4eb5 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java @@ -99,12 +99,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java index e5df0f40f..30c275e45 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java @@ -99,12 +99,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } 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 8ca0718a9..8fddaa94b 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 @@ -102,12 +102,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java index 43d5f9eaa..f83add9c6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java @@ -103,12 +103,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java index 0d22054cd..d82f37258 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java @@ -99,12 +99,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java index c0efa3005..f9f0e8c8d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java @@ -98,12 +98,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java index 5c88beffb..ebea8e02e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java @@ -98,12 +98,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, Tag, d0); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index b016b2c73..24de203ad 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -312,6 +312,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.dimension.end.EndDragonFight; +import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.pathfinder.BlockPathTypes; import net.minecraft.world.level.pathfinder.Node; @@ -1872,6 +1873,15 @@ public class NMSImpl implements NMSBridge { return null; } + public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.tags.Tag tag, double d0) { + Vec3 old = entity.getDeltaMovement().add(0, 0, 0); + boolean res = entity.updateFluidHeightAndDoFluidPushing(tag, d0); + if (!npc.isPushableByFluids()) { + entity.setDeltaMovement(old); + } + return res; + } + public static void flyingMoveLogic(LivingEntity entity, Vec3 vec3d) { if (entity.isEffectiveAi() || entity.isControlledByLocalInstance()) { double d0 = 0.08D; @@ -2267,7 +2277,6 @@ public class NMSImpl implements NMSBridge { } private static final MethodHandle ADVANCEMENTS_PLAYER_FIELD = NMS.getFinalSetter(ServerPlayer.class, "cr"); - private static final Set BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.BEE, EntityType.SILVERFISH, EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, diff --git a/v1_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 06d2b870a..afe0695f4 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 @@ -241,12 +241,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 7a9939f21..8ee719257 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 @@ -183,12 +183,7 @@ public class BatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 713485dd1..5c4f79329 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 @@ -176,12 +176,7 @@ public class BeeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 cd984308a..44fe6a0f7 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 @@ -162,12 +162,7 @@ public class BlazeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 e7b8cd255..798fcee4f 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 @@ -211,12 +211,7 @@ public class CatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 2e06577bc..9fe405fad 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 @@ -216,12 +216,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 9aedbae95..616f2c90c 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 @@ -220,12 +220,7 @@ public class ChickenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 bc31a4211..f5af7f037 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 @@ -246,12 +246,7 @@ public class CodController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 e8a71cd2c..9d139dece 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 @@ -227,12 +227,7 @@ public class CowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 b4eea6ad3..8230ea876 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 @@ -219,12 +219,7 @@ public class CreeperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 9df7fa864..bb4770410 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 @@ -225,12 +225,7 @@ public class DolphinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 a9f01d228..d274bf0bb 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 @@ -196,12 +196,7 @@ public class DrownedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 0075a929b..ddbdd72f3 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 @@ -177,12 +177,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 e4945aab2..107bea916 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 @@ -217,12 +217,7 @@ public class EndermanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 43734bf5e..3df3a17bd 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 @@ -205,12 +205,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 c0f37f55e..78850dfae 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 @@ -191,12 +191,7 @@ public class EvokerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9f354b572..36f71ab2c 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 @@ -205,12 +205,7 @@ public class FoxController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 6c76f3944..6490536ef 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 @@ -162,12 +162,7 @@ public class GhastController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 52ea60a1f..9108b5204 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 @@ -199,12 +199,7 @@ public class GiantController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 961db09f3..1a6649581 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 @@ -199,12 +199,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 3839bcc51..eed4790e1 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 @@ -205,12 +205,7 @@ public class GoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 66689675c..4f4a3e529 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 @@ -206,12 +206,7 @@ public class GuardianController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9574a3c6b..78c1f3252 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 @@ -206,12 +206,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 00036b59a..c53f4fbcc 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 @@ -193,12 +193,7 @@ public class HoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 642af3e3d..8d4553b6e 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 @@ -252,12 +252,7 @@ public class HorseController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 87e90c0a0..500056018 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 @@ -253,12 +253,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 8e636366f..52abc5249 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 @@ -253,12 +253,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 b88defe31..8413ddf0b 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 @@ -253,12 +253,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 4bcadf49c..bc30ed25e 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 @@ -253,12 +253,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 e1cd2616b..c64d9871e 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 @@ -191,12 +191,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 8d18451dc..ff2e6cdf8 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 @@ -199,12 +199,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 4d2c6fe74..5319ac15f 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 @@ -223,12 +223,7 @@ public class LlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 15116b54c..80b55bc69 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 @@ -222,12 +222,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 364cea887..0c810b0c4 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 @@ -215,12 +215,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f8fccebb5..864943a44 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 @@ -212,12 +212,7 @@ public class OcelotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 ed99931ea..9dcf8908e 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 @@ -205,12 +205,7 @@ public class PandaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f2e684af2..713604c12 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 @@ -184,12 +184,7 @@ public class ParrotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 ec0645546..7937f0746 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 @@ -242,12 +242,7 @@ public class PhantomController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 6e13fa7de..e5dd999bc 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 @@ -220,12 +220,7 @@ public class PigController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f30b35b7e..bcedc301a 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 @@ -191,12 +191,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 20d14e05f..a8e347561 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 @@ -193,12 +193,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 b63238790..a6511af3e 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 @@ -193,12 +193,7 @@ public class PiglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 4eee3840a..f2925dd81 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 @@ -205,12 +205,7 @@ public class PillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 013e87760..7e7808fa2 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 @@ -181,12 +181,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 71948e6ae..46181fada 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 @@ -261,12 +261,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } private static float s(int i) { 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 1b144ca56..0452ab0e6 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 @@ -226,12 +226,7 @@ public class RabbitController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9e7a3868b..f2e8d683c 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 @@ -210,12 +210,7 @@ public class RavagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 94ae22342..c135b3451 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 @@ -237,12 +237,7 @@ public class SalmonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 76ed60674..7369bddd1 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 @@ -205,12 +205,7 @@ public class SheepController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 b95cfbf05..8e8842bad 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 @@ -216,12 +216,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 2a35f6e17..4d09ec153 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 @@ -206,12 +206,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f36164598..a63002701 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 @@ -199,12 +199,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 121fef706..3abbab446 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 @@ -199,12 +199,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 d3465abf1..8ce938d91 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 @@ -199,12 +199,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 ae4925640..f1628a78c 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 @@ -223,12 +223,7 @@ public class SlimeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f1795d334..6ce41b6bc 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 @@ -199,12 +199,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 22bef2691..134760ab2 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 @@ -199,12 +199,7 @@ public class SpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 a875c84bf..59dc53c57 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 @@ -199,12 +199,7 @@ public class SquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 616b9f989..32d9b354d 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 @@ -190,12 +190,7 @@ public class StriderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 c2f574a3c..31e38b7f8 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 @@ -224,12 +224,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 2a4ece001..2864c3ff1 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 @@ -239,12 +239,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 aae0d263f..0bfeb59ec 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 @@ -215,12 +215,7 @@ public class TurtleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } static class EmptyControllerJump extends JumpControl { 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 a4dbef8b1..0021af6de 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 @@ -169,12 +169,7 @@ public class VexController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 c3bda3306..00b2c4926 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 @@ -247,12 +247,7 @@ public class VillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 999bf583f..30fbf2bfb 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 @@ -206,12 +206,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 beb52dd97..97526db38 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 @@ -252,12 +252,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 ab1b72f63..bf57c80e2 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 @@ -199,12 +199,7 @@ public class WitchController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 d6fd7b2f6..76810dc5a 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 @@ -171,12 +171,7 @@ public class WitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 bddb6a487..3f715861c 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 @@ -213,12 +213,7 @@ public class WolfController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 ab0bb3283..21be93e8b 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 @@ -192,12 +192,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 e62444962..b69783c05 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 @@ -190,12 +190,7 @@ public class ZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 e1d63ae29..b63d839d8 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 @@ -190,12 +190,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 4babf9757..561f91214 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 @@ -190,12 +190,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java index b3d743eb4..7b3fe9ac3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java @@ -113,12 +113,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ArmorStandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ArmorStandController.java index 2dac05a97..7987135b5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ArmorStandController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ArmorStandController.java @@ -127,12 +127,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java index cf38cd7d1..55d46f95c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java @@ -247,12 +247,7 @@ public class BoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 7a8b39b99..1e6bd17c5 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 @@ -125,12 +125,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 44e3e090e..119de488b 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 @@ -130,12 +130,7 @@ public class EggController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java index 241d7df2c..24ca9dff8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java @@ -113,12 +113,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 9842048ca..805af67ef 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 @@ -117,12 +117,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java index ea7cf1c70..589598791 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java @@ -114,12 +114,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java index 31be8817f..a8dfba0c8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java @@ -121,12 +121,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java index f86f205ce..14c48d0cc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java @@ -107,12 +107,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java index 0e0660b5a..c442beaad 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java @@ -139,12 +139,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } private static final double EPSILON = 0.001; diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java index 3ea806a6d..266d59571 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java @@ -108,12 +108,7 @@ public class FireworkController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java index f979a261b..96857e029 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java @@ -131,12 +131,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java index b8dd9620b..98f67bbd1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java @@ -123,12 +123,7 @@ public class GlowItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java index 8d6577990..6da90f288 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java @@ -127,12 +127,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java index 75f7460f3..a82e3a357 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java @@ -122,12 +122,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 b9b4d3a7a..2ed7b194c 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 @@ -119,12 +119,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java index d43616627..ebd9c5515 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java @@ -113,12 +113,7 @@ public class LeashController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 264ab7e0c..8a432000b 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 @@ -127,12 +127,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java index 1a4e682e6..789dc2479 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java @@ -107,12 +107,7 @@ public class MarkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java index f22a38b66..af7ceac2a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java @@ -108,12 +108,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java index d28813127..a8be7bf4e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java @@ -108,12 +108,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java index aa31b8439..395579345 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java @@ -108,12 +108,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java index 5bca30575..26226014c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java @@ -95,12 +95,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } \ No newline at end of file diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java index 0319d936f..841e2fde8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java @@ -107,12 +107,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java index 1c3bc5c1c..96364cbd2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java @@ -95,12 +95,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } \ No newline at end of file diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java index 97cce775f..04c668de4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java @@ -95,12 +95,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } \ No newline at end of file diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java index 3e29cc6ea..45d0e1fe5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java @@ -112,12 +112,7 @@ public class PaintingController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java index c1b6673b4..f6204c729 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java @@ -107,12 +107,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 6408576a8..d060441b3 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 @@ -110,12 +110,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java index 7d4021cf9..b28810008 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java @@ -107,12 +107,7 @@ public class SnowballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java index 948232468..e6adef52e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java @@ -108,12 +108,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java index 0b89f8eae..140aa447a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java @@ -108,12 +108,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 a2155a4d7..0195971ed 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 @@ -111,12 +111,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java index 051401d7a..90c7cd72e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java @@ -112,12 +112,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java index 3e45bb736..950cecff8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java @@ -108,12 +108,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java index b15138b1e..4f9dff113 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java @@ -107,12 +107,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java index 1b4f9d21c..d16558b52 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java @@ -107,12 +107,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index dc4d0c81c..5cf444bea 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -314,6 +314,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.dimension.end.EndDragonFight; +import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.pathfinder.BlockPathTypes; import net.minecraft.world.level.pathfinder.Node; @@ -1880,6 +1881,15 @@ public class NMSImpl implements NMSBridge { return null; } + public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.tags.TagKey tag, double d0) { + Vec3 old = entity.getDeltaMovement().add(0, 0, 0); + boolean res = entity.updateFluidHeightAndDoFluidPushing(tag, d0); + if (!npc.isPushableByFluids()) { + entity.setDeltaMovement(old); + } + return res; + } + public static void flyingMoveLogic(LivingEntity entity, Vec3 vec3d) { if (entity.isEffectiveAi() || entity.isControlledByLocalInstance()) { double d0 = 0.08D; diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java index f99e58290..798b2d1f8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java @@ -148,7 +148,7 @@ public class PlayerNavigation extends PathNavigation { } return true; } - + private boolean canWalkOn(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7, double var9) { int var11 = var0 - var3 / 2; 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 60cf4501a..4980f6c08 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 @@ -221,12 +221,7 @@ public class AllayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 b89baddf2..c58188ed8 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 @@ -241,12 +241,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 88e80b93d..2e04ea3f6 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 @@ -174,12 +174,7 @@ public class BatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 7dc848c3d..75fe6ad09 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 @@ -167,12 +167,7 @@ public class BeeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 6cfd2627e..1d41b17e9 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 @@ -162,12 +162,7 @@ public class BlazeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java index 7dd7adf8c..266f63b1e 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java @@ -229,12 +229,7 @@ public class CamelController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 595bdf4e1..55379dccd 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 @@ -211,12 +211,7 @@ public class CatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 43eb1971b..cba3627db 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 @@ -207,12 +207,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 2564c9cf1..2a9c61403 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 @@ -220,12 +220,7 @@ public class ChickenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 41da59289..1700141b2 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 @@ -246,12 +246,7 @@ public class CodController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 489a56e64..9fb99469f 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 @@ -227,12 +227,7 @@ public class CowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 f0e165a5d..92773e179 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 @@ -219,12 +219,7 @@ public class CreeperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 53098d110..5a1e0678e 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 @@ -225,12 +225,7 @@ public class DolphinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 d64768e35..79c0347bc 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 @@ -197,12 +197,7 @@ public class DrownedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 da36ed92a..5621c09c1 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 @@ -177,12 +177,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 2fd08328d..0f7c46f78 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 @@ -218,12 +218,7 @@ public class EndermanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 8765660b0..a0e9fd724 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 @@ -206,12 +206,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 b8612e1a9..4ddd1378c 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 @@ -192,12 +192,7 @@ public class EvokerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 45f81035f..b60cd6588 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 @@ -205,12 +205,7 @@ public class FoxController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 1d35ae111..5ad5818f9 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 @@ -208,12 +208,7 @@ public class FrogController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 5455200d5..ed0d396e9 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 @@ -162,12 +162,7 @@ public class GhastController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 beffea36b..fa1bbccc7 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 @@ -200,12 +200,7 @@ public class GiantController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9259a54c7..a3d166327 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 @@ -200,12 +200,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 56576fe2d..a4727f531 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 @@ -205,12 +205,7 @@ public class GoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 36c070202..ee5deb99a 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 @@ -207,12 +207,7 @@ public class GuardianController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 c2ed1d6a0..f80349f81 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 @@ -207,12 +207,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9301df44e..9d7afb348 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 @@ -197,12 +197,7 @@ public class HoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 a2c031ab3..b47feaf35 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 @@ -252,12 +252,7 @@ public class HorseController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9c0baaa4f..f65a3bfdd 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 @@ -252,12 +252,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 61f859000..874940c86 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 @@ -252,12 +252,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 8132a13b3..3fbe604e7 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 @@ -252,12 +252,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 7448ed7cb..2a7bf206f 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 @@ -252,12 +252,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 24c6e6cde..3de60c64b 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 @@ -192,12 +192,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 95a4524fd..d1800c5a4 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 @@ -200,12 +200,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 7481e3c8d..1cfd185bd 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 @@ -223,12 +223,7 @@ public class LlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 7316c1467..b7bbd9f5c 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 @@ -222,12 +222,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 aa0f4621a..4118f35c6 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 @@ -215,12 +215,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 3d8f1d856..167dae986 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 @@ -212,12 +212,7 @@ public class OcelotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 297f3d75d..9aba841e9 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 @@ -205,12 +205,7 @@ public class PandaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 18e387a88..f16c47b43 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 @@ -175,12 +175,7 @@ public class ParrotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 d0f80f2fa..dcdd62338 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 @@ -240,12 +240,7 @@ public class PhantomController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 db38c7246..cc8a75347 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 @@ -220,12 +220,7 @@ public class PigController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 27016f43b..050ec2e90 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 @@ -192,12 +192,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 7d06394c1..b5b0ed515 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 @@ -194,12 +194,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 7b7e12d8a..8af860f6e 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 @@ -194,12 +194,7 @@ public class PiglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9782639c3..7ac75053f 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 @@ -205,12 +205,7 @@ public class PillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f3ad492e5..59c4ab625 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 @@ -171,12 +171,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9f960fd04..3e6936255 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 @@ -261,12 +261,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } private static float s(int i) { 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 805b05388..d946ede4e 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 @@ -226,12 +226,7 @@ public class RabbitController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 edea56f37..a168dae2f 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 @@ -210,12 +210,7 @@ public class RavagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 e476054d2..789be426f 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 @@ -237,12 +237,7 @@ public class SalmonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 51441f251..9a34c5a8d 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 @@ -205,12 +205,7 @@ public class SheepController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 d86ab1851..025b7792d 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 @@ -217,12 +217,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 b6bdb050f..44c38963b 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 @@ -207,12 +207,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 9e0bbebed..de3f7ab9e 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 @@ -200,12 +200,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 ce98c42cc..f4459880a 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 @@ -200,12 +200,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f038c70ad..26bfdd83a 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 @@ -200,12 +200,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 bb30a06ba..860a22cd1 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 @@ -223,12 +223,7 @@ public class SlimeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 e002ac110..787f6a4c6 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 @@ -200,12 +200,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 7079ef398..4689ddcaa 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 @@ -200,12 +200,7 @@ public class SpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 17beb8b0f..5f94923ec 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 @@ -200,12 +200,7 @@ public class SquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 14574d578..5d14c4d4c 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 @@ -191,12 +191,7 @@ public class StriderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 b79eeb0ab..ad58135ac 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 @@ -237,12 +237,7 @@ public class TadpoleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f1a214628..5665369a3 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 @@ -224,12 +224,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 c2c44b8d1..de948ee03 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 @@ -239,12 +239,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f86e2c391..2797b40fb 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 @@ -215,12 +215,7 @@ public class TurtleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } static class EmptyControllerJump extends JumpControl { 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 ce401bdb5..c3e7f097d 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 @@ -160,12 +160,7 @@ public class VexController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 147403444..4a83463ca 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 @@ -247,12 +247,7 @@ public class VillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 03f77be8c..c832f8bfd 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 @@ -206,12 +206,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 694d8c04b..d730b3af3 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 @@ -252,12 +252,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 c0143ad96..c52bf8ad9 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 @@ -202,12 +202,7 @@ public class WardenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 129dc5401..3a1bcf2be 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 @@ -200,12 +200,7 @@ public class WitchController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 d8cf13db1..58f11f310 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 @@ -171,12 +171,7 @@ public class WitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 134f4f7ce..f0f9ad237 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 @@ -213,12 +213,7 @@ public class WolfController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 4cca52874..00843ecf6 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 @@ -193,12 +193,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 36c263333..4b5bf1efe 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 @@ -191,12 +191,7 @@ public class ZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 a231c121c..8cb9709f5 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 @@ -191,12 +191,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 53d2f5496..4fc69a444 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 @@ -192,12 +192,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java index 9b5f0ed5d..2fe8795e8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java @@ -113,12 +113,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java index e6f173cc8..a9861d404 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java @@ -127,12 +127,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/BoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/BoatController.java index bd4558f68..12fd03462 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/BoatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/BoatController.java @@ -246,12 +246,7 @@ public class BoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ChestBoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ChestBoatController.java index b4a86334d..78bc10789 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ChestBoatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ChestBoatController.java @@ -247,12 +247,7 @@ public class ChestBoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 f6494a9ea..e5fcd64a4 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 @@ -125,12 +125,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 16707dd0b..f9f4e7ece 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 @@ -130,12 +130,7 @@ public class EggController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java index d88a333d6..ac1b9a936 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java @@ -113,12 +113,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } 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 6223a8f5b..a874bb45f 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 @@ -117,12 +117,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java index 70dd59c47..2429cfcd1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java @@ -114,12 +114,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EvokerFangsController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EvokerFangsController.java index 5af485c1c..05bc91096 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EvokerFangsController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EvokerFangsController.java @@ -121,12 +121,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java index bd0d63d5c..ecd31cdb2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java @@ -107,12 +107,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FallingBlockController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FallingBlockController.java index d86ce0a16..b40a6c85b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FallingBlockController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FallingBlockController.java @@ -138,12 +138,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } private static final double EPSILON = 0.001; diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java index 861b94522..6af5d3fc0 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java @@ -108,12 +108,7 @@ public class FireworkController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java index c2ae97ab0..ff1ffc72d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java @@ -131,12 +131,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java index 1cfaee3e4..ae47258f4 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java @@ -124,12 +124,7 @@ public class GlowItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java index 3be6fe0e5..ed3798ccd 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java @@ -127,12 +127,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java index ba9df8622..d31227be6 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java @@ -123,12 +123,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 6abce5cd1..3666b9bd8 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 @@ -119,12 +119,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java index e544ec45d..4b1ae37b8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java @@ -113,12 +113,7 @@ public class LeashController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 b058c51f4..0dd145de5 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 @@ -127,12 +127,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java index d56863249..c5a1c13d2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java @@ -107,12 +107,7 @@ public class MarkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java index ff96c75e9..79cc5eaa9 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java @@ -108,12 +108,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java index b01a2cd68..c735b4978 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java @@ -108,12 +108,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java index 63a776a69..dc857e614 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java @@ -108,12 +108,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java index 9d1eb058a..e52b0974a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java @@ -95,12 +95,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } \ No newline at end of file diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java index dd0974591..2da85e05d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java @@ -107,12 +107,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java index 6f53cca67..66b0ceda3 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java @@ -95,12 +95,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } \ No newline at end of file diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java index debe1b070..2d926cc65 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java @@ -95,12 +95,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } } \ No newline at end of file diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java index a28a3d1ea..f5f1f6f12 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java @@ -112,12 +112,7 @@ public class PaintingController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java index a69084b5a..15f0293ac 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java @@ -107,12 +107,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f6ba156a9..bb8a53c3d 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 @@ -110,12 +110,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java index f7b7bc14d..47c139635 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java @@ -107,12 +107,7 @@ public class SnowballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java index e17a786b8..c9893f81a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java @@ -108,12 +108,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java index 7f37fd525..f74d5a8a2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java @@ -108,12 +108,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 f7cb3de41..824b2c753 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 @@ -111,12 +111,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java index 6b2b15258..ee63c0f66 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java @@ -112,12 +112,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java index 06d07589e..78935db4a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java @@ -108,12 +108,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java index 529638786..b98cb6fa3 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java @@ -107,12 +107,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java index 374a98b51..fe505ce04 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java @@ -107,12 +107,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; + return NMSImpl.fluidPush(npc, this, tagkey, d0); } } 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 04b4a2d3b..2d3a399c4 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 @@ -334,6 +334,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.dimension.end.EndDragonFight; +import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.pathfinder.BlockPathTypes; import net.minecraft.world.level.pathfinder.Node; @@ -2016,6 +2017,15 @@ public class NMSImpl implements NMSBridge { return null; } + public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.tags.TagKey tag, double d0) { + Vec3 old = entity.getDeltaMovement().add(0, 0, 0); + boolean res = entity.updateFluidHeightAndDoFluidPushing(tag, d0); + if (!npc.isPushableByFluids()) { + entity.setDeltaMovement(old); + } + return res; + } + public static void flyingMoveLogic(LivingEntity entity, Vec3 vec3d) { if (entity.isEffectiveAi() || entity.isControlledByLocalInstance()) { double d0 = 0.08D; diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNavigation.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNavigation.java index bcbcb77c3..3cb7d9cb8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNavigation.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNavigation.java @@ -148,7 +148,7 @@ public class PlayerNavigation extends PathNavigation { } return true; } - + private boolean canWalkOn(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7, double var9) { int var11 = var0 - var3 / 2;