Fix fluid push stack overflow

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
+    public static boolean fluidPush(NPC npc, Entity entity, Supplier<Boolean> 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;

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override

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<FluidType> tag) {
-            return NMSImpl.fluidPush(npc, this, tag);
+            return NMSImpl.fluidPush(npc, this, () -> super.b(tag));
         }
 
         @Override