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 fdfbce125..d0d193435 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,7 +78,7 @@ public class BatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d79bbc488..0f8d6bb7d 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,7 +75,7 @@ public class BlazeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 270229058..b84d0ff9e 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,7 +93,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9612684b7..aafdd9803 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,7 +106,7 @@ public class ChickenController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c331852b7..d56e8b827 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,7 +114,7 @@ public class CodController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9dabcfec0..56fa8607e 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,7 +119,7 @@ public class CowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f129d39c8..c42ee7c90 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,7 +96,7 @@ public class CreeperController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2049566cd..497acfada 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,7 +108,7 @@ public class DolphinController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 bd6641ba4..93f363a85 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,7 +93,7 @@ public class DrownedController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 25d6e4849..05c164026 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,7 +77,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 aec61c71b..66fcb010b 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,7 +93,7 @@ public class EndermanController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 462c20a0d..bfdada294 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,7 +93,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 08b7521f8..0e48b7801 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,7 +79,7 @@ public class EvokerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 cf885cd96..c64c6f00d 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,7 +61,7 @@ public class GhastController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2cce4e7a2..8a8a1ef37 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,7 +79,7 @@ public class GiantController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f00262405..3fdbacf8b 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,7 +81,7 @@ public class GuardianController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 450a6b689..bc87f2172 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,7 +81,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 087519ed8..3ec867579 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,7 +108,7 @@ public class HorseController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d5743c3de..6f46b1d17 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,7 +108,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 395dd4015..e30f1b7cf 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,7 +108,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c35646ce9..bcec79807 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,7 +109,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5ec197cf3..bc22c98f2 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,7 +109,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4e8483cbf..fd53df9ed 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,7 +79,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 65f125cca..84fa80bee 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,7 +79,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c71015be7..ee1cf33ef 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,7 +101,7 @@ public class LlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 65f2dd7ff..b09c10e6a 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,7 +85,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8bb5d54ad..0182ed3ba 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,7 +100,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 fd0269a67..eddc2730f 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,7 +90,7 @@ public class OcelotController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 400eabe34..8022a87fb 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,7 +72,7 @@ public class ParrotController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9dcbfbc6e..74cfb5109 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,7 +90,7 @@ public class PhantomController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d1487d88b..cd1bcf85a 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,7 +91,7 @@ public class PigController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 73f635246..f161408d3 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,7 +80,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 180df8d17..9da3b261a 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,7 +72,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 eaa40c204..25e3e3ef7 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,7 +101,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a80e5ae3f..d363dc222 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,7 +91,7 @@ public class RabbitController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 192c75aa4..0cb379215 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,7 +100,7 @@ public class SalmonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 85aee7844..f236d9cf0 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,7 +90,7 @@ public class SheepController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4db3cdce3..c5980bb9f 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,7 +82,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 caf70974a..e5a4fa9fb 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,7 +79,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 df2c48ae1..f8e8b80db 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,7 +79,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7ab902de4..c79874f69 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,7 +79,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7dac97a17..44e205a27 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,7 +79,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 66e462012..be6bef5b3 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,7 +85,7 @@ public class SlimeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 fadb484ff..1eff97dcf 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,7 +79,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 6a566fb09..a621830b8 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,7 +79,7 @@ public class SpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 0b6466c54..204d00708 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,7 +79,7 @@ public class SquidController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 855d078b5..c6170eed5 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,7 +100,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5971ad6d5..c12f57028 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,7 +88,7 @@ public class TurtleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d584b38d8..8c6bb554c 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,7 +64,7 @@ public class VexController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 dab9cb3e4..4faedfd7f 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,7 +110,7 @@ public class VillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 bcbe2f1a5..9aa4e6eae 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,7 +90,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e2585441e..e1bab8e20 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,7 +79,7 @@ public class WitchController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c7bafb513..3d5858daf 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,7 +61,7 @@ public class WitherController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 27e1d16dd..29a14e0bd 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,7 +92,7 @@ public class WolfController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 27d418e9c..d3022ffef 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,7 +79,7 @@ public class ZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 0b5b6c0fb..7c2ba4249 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,7 +79,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7a5119e58..b52aa40d9 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,7 +79,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 29441edb4..b99b94c07 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 @@ -64,7 +64,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c2b1308be..e1532ef2b 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 @@ -81,7 +81,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 1470e7fc5..327bd30a0 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,7 +64,7 @@ public class BoatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 53840c47c..cb845fac2 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,7 +64,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a189f0a76..06ec58529 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 @@ -80,7 +80,7 @@ public class EggController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 675eef0a3..4f1916f57 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 @@ -64,7 +64,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9ebcc846d..f64d86132 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 @@ -64,7 +64,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 0afa742d4..21f15ebdd 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 @@ -64,7 +64,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7e1d9dfd5..785454bee 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 @@ -67,7 +67,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c097bcdff..2e7cc4bf0 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 @@ -50,7 +50,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 67c7175da..91a731fdc 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,7 +72,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ea2f1ab44..7bc85dec1 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 @@ -50,7 +50,7 @@ public class FireworkController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 1a5253378..91c8b25b4 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 @@ -59,7 +59,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 350006c0f..5f3b18020 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 @@ -63,7 +63,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 36ee6e0ef..234263494 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 @@ -63,7 +63,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 18c1b8469..eb081e2ab 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,7 +50,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f492f467f..6666dae38 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 @@ -50,7 +50,7 @@ public class LeashController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 47e37d396..97120cad7 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 @@ -68,7 +68,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 cf2ab95e0..dcb0f220a 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,7 +50,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 317fbbd33..af2b4f24c 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,7 +50,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9fb2e7c96..81c5d6832 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,7 +50,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 36699234c..9266a866c 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,7 +46,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f4d17b6ad..4b35a39d6 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,7 +50,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 0f2f3ef79..cb1396b35 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,7 +46,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 82ab055a0..533fd26e6 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,7 +46,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c809a689f..55b6bea41 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 @@ -50,7 +50,7 @@ public class PaintingController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3fc7a13ee..25efb0462 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 @@ -50,7 +50,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2e5ac746c..c69b759d1 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 @@ -50,7 +50,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 514c38b62..898f87b13 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 @@ -50,7 +50,7 @@ public class SnowballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8a23238f1..f3c4e1819 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 @@ -50,7 +50,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f80a63706..bb76428f2 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 @@ -50,7 +50,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 0d49f15c4..bfd344ee5 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 @@ -50,7 +50,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a61f8e948..1bfeaf6c5 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 @@ -51,7 +51,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 22c37a02c..71ea2fb38 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 @@ -50,7 +50,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 25f51f469..f041fca7d 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 @@ -50,7 +50,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 05c5d421f..87e53860b 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 @@ -50,7 +50,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 62f5a4b9d..b9ba7a522 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 @@ -16,6 +16,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; import java.util.function.Consumer; +import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -259,7 +260,6 @@ 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; @@ -1709,11 +1709,11 @@ public class NMSImpl implements NMSBridge { return null; } - public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.server.v1_13_R2.Tag tag) { + public static boolean fluidPush(NPC npc, Entity entity, Supplier func) { double mx = entity.motX; double my = entity.motY; double mz = entity.motZ; - boolean res = entity.b(tag); + boolean res = func.get(); if (!npc.isPushableByFluids()) { entity.motX = mx; entity.motY = my; 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 9533a9415..56aacdd12 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 @@ -79,7 +79,7 @@ public class BatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ddb2bfb2c..e49cfe119 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 @@ -76,7 +76,7 @@ public class BlazeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 17fee61b6..90d4e2c9f 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,7 +106,7 @@ public class CatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8f5c70be7..795789976 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,7 +93,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 49716a6e5..98b2a7a39 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,7 +107,7 @@ public class ChickenController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3e1d18d88..663ce87e7 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,7 +112,7 @@ public class CodController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 be7bc3b65..2df5b1478 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,7 +121,7 @@ public class CowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 87a99f635..94c16f578 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,7 +96,7 @@ public class CreeperController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 842111700..24845b3b7 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,7 +107,7 @@ public class DolphinController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4ce055e0e..c535ad0b6 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,7 +93,7 @@ public class DrownedController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d782e8fc9..4e9ab87d3 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,7 +77,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 12deefc24..850f76aa7 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,7 +101,7 @@ public class EndermanController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d883f55fa..ac2013d1a 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,7 +93,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b2c2625ef..d1c05b612 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,7 +79,7 @@ public class EvokerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5ab687abf..2c81f71d1 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,7 +92,7 @@ public class FoxController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b81d2a26c..874a87997 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 @@ -62,7 +62,7 @@ public class GhastController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 457735576..004e5a2ad 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,7 +79,7 @@ public class GiantController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 31ba6df45..516a3c866 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,7 +79,7 @@ public class GuardianController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9b063922f..c18df4842 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,7 +79,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 1101892da..0b5bb3e2e 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,7 +112,7 @@ public class HorseController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 01a103473..e4542185f 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,7 +111,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3b54e4572..749ed679a 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,7 +111,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 52ad29db9..01be42ff8 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,7 +112,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e08a1261d..4fd1e55fd 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,7 +112,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f32b32418..1094296fb 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,7 +79,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 dab98ac23..d4809300a 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,7 +79,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8ff53bbaf..f1011e7ba 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,7 +104,7 @@ public class LlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ebf34da4f..ccd9fa4a3 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,7 +85,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 413a7e0bf..a8df28dee 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,7 +103,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2df293f82..6b1cd05fe 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,7 +93,7 @@ public class OcelotController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 aced8e021..46b37268d 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,7 +92,7 @@ public class PandaController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 88f771db8..2ee27a9c2 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 @@ -73,7 +73,7 @@ public class ParrotController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8f4bdfd2b..1797a3d0f 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,7 +87,7 @@ public class PhantomController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 fddd93095..aef17406d 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,7 +94,7 @@ public class PigController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f1de1b14c..81748f291 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,7 +80,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2acb49538..4bc4714bd 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,7 +92,7 @@ public class PillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e422f9d2c..59073866c 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 @@ -76,7 +76,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5dfc3a50a..555957a39 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,7 +109,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3202bdee5..b83f1278d 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,7 +94,7 @@ public class RabbitController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a24be9305..5777319ae 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,7 +92,7 @@ public class RavagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3d803e6ab..437b1928a 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,7 +98,7 @@ public class SalmonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 961758ca2..4ce3f6c90 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,7 +93,7 @@ public class SheepController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 20e087611..5fae791f2 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,7 +80,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9cefe4c9b..050f098ce 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,7 +79,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e27e3d600..d8cbedb2a 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,7 +79,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5109c41f1..56577cd5a 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,7 +79,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 06c798069..05b8d9ea8 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,7 +79,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 050f5b3e7..373a21dba 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,7 +85,7 @@ public class SlimeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2561c5e8b..414e2a5f7 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,7 +79,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 22f59d23b..bace666af 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,7 +79,7 @@ public class SpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d346311e3..82d14afb6 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,7 +79,7 @@ public class SquidController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 bae3168d8..1f43901ef 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,7 +107,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 93cd8273d..0a3bd61f6 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,7 +98,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 6f77e4fc8..a263b1af0 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,7 +86,7 @@ public class TurtleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b63ff145c..f61e0c48a 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 @@ -65,7 +65,7 @@ public class VexController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a74b8cfde..3d4dd9d34 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,7 +118,7 @@ public class VillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 69665e610..82dbe9f19 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,7 +93,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 52247b8a7..4b8efe4e7 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,7 +116,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 bbb91ea05..1fc3b697c 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,7 +79,7 @@ public class WitchController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 99bd1005d..a9fee009c 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 @@ -62,7 +62,7 @@ public class WitherController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 779d56e45..4a71ced57 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,7 +95,7 @@ public class WolfController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 546215ae5..0c81d24fa 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,7 +79,7 @@ public class ZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 833582557..903fb8933 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,7 +79,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e9144da3e..4d62f0343 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,7 +79,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a917433cc..44486b35f 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 @@ -65,7 +65,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ee2bb3525..2800b05b3 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,7 +82,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3f5aec599..d44699c7d 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 @@ -65,7 +65,7 @@ public class BoatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e7ce80795..0dec92cca 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 @@ -65,7 +65,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7752361e4..f8fdeefd3 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 @@ -81,7 +81,7 @@ public class EggController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 88a62bfca..bf8e07793 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 @@ -65,7 +65,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 73a56f424..62f86fd80 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 @@ -65,7 +65,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 0ddaa6d2f..e615ed1ee 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 @@ -65,7 +65,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4bee5d7c2..d5bc8d7d9 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,7 +68,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5225b8ab8..757b79d2d 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 @@ -51,7 +51,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 71d268e8f..88cda8271 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,7 +74,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 64df0a778..16c732b67 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 @@ -51,7 +51,7 @@ public class FireworkController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c4c1d94d9..45e18dab1 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 @@ -65,7 +65,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3a087e57d..91f621a60 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 @@ -64,7 +64,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d0ca71d27..131b77ed3 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 @@ -64,7 +64,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 fd572992f..a62aba991 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 @@ -51,7 +51,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 95f8cb754..2158a4fbe 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 @@ -51,7 +51,7 @@ public class LeashController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b2b5aa35a..a5d375145 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 @@ -70,7 +70,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 bee6f57e5..29b05b16e 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 @@ -51,7 +51,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 6d3857c1a..4b5c62f12 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 @@ -51,7 +51,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7273d65ef..58dde451e 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 @@ -51,7 +51,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4b219da4b..3b9499318 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 @@ -47,7 +47,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7046a1fe2..818c44f66 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 @@ -51,7 +51,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d18e5d4d8..32380870e 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 @@ -47,7 +47,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d2186bdc7..d58d66691 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 @@ -47,7 +47,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a0c5fdbac..125a7b8a3 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 @@ -51,7 +51,7 @@ public class PaintingController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9eacf8968..ea4e0f3e1 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 @@ -51,7 +51,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5ffb67606..e3a12f0c7 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 @@ -51,7 +51,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9a31f8eac..bd7a4d59f 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 @@ -51,7 +51,7 @@ public class SnowballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b19def72f..71f3e4ab6 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 @@ -51,7 +51,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5afca2fcc..9084aef95 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 @@ -51,7 +51,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b07760c7c..34daecded 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 @@ -51,7 +51,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 17235cf16..ce4002b34 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 @@ -52,7 +52,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ab786d66e..accb7b479 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 @@ -51,7 +51,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b12172d50..fc16acf25 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 @@ -51,7 +51,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 31ab7d19c..8bb578cdf 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 @@ -51,7 +51,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 87d604145..7773810ba 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 @@ -16,6 +16,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeMap; import java.util.function.Consumer; +import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -276,7 +277,6 @@ 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; @@ -1800,9 +1800,9 @@ public class NMSImpl implements NMSBridge { return null; } - public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.server.v1_14_R1.Tag tag) { + public static boolean fluidPush(NPC npc, Entity entity, Supplier func) { Vec3D old = entity.getMot().add(0, 0, 0); - boolean res = entity.b(tag); + boolean res = func.get(); if (!npc.isPushableByFluids()) { entity.setMot(old); } 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 d81e0162d..8dc7da0d1 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 @@ -72,7 +72,7 @@ public class BatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 50f49162b..5e49ba9f2 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 @@ -69,7 +69,7 @@ public class BeeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3a5de561c..8b2f4a64b 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 @@ -69,7 +69,7 @@ public class BlazeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 1f13f98d3..b8a015e88 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,7 +100,7 @@ public class CatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 eb9d47bd4..a04637e24 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,7 +87,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 004762387..d37e6029b 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,7 +101,7 @@ public class ChickenController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9570413ca..318aded32 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,7 +110,7 @@ public class CodController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b6d7e151b..a2349d6a3 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,7 +115,7 @@ public class CowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 82dd9195a..86ed43700 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,7 +90,7 @@ public class CreeperController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a2929ea0e..ae3ea9b21 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,7 +105,7 @@ public class DolphinController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 97ba4f5ac..7e3e23b08 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,7 +87,7 @@ public class DrownedController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 fbf41c4a5..b9af0f498 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,7 +70,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7e8ca62c9..4c5e0806d 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,7 +95,7 @@ public class EndermanController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3970cc189..c00ff88d1 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,7 +87,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 26ac6456a..ecebc4999 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,7 +81,7 @@ public class EvokerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 36b543478..c88f10ae9 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,7 +94,7 @@ public class FoxController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 05ca851a8..e8977853e 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 @@ -63,7 +63,7 @@ public class GhastController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 191543030..1630448a7 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,7 +81,7 @@ public class GiantController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f5887d848..7212ec5c8 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,7 +81,7 @@ public class GuardianController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c3f79c8ae..ad8ef49a7 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,7 +81,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e5b9c149e..a915e5820 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,7 +114,7 @@ public class HorseController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 18a4ca867..408cf97f1 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,7 +113,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 28e4a5cf5..e9c8ca81d 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,7 +113,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ad927304a..497ceac86 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,7 +114,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c17daded1..40cdcc84c 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,7 +114,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2ea29cd38..8b6c133a3 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,7 +81,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 638f8d8f5..d9b4fd018 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,7 +81,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9d554c7da..a09444895 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,7 +106,7 @@ public class LlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 0ff0234d9..142e71a40 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,7 +91,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d296295d2..1b49f3405 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,7 +105,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4e70a642a..b269ad15d 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,7 +96,7 @@ public class OcelotController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 07f6aeee5..d17740dec 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,7 +94,7 @@ public class PandaController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5b5f75572..ca6434aaf 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 @@ -74,7 +74,7 @@ public class ParrotController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f00ea421d..8f1f8ef78 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,7 +95,7 @@ public class PhantomController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7903d43f8..e82e40dc6 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,7 +96,7 @@ public class PigController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ad5548a56..301570caf 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,7 +82,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 1ab94e46d..c27886e36 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,7 +94,7 @@ public class PillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 358b4ac58..53436811a 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 @@ -77,7 +77,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2594ce37b..a1665aafb 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,7 +115,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 76b4fba59..c3da2fe3d 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,7 +96,7 @@ public class RabbitController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4146b43b9..50e437c26 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,7 +94,7 @@ public class RavagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 479fcafff..63308491f 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,7 +104,7 @@ public class SalmonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a5023443d..dcaa39373 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,7 +95,7 @@ public class SheepController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5942d8dcd..2916793d5 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,7 +82,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 cbf41c68e..c9006fab0 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,7 +81,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 595de22e6..185db4212 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,7 +81,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 58b2f56eb..4666d8c15 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,7 +81,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f863b5b8d..5d27eb2b4 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,7 +81,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 2512899bb..7ab0ff653 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,7 +91,7 @@ public class SlimeController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 6fb56de13..d73700427 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,7 +81,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 643a46e1d..42f112fd5 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,7 +81,7 @@ public class SpiderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 153082faa..181bc06a7 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,7 +81,7 @@ public class SquidController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d2f575088..fa46a42dd 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,7 +109,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f69cf7e28..077535f01 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,7 +104,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 503c14a37..51ae8b5a7 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,7 +95,7 @@ public class TurtleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e24a67356..745447473 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 @@ -66,7 +66,7 @@ public class VexController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 1df0e2459..1ef7b0f36 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,7 +119,7 @@ public class VillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 96213f533..913ebf250 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,7 +95,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 59c51e0f6..d1aa2b685 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,7 +116,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7e47690d5..184c5ce2d 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,7 +80,7 @@ public class WitchController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a63715f8d..63a372ecc 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 @@ -63,7 +63,7 @@ public class WitherController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 00467c70b..37ea35642 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,7 +97,7 @@ public class WolfController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8c29b6926..715b96ecf 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,7 +81,7 @@ public class ZombieController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 773e244ad..171908432 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,7 +81,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4d96ad84f..51254cfdc 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,7 +81,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 641e62859..aaf785793 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 @@ -58,7 +58,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 509e0026b..75abb23a4 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,7 +75,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 473d67ef5..99a5702e8 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,7 +72,7 @@ public class BoatController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c82536a57..f4e8f37b3 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 @@ -58,7 +58,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d968e419b..dc28c12c7 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 @@ -74,7 +74,7 @@ public class EggController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 622c42942..f3614defb 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 @@ -58,7 +58,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a4b1c6e75..56cb3925f 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 @@ -58,7 +58,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 d8e28b81f..ffb31298b 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 @@ -58,7 +58,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a261bfc5e..dc7bae164 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,7 +69,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b25338083..1f43d3261 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 @@ -52,7 +52,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 4ea5d58d4..453bb4e80 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,7 +74,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9dc077901..741da0d9e 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 @@ -52,7 +52,7 @@ public class FireworkController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 5dee9611a..23026bc17 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 @@ -66,7 +66,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9121090ee..e4f08edb7 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 @@ -64,7 +64,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 62b3e9515..b026e398f 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 @@ -64,7 +64,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 59e931e65..8daa42bfe 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 @@ -52,7 +52,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8643703bd..1ba16a364 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 @@ -52,7 +52,7 @@ public class LeashController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 525044323..07436730e 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 @@ -71,7 +71,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 8533ff75e..2c2c724f6 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 @@ -52,7 +52,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 050ad1d4f..fd4133af8 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 @@ -52,7 +52,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 9b0635315..0d222e1a9 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 @@ -52,7 +52,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a8a7952d3..c4c78a14a 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 @@ -47,7 +47,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b88372fd9..8aa35a30c 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 @@ -52,7 +52,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 dcfb66495..f50a16e55 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 @@ -47,7 +47,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 3881892f3..b3c669e30 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 @@ -47,7 +47,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 7059a92fb..4c2ef9eba 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 @@ -52,7 +52,7 @@ public class PaintingController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 b4cae9846..23577e5fe 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 @@ -52,7 +52,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 f615b6fa8..8d757de74 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 @@ -52,7 +52,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 e13b46f33..e394d550d 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 @@ -52,7 +52,7 @@ public class SnowballController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a36fb83e9..7655fbfa7 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 @@ -52,7 +52,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 df1867ac5..0d5de56fa 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 @@ -52,7 +52,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 a71c1b6de..ae9e9a2d5 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 @@ -52,7 +52,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 fbbcd58f7..a01afdf23 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 @@ -53,7 +53,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 1a506329d..9b64d1cb3 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 @@ -52,7 +52,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 743d77dd6..3f4fea975 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 @@ -52,7 +52,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 c4678745e..5381dfac4 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 @@ -52,7 +52,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean b(Tag tag) { - return NMSImpl.fluidPush(npc, this, tag); + return NMSImpl.fluidPush(npc, this, () -> super.b(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 ec57e0d9f..1dff84a0d 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 @@ -16,6 +16,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeMap; import java.util.function.Consumer; +import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -280,7 +281,6 @@ 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; @@ -1854,9 +1854,9 @@ public class NMSImpl implements NMSBridge { return null; } - public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.server.v1_15_R1.Tag tag) { + public static boolean fluidPush(NPC npc, Entity entity, Supplier func) { Vec3D old = entity.getMot().add(0, 0, 0); - boolean res = entity.b(tag); + boolean res = func.get(); if (!npc.isPushableByFluids()) { entity.setMot(old); } 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 083c369e1..53d8a7fb1 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 @@ -72,7 +72,7 @@ public class BatController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 30e8593ba..8b3a4f937 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 @@ -69,7 +69,7 @@ public class BeeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 94141e74e..b730e6e61 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 @@ -69,7 +69,7 @@ public class BlazeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 f9d76bd6f..76cfa34b8 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,7 +92,7 @@ public class CatController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 f388f4d42..17cccd237 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,7 +79,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 bfc44f3c4..092c0252e 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,7 +93,7 @@ public class ChickenController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 2b7126dcd..aa60d598c 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,7 +92,7 @@ public class CodController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 d1c492acf..dd21bbe04 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,7 +97,7 @@ public class CowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 11a0f15ec..54ae767cc 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,7 +83,7 @@ public class CreeperController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 5ec5b9684..1eacef1bf 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,7 +92,7 @@ public class DolphinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 d2e409e5a..bceee9e5f 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,7 +79,7 @@ public class DrownedController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 29422eb50..e22544a1b 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,7 +70,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 7e83e8dfc..864adcf43 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,7 +87,7 @@ public class EndermanController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 4d5190cdb..85f142582 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,7 +79,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 7e7687070..c15ed97ed 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,7 +73,7 @@ public class EvokerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 1afdc9d03..99e5116e6 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,7 +86,7 @@ public class FoxController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 170df4347..6d2a7c3f3 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 @@ -63,7 +63,7 @@ public class GhastController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 dd1728c50..7bd6d3e8b 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,7 +73,7 @@ public class GiantController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 f4178f9ec..f47576fc0 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,7 +73,7 @@ public class GuardianController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 c2dc714c2..ef8110666 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,7 +73,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 3113cfd37..6ba8108ef 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,7 +73,7 @@ public class HoglinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 b3b48a1b4..33f6e5731 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,7 +106,7 @@ public class HorseController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 22cefeef2..6a7de214b 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,7 +102,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 75716c4c2..d585ebdf1 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,7 +102,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 a488a5c95..193b345bf 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,7 +106,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 714e8abf1..e827e4b56 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,7 +103,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 de9cd1c47..68c942b4a 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,7 +73,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 9704d3026..711b80787 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,7 +73,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 211c59d06..989d9d472 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,7 +98,7 @@ public class LlamaController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 dae8cac8c..bd582cb83 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,7 +83,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 8d13cea72..09887be46 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,7 +91,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 8de6e9e46..3ad69febd 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,7 +88,7 @@ public class OcelotController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 af0593d56..a804f90a3 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,7 +86,7 @@ public class PandaController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 0048f5e34..2d37f1aa9 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 @@ -66,7 +66,7 @@ public class ParrotController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 6205223d0..290a5c87c 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,7 +101,7 @@ public class PhantomController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 db04796f2..2a321a9f5 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,7 +89,7 @@ public class PigController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 29e72934d..57bc8a0bd 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,7 +74,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 055a0b837..c12fb59b6 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,7 +73,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 20559543f..7d0bd6cdd 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,7 +73,7 @@ public class PiglinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 8192638d5..747197ecd 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,7 +86,7 @@ public class PillagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 619777c27..12a405227 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 @@ -77,7 +77,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 8192824f7..4609cea9c 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,7 +97,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 f12ada18d..ce18b5901 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,7 +88,7 @@ public class RabbitController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 af09793e6..ec5a2eef6 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,7 +86,7 @@ public class RavagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 d0ab6c137..d0b18a858 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,7 +86,7 @@ public class SalmonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 eb9b8a5d5..5466878b7 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,7 +87,7 @@ public class SheepController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 1c539cd12..95bb92a2c 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,7 +74,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 6d1beaed3..69fb8be61 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,7 +73,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 f01f4ceca..412a368b0 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,7 +73,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 e44acaff3..477d242c9 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,7 +73,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 b5264b037..e6e00a0e9 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,7 +73,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 f2e8f8da9..159fd3b94 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,7 +83,7 @@ public class SlimeController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 d24147eec..a3c4c5396 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,7 +73,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 38a57df71..bbf5c7d8e 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,7 +73,7 @@ public class SpiderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 bb6d6c0b4..73a0b1e4b 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,7 +73,7 @@ public class SquidController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 277b0d9da..9c5c8abfe 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,7 +73,7 @@ public class StriderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 352890e78..61939293c 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,7 +101,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 b16489143..4322a1510 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,7 +86,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 57e11130d..3a8d012a0 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,7 +87,7 @@ public class TurtleController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 3e31c42e8..7dc07ffd0 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 @@ -66,7 +66,7 @@ public class VexController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 a1968395c..8d5667c8b 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,7 +101,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 ece765ea8..db632fc72 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,7 +87,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 2bc14636a..2c1c13290 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,7 +100,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 9f730253b..8c8905cb3 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,7 +73,7 @@ public class WitchController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 4e57b56ab..38f89576d 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 @@ -63,7 +63,7 @@ public class WitherController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 be9bd5c0f..852204341 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,7 +89,7 @@ public class WolfController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 17ad5e862..0258052e7 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,7 +73,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 90c67160b..717a0976d 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,7 +73,7 @@ public class ZombieController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 c6c3ef0bf..b5c02d650 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,7 +73,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 23ed805b5..882e043f2 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,7 +73,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 556b9fad6..f5966ba40 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 @@ -58,7 +58,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 b39f0f481..5c6787bf7 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,7 +75,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 a7214b781..9d19caa62 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,7 +73,7 @@ public class BoatController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 1a25c66e8..c9a6c0107 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 @@ -58,7 +58,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 21e15c57a..278618a8f 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 @@ -74,7 +74,7 @@ public class EggController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 cab9e540b..51ca5be00 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 @@ -58,7 +58,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 0a55c1513..9071ad355 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 @@ -58,7 +58,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 711f8b5e7..28463114a 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 @@ -58,7 +58,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 3d69842ae..d681b14f8 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,7 +69,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 5b858679d..964425bab 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 @@ -52,7 +52,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 08cabc16f..6cd127281 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,7 +74,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 e48442bfa..fa6bfe200 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 @@ -52,7 +52,7 @@ public class FireworkController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 8d7b784b2..f9887d84b 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 @@ -68,7 +68,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 5546e9ba6..6fefa5444 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 @@ -64,7 +64,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 0a5660739..2f45a1282 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 @@ -64,7 +64,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 957e52d49..88554c465 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 @@ -52,7 +52,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 97ebeb428..f0956663a 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 @@ -52,7 +52,7 @@ public class LeashController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 df6feabad..4fcc9cae2 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 @@ -71,7 +71,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 8e9bef971..f8b20ec56 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 @@ -52,7 +52,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 ac1e6474f..7677e87da 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 @@ -52,7 +52,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 018e56cc3..0516c6b8e 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 @@ -52,7 +52,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 5a9377f06..72e2e53e3 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 @@ -47,7 +47,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 36d54271e..3f01693e0 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 @@ -52,7 +52,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 120856c92..5f26078bb 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 @@ -47,7 +47,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 edc4d942b..c9323a48a 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 @@ -47,7 +47,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 857213d13..ff6f0f140 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 @@ -52,7 +52,7 @@ public class PaintingController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 cacd31111..86516157d 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 @@ -52,7 +52,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 a7c9f72ee..8e22fe697 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 @@ -52,7 +52,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 43754a1e9..0146b2c75 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 @@ -52,7 +52,7 @@ public class SnowballController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 edeeda33b..24d374b56 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 @@ -52,7 +52,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 6c1e0662c..acf1a26b0 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 @@ -52,7 +52,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 4ead8a9ce..337ecf46a 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 @@ -52,7 +52,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 bbb163a38..280ca5cf1 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 @@ -53,7 +53,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 b4d74c43e..247fb83fa 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 @@ -52,7 +52,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 11a18fc14..d1efbfe76 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 @@ -52,7 +52,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 330dd5099..8aa594693 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 @@ -52,7 +52,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean a(Tag tag, double d0) { - return NMSImpl.fluidPush(npc, this, tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.a(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 2dd29fc4b..56457a8b7 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 @@ -16,6 +16,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeMap; import java.util.function.Consumer; +import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -289,7 +290,6 @@ 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; @@ -1878,10 +1878,9 @@ 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) { + public static boolean fluidPush(NPC npc, Entity entity, Supplier func) { Vec3D old = entity.getMot().add(0, 0, 0); - boolean res = entity.a(tag, d0); + boolean res = func.get(); if (!npc.isPushableByFluids()) { entity.setMot(old); } 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 2e6dc7a2e..f914bb920 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,7 +234,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 7cc0c62b1..bb43944c0 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,7 +174,7 @@ public class BatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 90318c38d..126826c04 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,7 +167,7 @@ public class BeeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0c2481a9b..680695417 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,7 +153,7 @@ public class BlazeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 38c12d679..2cb5c38c5 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,7 +203,7 @@ public class CatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 901fd78c1..e85f495c7 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,7 +208,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 747be6213..ab66981e8 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,7 +212,7 @@ public class ChickenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3f3326a44..a27cf41b7 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,7 +237,7 @@ public class CodController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 020862a9a..4de76d834 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,7 +219,7 @@ public class CowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9a9826dfa..6409aa500 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,7 +212,7 @@ public class CreeperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0fa6e5657..2de799808 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,7 +217,7 @@ public class DolphinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 92cfe397f..11ef77f29 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,7 +188,7 @@ public class DrownedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 145827ce0..d02b6de77 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,7 +168,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e3d6cf4ab..522abe996 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,7 +213,7 @@ public class EndermanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2e9d948e7..a1bb5c293 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,7 +197,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e14ff5d38..ca24bfaa5 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,7 +183,7 @@ public class EvokerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 341d8d14d..6dc087583 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,7 +197,7 @@ public class FoxController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 fa448be6d..9d50fbd2b 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,7 +153,7 @@ public class GhastController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d11cd769e..4b7646a94 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,7 +191,7 @@ public class GiantController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 282c41a6e..8044471c9 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,7 +191,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 95a80345b..eac5492e7 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,7 +197,7 @@ public class GoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 10f686ba2..d915d4f47 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,7 +198,7 @@ public class GuardianController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 cc55810d9..539deab1b 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,7 +198,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ac759a52e..57b865a87 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,7 +185,7 @@ public class HoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 271e0229c..303932d60 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,7 +246,7 @@ public class HorseController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c11d76f98..74355748a 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,7 +242,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2b457a9dc..a2ad154de 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,7 +245,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9407fe801..829e0299f 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,7 +245,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 83565ba4d..2289b8d7c 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,7 +245,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a304ac91e..958b9c27a 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,7 +183,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 fefae9fad..6be418d64 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,7 +191,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 377dc80b9..4779ceb76 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,7 +215,7 @@ public class LlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f0a4a7205..cc65ac46a 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,7 +214,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d8e3225ba..0624b7de8 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,7 +207,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 eb7de378e..b227d079d 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,7 +204,7 @@ public class OcelotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4501ee149..bbd4403f0 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,7 +197,7 @@ public class PandaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0a50945be..55e1bbbec 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,7 +175,7 @@ public class ParrotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 cf5649e3c..030190f6d 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,7 +234,7 @@ public class PhantomController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4c946ff43..eb78970f9 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,7 +213,7 @@ public class PigController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0ebb7b292..47bc3acf4 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,7 +185,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 893d2ed30..ce08ae7ac 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,7 +185,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 fef9503d6..7a4b8383e 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,7 +185,7 @@ public class PiglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4044f2d63..5618ae51a 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,7 +197,7 @@ public class PillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 36c50175b..34966671c 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,7 +172,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 29c4dfbcb..05a06b8e6 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,7 +253,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 29f41ece6..2ba7dc98c 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,7 +218,7 @@ public class RabbitController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e99848921..4258c44bb 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,7 +197,7 @@ public class RavagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5a659c167..0320f5f56 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,7 +229,7 @@ public class SalmonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 937bfb37c..f7e0957d7 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,7 +197,7 @@ public class SheepController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3d4daa17d..83b30ace6 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,7 +208,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 84d35664d..ebf33a53f 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,7 +198,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 bcba896b6..486ddb3b8 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,7 +191,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2f46eaace..96aabebcb 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,7 +191,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 dff9ed867..a1eaa1723 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,7 +191,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b8122e89e..2a11ae159 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,7 +215,7 @@ public class SlimeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 1ffe71ff3..caf290af7 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,7 +191,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e154346fd..e510e8288 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,7 +191,7 @@ public class SpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b55990cf5..90807361e 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,7 +191,7 @@ public class SquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 316c85eea..ac81970f8 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,7 +182,7 @@ public class StriderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2ae035ee7..bb4db3d48 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,7 +216,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 74cc65338..686655288 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,7 +231,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 af8d48408..3c036d9d4 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,7 +207,7 @@ public class TurtleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 bc5053794..900c58991 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,7 +160,7 @@ public class VexController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0dbd55885..02d4136a2 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,7 +240,7 @@ public class VillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5849fc21f..e4a445ac6 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,7 +198,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 445d7c6db..3786967e7 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,7 +247,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 13221fc56..b939a3f8b 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,7 +191,7 @@ public class WitchController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 09a7119c5..e577d8b50 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,7 +162,7 @@ public class WitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d49155666..8612e4136 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,7 +205,7 @@ public class WolfController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a661df9be..19d9d3783 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,7 +184,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a6bcfbb81..b4efcc8c3 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,7 +182,7 @@ public class ZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 aeb226189..bc783ad36 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,7 +182,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0d6ad8ace..80e30acef 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,7 +182,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 86f1d4262..29c84e299 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,7 +104,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a7e7fc51e..a446de32e 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,7 +118,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 166f0e91b..8c1344193 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,7 +239,7 @@ public class BoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0857c78f9..e1742e19d 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,7 +116,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 410a4c35d..91d95118e 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,7 +122,7 @@ public class EggController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b08f1db1e..2ccf763d8 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,7 +104,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b22744494..c42289b96 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,7 +108,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 03a8af877..48c9fc9f2 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,7 +105,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f09023c27..a85041b2b 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,7 +112,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 45f56afa5..10b54da76 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,7 +98,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 1f5b9ed62..9b378b3fa 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,7 +134,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 36c482862..7c86d4ad2 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,7 +99,7 @@ public class FireworkController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f2c25b880..3ab078093 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,7 +123,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 02a3c23c2..68a89feb0 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,7 +115,7 @@ public class GlowItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 17e3fc5c7..73d5f8145 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,7 +118,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 132d03e13..4d8372b11 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,7 +114,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 44babc6a3..8b252a915 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,7 +110,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 cca7efe07..7978b44c6 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,7 +104,7 @@ public class LeashController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 dfc942407..5a3f2bc2f 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,7 +119,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c05d89599..2494b99ff 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,7 +98,7 @@ public class MarkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f771c7e54..07b57fb9e 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,7 +99,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b4f5f99e3..01680e17e 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,7 +99,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ed83c194b..4aa7bb184 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,7 +99,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3f3d2f362..44d113b72 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,7 +86,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e5b556acd..c14ad91db 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,7 +98,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ca1f79eb1..307182b0d 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,7 +86,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d5cb4c448..4f05907b6 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,7 +86,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d36d2f894..e94dae2b9 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,7 +103,7 @@ public class PaintingController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2b49bea46..8e98e13b8 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,7 +98,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 34847d7f5..ee0bae124 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,7 +101,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 02a1eaf8f..853994e34 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,7 +98,7 @@ public class SnowballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e441f4eb5..8303fb538 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,7 +99,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 30c275e45..db0306b4b 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,7 +99,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8fddaa94b..d89e32288 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,7 +102,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f83add9c6..d9ddd9e0b 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,7 +103,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d82f37258..f6471ef85 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,7 +99,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f9f0e8c8d..5eb32c92c 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,7 +98,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ebea8e02e..0dd9bc66b 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,7 +98,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(Tag Tag, double d0) { - return NMSImpl.fluidPush(npc, this, Tag, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 24de203ad..6f9a06489 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 @@ -16,6 +16,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeMap; import java.util.function.Consumer; +import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -312,7 +313,6 @@ 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; @@ -1873,9 +1873,9 @@ public class NMSImpl implements NMSBridge { return null; } - public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.tags.Tag tag, double d0) { + public static boolean fluidPush(NPC npc, Entity entity, Supplier func) { Vec3 old = entity.getDeltaMovement().add(0, 0, 0); - boolean res = entity.updateFluidHeightAndDoFluidPushing(tag, d0); + boolean res = func.get(); if (!npc.isPushableByFluids()) { entity.setDeltaMovement(old); } 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 afe0695f4..f891f4d2a 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,7 +241,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8ee719257..e1cdceced 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,7 +183,7 @@ public class BatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5c4f79329..af9d4ebca 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,7 +176,7 @@ public class BeeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 44fe6a0f7..0740fd5ab 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,7 +162,7 @@ public class BlazeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 798fcee4f..ad00e4c8c 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,7 +211,7 @@ public class CatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9fe405fad..f4b42b9c3 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,7 +216,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 616f2c90c..13ada4942 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,7 +220,7 @@ public class ChickenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f5af7f037..44240a823 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,7 +246,7 @@ public class CodController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9d139dece..b11c42153 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,7 +227,7 @@ public class CowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8230ea876..bf1a61e3e 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,7 +219,7 @@ public class CreeperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 bb4770410..27cd57107 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,7 +225,7 @@ public class DolphinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d274bf0bb..79527878a 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,7 +196,7 @@ public class DrownedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ddbdd72f3..b0e55f43f 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,7 +177,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 107bea916..6622d037c 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,7 +217,7 @@ public class EndermanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3df3a17bd..57231f611 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,7 +205,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 78850dfae..2d39524dd 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,7 +191,7 @@ public class EvokerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 36f71ab2c..56e64bb28 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,7 +205,7 @@ public class FoxController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 6490536ef..b35fc4c72 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,7 +162,7 @@ public class GhastController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9108b5204..e76f1a955 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,7 +199,7 @@ public class GiantController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 1a6649581..d69af7e62 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,7 +199,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 eed4790e1..efb2bd770 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,7 +205,7 @@ public class GoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4f4a3e529..e51ad78ad 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,7 +206,7 @@ public class GuardianController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 78c1f3252..ff9d519bb 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,7 +206,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c53f4fbcc..e29fbcbe9 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,7 +193,7 @@ public class HoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8d4553b6e..bb0a2c608 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,7 +252,7 @@ public class HorseController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 500056018..424b97757 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,7 +253,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 52abc5249..90b2c444e 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,7 +253,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8413ddf0b..b814c2419 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,7 +253,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 bc30ed25e..2208ccdb8 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,7 +253,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c64d9871e..f8d6f1c0f 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,7 +191,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ff2e6cdf8..424d3e68f 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,7 +199,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5319ac15f..2cb69c5cb 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,7 +223,7 @@ public class LlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 80b55bc69..56be77677 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,7 +222,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0c810b0c4..de95c70aa 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,7 +215,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 864943a44..7bcc72d8e 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,7 +212,7 @@ public class OcelotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9dcf8908e..ab1cbd8e7 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,7 +205,7 @@ public class PandaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 713604c12..1e866f911 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,7 +184,7 @@ public class ParrotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 7937f0746..8eb0db996 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,7 +242,7 @@ public class PhantomController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e5dd999bc..84777a0cd 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,7 +220,7 @@ public class PigController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 bcedc301a..4947155f2 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,7 +191,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a8e347561..6101f2358 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,7 +193,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a6511af3e..41bc8b49b 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,7 +193,7 @@ public class PiglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f2925dd81..42640899f 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,7 +205,7 @@ public class PillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 7e7808fa2..a8ca33ba2 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,7 +181,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 46181fada..8daae0cb0 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,7 +261,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0452ab0e6..e5d375731 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,7 +226,7 @@ public class RabbitController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f2e8d683c..634da224f 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,7 +210,7 @@ public class RavagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c135b3451..4a09f28c0 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,7 +237,7 @@ public class SalmonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 7369bddd1..6d7211fcf 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,7 +205,7 @@ public class SheepController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8e8842bad..3d6284139 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,7 +216,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4d09ec153..29d39163d 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,7 +206,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a63002701..1db96316b 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,7 +199,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3abbab446..8169ca894 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,7 +199,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8ce938d91..5acc55852 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,7 +199,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f1628a78c..42b1c2a99 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,7 +223,7 @@ public class SlimeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 6ce41b6bc..02d0a8d40 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,7 +199,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 134760ab2..6ccba34ac 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,7 +199,7 @@ public class SpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 59dc53c57..24b675728 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,7 +199,7 @@ public class SquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 32d9b354d..f16423b4f 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,7 +190,7 @@ public class StriderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 31e38b7f8..9d835691d 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,7 +224,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2864c3ff1..c68cda61e 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,7 +239,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0bfeb59ec..8f04c7a6c 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,7 +215,7 @@ public class TurtleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0021af6de..850ee1014 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,7 +169,7 @@ public class VexController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 00b2c4926..4ba2633f0 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,7 +247,7 @@ public class VillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 30fbf2bfb..c48449fb6 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,7 +206,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 97526db38..a39980969 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,7 +252,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 bf57c80e2..759f0eff5 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,7 +199,7 @@ public class WitchController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 76810dc5a..4a47b4d14 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,7 +171,7 @@ public class WitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3f715861c..45e2cae0d 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,7 +213,7 @@ public class WolfController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 21be93e8b..a58b228ea 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,7 +192,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b69783c05..07c8dfc7a 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,7 +190,7 @@ public class ZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b63d839d8..bc90e265f 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,7 +190,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 561f91214..d4cffcc7e 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,7 +190,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 7b3fe9ac3..57cda9cc8 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,7 +113,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 7987135b5..225a48e23 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,7 +127,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 55d46f95c..02597569f 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,7 +247,7 @@ public class BoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 1e6bd17c5..bbb975652 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,7 +125,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 119de488b..8bc2e8a35 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,7 +130,7 @@ public class EggController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 24ca9dff8..87fea0c7f 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,7 +113,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 805af67ef..c62856471 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,7 +117,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 589598791..57400505a 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,7 +114,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a8dfba0c8..fa17ecd91 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,7 +121,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 14c48d0cc..277aead83 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,7 +107,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c442beaad..cf1c6dda9 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,7 +139,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 266d59571..8ffaa0ac9 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,7 +108,7 @@ public class FireworkController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 96857e029..6ec803525 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,7 +131,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 98f67bbd1..93e840f2c 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,7 +123,7 @@ public class GlowItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 6da90f288..2ed0c4c42 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,7 +127,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a82e3a357..ed4252b00 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,7 +122,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2ed7b194c..ae14a32cb 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,7 +119,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ebd9c5515..20f417573 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,7 +113,7 @@ public class LeashController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8a432000b..1fb200d86 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,7 +127,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 789dc2479..6219d6856 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,7 +107,7 @@ public class MarkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 af7ceac2a..82b5904c6 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,7 +108,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a8be7bf4e..37816c4ed 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,7 +108,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 395579345..baa8081f1 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,7 +108,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 26226014c..ad854c6ef 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,7 +95,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 841e2fde8..aafab7b01 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,7 +107,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 96364cbd2..7f47a2320 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,7 +95,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 04c668de4..6f32f4536 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,7 +95,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 45d0e1fe5..c5e2d8d4e 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,7 +112,7 @@ public class PaintingController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f6204c729..efb08a091 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,7 +107,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d060441b3..5a34c5141 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,7 +110,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b28810008..b2a4f6ed0 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,7 +107,7 @@ public class SnowballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e6adef52e..5098f36b7 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,7 +108,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 140aa447a..cceb7d9f9 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,7 +108,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0195971ed..74d2991c4 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,7 +111,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 90c7cd72e..10447cb21 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,7 +112,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 950cecff8..1821288cf 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,7 +108,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4f9dff113..b4b34cca9 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,7 +107,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d16558b52..d0f923d25 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,7 +107,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5cf444bea..e408e88b1 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 @@ -15,6 +15,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeMap; import java.util.function.Consumer; +import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -314,7 +315,6 @@ 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; @@ -1881,9 +1881,9 @@ public class NMSImpl implements NMSBridge { return null; } - public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.tags.TagKey tag, double d0) { + public static boolean fluidPush(NPC npc, Entity entity, Supplier func) { Vec3 old = entity.getDeltaMovement().add(0, 0, 0); - boolean res = entity.updateFluidHeightAndDoFluidPushing(tag, d0); + boolean res = func.get(); if (!npc.isPushableByFluids()) { entity.setDeltaMovement(old); } 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 798b2d1f8..f99e58290 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 4980f6c08..b2a9f62f4 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,7 +221,7 @@ public class AllayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c58188ed8..6a6624ecf 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,7 +241,7 @@ public class AxolotlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2e04ea3f6..c3914998a 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,7 +174,7 @@ public class BatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 75fe6ad09..3b6a1dd75 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,7 +167,7 @@ public class BeeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 1d41b17e9..6cf49a8fa 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,7 +162,7 @@ public class BlazeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 266f63b1e..b26ab369d 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,7 +229,7 @@ public class CamelController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 55379dccd..504de293b 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,7 +211,7 @@ public class CatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 cba3627db..8b131ad1e 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,7 +207,7 @@ public class CaveSpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2a9c61403..7ff254f4f 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,7 +220,7 @@ public class ChickenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 1700141b2..05e787740 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,7 +246,7 @@ public class CodController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9fb99469f..1417d9ed7 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,7 +227,7 @@ public class CowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 92773e179..fd854cb3b 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,7 +219,7 @@ public class CreeperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5a1e0678e..6fffc272e 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,7 +225,7 @@ public class DolphinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 79c0347bc..c7288cbfe 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,7 +197,7 @@ public class DrownedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5621c09c1..fa4fd1278 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,7 +177,7 @@ public class EnderDragonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0f7c46f78..d183b1f8f 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,7 +218,7 @@ public class EndermanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a0e9fd724..61cbe1fda 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,7 +206,7 @@ public class EndermiteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4ddd1378c..af87d540b 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,7 +192,7 @@ public class EvokerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b60cd6588..4a70fe339 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,7 +205,7 @@ public class FoxController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5ad5818f9..9137db3ac 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,7 +208,7 @@ public class FrogController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ed0d396e9..1a4d33d32 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,7 +162,7 @@ public class GhastController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 fa1bbccc7..0f6af03d4 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,7 +200,7 @@ public class GiantController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a3d166327..ff0550b09 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,7 +200,7 @@ public class GlowSquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a4727f531..53d593639 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,7 +205,7 @@ public class GoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ee5deb99a..691d3c99d 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,7 +207,7 @@ public class GuardianController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f80349f81..7ec8cee31 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,7 +207,7 @@ public class GuardianElderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9d7afb348..9e2723c3c 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,7 +197,7 @@ public class HoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b47feaf35..258351583 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,7 +252,7 @@ public class HorseController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f65a3bfdd..b7c083ffb 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,7 +252,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 874940c86..6776754ed 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,7 +252,7 @@ public class HorseMuleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3fbe604e7..4bbb83187 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,7 +252,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2a7bf206f..ca5cab512 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,7 +252,7 @@ public class HorseZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3de60c64b..3ee7f0001 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,7 +192,7 @@ public class IllusionerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d1800c5a4..a9d64c294 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,7 +200,7 @@ public class IronGolemController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 1cfd185bd..fa64070e3 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,7 +223,7 @@ public class LlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b7bbd9f5c..08e9da27b 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,7 +222,7 @@ public class MagmaCubeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4118f35c6..d2daff33c 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,7 +215,7 @@ public class MushroomCowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 167dae986..05189d9f9 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,7 +212,7 @@ public class OcelotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9aba841e9..7e0c85b46 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,7 +205,7 @@ public class PandaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f16c47b43..7a5a944ff 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,7 +175,7 @@ public class ParrotController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 dcdd62338..a0c5bba2b 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,7 +240,7 @@ public class PhantomController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 cc8a75347..996e6f922 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,7 +220,7 @@ public class PigController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 050ec2e90..ffd231611 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,7 +192,7 @@ public class PigZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b5b0ed515..e431afa92 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,7 +194,7 @@ public class PiglinBruteController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8af860f6e..cdf52256e 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,7 +194,7 @@ public class PiglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 7ac75053f..22d95bcd4 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,7 +205,7 @@ public class PillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 59c4ab625..7bc5318f8 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,7 +171,7 @@ public class PolarBearController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3e6936255..7bd9356ad 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,7 +261,7 @@ public class PufferFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d946ede4e..b24c81f1d 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,7 +226,7 @@ public class RabbitController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a168dae2f..81b211cd7 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,7 +210,7 @@ public class RavagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 789be426f..c9e3604f7 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,7 +237,7 @@ public class SalmonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 9a34c5a8d..8c691b710 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,7 +205,7 @@ public class SheepController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 025b7792d..134767a05 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,7 +217,7 @@ public class ShulkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 44c38963b..9dedea007 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,7 +207,7 @@ public class SilverfishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 de3f7ab9e..2b53f913a 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,7 +200,7 @@ public class SkeletonController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f4459880a..fa33150a3 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,7 +200,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 26bfdd83a..b3bd28d09 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,7 +200,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 860a22cd1..7067e2513 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,7 +223,7 @@ public class SlimeController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 787f6a4c6..c1e35b316 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,7 +200,7 @@ public class SnowmanController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4689ddcaa..afa4fdf86 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,7 +200,7 @@ public class SpiderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5f94923ec..7412897e3 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,7 +200,7 @@ public class SquidController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5d14c4d4c..a448a7375 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,7 +191,7 @@ public class StriderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ad58135ac..f61430984 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,7 +237,7 @@ public class TadpoleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 5665369a3..a8a26ba9a 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,7 +224,7 @@ public class TraderLlamaController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 de948ee03..0bf447cd6 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,7 +239,7 @@ public class TropicalFishController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2797b40fb..a7112a7db 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,7 +215,7 @@ public class TurtleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c3e7f097d..59733dc13 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,7 +160,7 @@ public class VexController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4a83463ca..244f1e9a6 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,7 +247,7 @@ public class VillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c832f8bfd..59b32de08 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,7 +206,7 @@ public class VindicatorController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d730b3af3..ef0f248ef 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,7 +252,7 @@ public class WanderingTraderController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c52bf8ad9..ab1823792 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,7 +202,7 @@ public class WardenController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3a1bcf2be..249a088c0 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,7 +200,7 @@ public class WitchController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 58f11f310..fcdc4b6dc 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,7 +171,7 @@ public class WitherController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f0f9ad237..b7a143593 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,7 +213,7 @@ public class WolfController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 00843ecf6..c12a8645d 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,7 +193,7 @@ public class ZoglinController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4b5bf1efe..8273fd624 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,7 +191,7 @@ public class ZombieController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 8cb9709f5..72dd65a88 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,7 +191,7 @@ public class ZombieHuskController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4fc69a444..08e3ead6c 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,7 +192,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2fe8795e8..52a5075e5 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,7 +113,7 @@ public class AreaEffectCloudController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a9861d404..aed5a4906 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,7 +127,7 @@ public class ArmorStandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 12fd03462..2b2a8c46e 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,7 +246,7 @@ public class BoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 78bc10789..e2d1476a8 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,7 +247,7 @@ public class ChestBoatController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e5fcd64a4..8e5ad19c2 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,7 +125,7 @@ public class DragonFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f9f4e7ece..d63283cbd 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,7 +130,7 @@ public class EggController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ac1b9a936..a0e95f83d 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,7 +113,7 @@ public class EnderCrystalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 a874bb45f..e7dd6da82 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,7 +117,7 @@ public class EnderPearlController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2429cfcd1..686c5727f 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,7 +114,7 @@ public class EnderSignalController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 05bc91096..182dfdf7d 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,7 +121,7 @@ public class EvokerFangsController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ecd31cdb2..626db12ef 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,7 +107,7 @@ public class ExperienceOrbController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b40a6c85b..de5e81b22 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,7 +138,7 @@ public class FallingBlockController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 6af5d3fc0..104210f52 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,7 +108,7 @@ public class FireworkController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ff1ffc72d..aec9222b1 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,7 +131,7 @@ public class FishingHookController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ae47258f4..361f87b9d 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,7 +124,7 @@ public class GlowItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ed3798ccd..2f2d7bc68 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,7 +127,7 @@ public class ItemController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 d31227be6..80534e780 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,7 +123,7 @@ public class ItemFrameController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 3666b9bd8..c1c9f0120 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,7 +119,7 @@ public class LargeFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 4b1ae37b8..810cfddf8 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,7 +113,7 @@ public class LeashController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 0dd145de5..b35f5d2fe 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,7 +127,7 @@ public class LlamaSpitController extends AbstractEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c5a1c13d2..9b5d2fe9b 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,7 +107,7 @@ public class MarkerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 79cc5eaa9..b1087fd30 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,7 +108,7 @@ public class MinecartChestController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c735b4978..b56b1588e 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,7 +108,7 @@ public class MinecartCommandController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 dc857e614..e366696ca 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,7 +108,7 @@ public class MinecartFurnaceController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 e52b0974a..61c058b9b 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,7 +95,7 @@ public class MinecartHopperController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2da85e05d..41cd3ee9a 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,7 +107,7 @@ public class MinecartRideableController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 66b0ceda3..1173df254 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,7 +95,7 @@ public class MinecartSpawnerController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2d926cc65..c4fbe1501 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,7 +95,7 @@ public class MinecartTNTController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f5f1f6f12..02661cbd2 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,7 +112,7 @@ public class PaintingController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 15f0293ac..7e81de564 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,7 +107,7 @@ public class ShulkerBulletController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 bb8a53c3d..2d40bb5b9 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,7 +110,7 @@ public class SmallFireballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 47c139635..ba5bcb239 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,7 +107,7 @@ public class SnowballController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 c9893f81a..7e759dc0d 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,7 +108,7 @@ public class SpectralArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 f74d5a8a2..eb1c18fea 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,7 +108,7 @@ public class TNTPrimedController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 824b2c753..c19d5944d 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,7 +111,7 @@ public class ThrownExpBottleController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 ee63c0f66..6e2c168d4 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,7 +112,7 @@ public class ThrownPotionController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 78935db4a..fc908d452 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,7 +108,7 @@ public class ThrownTridentController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 b98cb6fa3..dbb42dfac 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,7 +107,7 @@ public class TippedArrowController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 fe505ce04..2f2405d5e 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,7 +107,7 @@ public class WitherSkullController extends MobEntityController { @Override public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - return NMSImpl.fluidPush(npc, this, tagkey, d0); + return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(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 2d3a399c4..e1af24d38 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 @@ -15,6 +15,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeMap; import java.util.function.Consumer; +import java.util.function.Supplier; import java.util.stream.Collectors; import org.bukkit.Bukkit; @@ -334,7 +335,6 @@ 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; @@ -2017,9 +2017,9 @@ public class NMSImpl implements NMSBridge { return null; } - public static boolean fluidPush(NPC npc, Entity entity, net.minecraft.tags.TagKey tag, double d0) { + public static boolean fluidPush(NPC npc, Entity entity, Supplier func) { Vec3 old = entity.getDeltaMovement().add(0, 0, 0); - boolean res = entity.updateFluidHeightAndDoFluidPushing(tag, d0); + boolean res = func.get(); if (!npc.isPushableByFluids()) { entity.setDeltaMovement(old); } 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 3cb7d9cb8..bcbcb77c3 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;