diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java index 8ef662089..cda19ab04 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMS.java +++ b/main/src/main/java/net/citizensnpcs/util/NMS.java @@ -91,7 +91,7 @@ public class NMS { * an Exception like it should. */ - public static void enderTeleportTo(NPC npc, double x, double y, double z, Runnable cb) { + public static void enderTeleportTo(NPC npc, Runnable cb) { if (npc == null) { cb.run(); return; diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java index 2aff7fe1b..3481ec1c1 100644 --- a/main/src/main/java/net/citizensnpcs/util/Util.java +++ b/main/src/main/java/net/citizensnpcs/util/Util.java @@ -52,10 +52,7 @@ public class Util { } public static Vector callPushEvent(NPC npc, double x, double y, double z) { - if (npc == null) { - return new Vector(x, y, z); - } - boolean allowed = !npc.isProtected() + boolean allowed = npc == null || !npc.isProtected() || (npc.data().has(NPC.Metadata.COLLIDABLE) && npc.data(). get(NPC.Metadata.COLLIDABLE)); if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { return allowed ? new Vector(x, y, z) : null; diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java index c59f97111..ba80a167f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java @@ -98,7 +98,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java index 28985873d..49f43e9d7 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java @@ -95,7 +95,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java index a8a2f28e0..10ebae90f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java @@ -111,7 +111,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java index d8b2a4560..eee45eb00 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java @@ -122,7 +122,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java index fe2cade47..9fe94362d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java @@ -137,7 +137,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java index 192a80296..bddd122ef 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java @@ -121,7 +121,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java index a4c7d6b57..637f80a2f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java @@ -94,7 +94,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java index 7409e410c..9a6f8e762 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java @@ -110,7 +110,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java index 019c15413..9d4d65154 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java @@ -110,7 +110,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java index 98e1db500..3dfb8d88a 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java @@ -86,7 +86,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java index 8cf66b8ed..0c83f403b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java @@ -96,7 +96,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java index bfe4be44d..d9b496b09 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java @@ -97,7 +97,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java index 089c9437e..813ac6061 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java @@ -127,7 +127,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java index 80a95e61b..c808dde61 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java @@ -96,7 +96,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java index 031e74dcf..da8132239 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java @@ -109,7 +109,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java index cf2e13348..69941c8b9 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java @@ -118,7 +118,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java index af89012ac..f5f59e592 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java @@ -114,7 +114,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java index 714ae571d..c18902939 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java @@ -117,7 +117,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java index 51b9d7880..4a2592d64 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java @@ -97,7 +97,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java index 7eefd5bab..8fb827e0e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java @@ -92,7 +92,7 @@ public class PolarBearController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java index cc161923f..9d4012c56 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java @@ -109,7 +109,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java index 608211979..6153ad1cd 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java @@ -107,7 +107,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java index f769849ae..7273633c0 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java @@ -97,7 +97,7 @@ public class ShulkerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java index 022e2aab2..11f1e9e2f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java @@ -96,7 +96,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java index 2ba09c1d9..88632814e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java @@ -96,7 +96,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java index c9ac01ee4..f81bd7434 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java @@ -110,7 +110,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java index 81049118a..260df77d8 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java @@ -96,7 +96,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java index 02c0be308..bc8e7edc7 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java @@ -96,7 +96,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java index 7b3c69af1..eea9a5d44 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java @@ -96,7 +96,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java index f6e2a58c1..ee2d26595 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java @@ -130,7 +130,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java index a9c2d0e20..5775268ba 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java @@ -96,7 +96,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java index 84d6c2f3c..bbf821808 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java @@ -86,7 +86,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java index a1554db56..9ae7fbdc3 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java @@ -110,7 +110,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java index 89c3ea6e4..a6fc1457f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java @@ -96,7 +96,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java index f172c4397..7b700124e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java @@ -98,7 +98,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java index 90a9b5955..6be5774a6 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java @@ -95,7 +95,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java index 944ba63ac..e7ba1976b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java @@ -111,7 +111,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java index 4409607fb..572d06c70 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java @@ -122,7 +122,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java index 93f2d7738..2e978f878 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java @@ -137,7 +137,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java index 35c3759f6..28de8cf8c 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java @@ -113,7 +113,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java index 8f344ca99..a3fde3dc2 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java @@ -94,7 +94,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java index 8d427a2c1..f6a0a2715 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java @@ -110,7 +110,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java index 2b07b50ab..955a5c7d2 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java @@ -110,7 +110,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java index f2e1ee6c8..e454fca12 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java @@ -97,7 +97,7 @@ public class EvokerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java index b84d5714e..a3003eeb9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java @@ -86,7 +86,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java index cae8c0596..2504db80b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java @@ -96,7 +96,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java index 032f630ac..fb515bc27 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java @@ -97,7 +97,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java index e6d9e88bb..2979e72fe 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java @@ -97,7 +97,7 @@ public class GuardianElderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java index eb6d15038..b0353274d 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java @@ -119,7 +119,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java index 05b8c8b2c..a0d4989d4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java @@ -119,7 +119,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java index 74bc63b55..3ffe4e376 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java @@ -119,7 +119,7 @@ public class HorseMuleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java index e85b92507..b999a014f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java @@ -120,7 +120,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java index 8647daf9c..80ec51ce7 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java @@ -120,7 +120,7 @@ public class HorseZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java index 97d475c85..1b9a64958 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java @@ -96,7 +96,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java index c33130c25..a1eab0402 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java @@ -119,7 +119,7 @@ public class LlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java index 18b8198f4..ad8638771 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java @@ -117,7 +117,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java index ec00cb4b5..0b5c22364 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java @@ -117,7 +117,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java index 6c3883f5c..068a50858 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java @@ -114,7 +114,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java index 363e4f82f..4711b0ed1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java @@ -115,7 +115,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java index 2abebecd9..25e3909de 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java @@ -97,7 +97,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java index 65c067772..58a5abfc2 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java @@ -92,7 +92,7 @@ public class PolarBearController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java index f1e53b635..5385b5e06 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java @@ -109,7 +109,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java index 538fa915a..f3a05dc76 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java @@ -107,7 +107,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java index 32570490a..92c8689b1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java @@ -107,7 +107,7 @@ public class ShulkerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java index 7896997b6..8ab01c9f4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java @@ -96,7 +96,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java index a88aaa270..7d76ce8ee 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java @@ -96,7 +96,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java index 95d0170ff..b0b1e29a0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java @@ -96,7 +96,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java index e20c13a31..309bc94f9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java @@ -96,7 +96,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java index 330a149e0..b312bc978 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java @@ -118,7 +118,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java index a442f38a0..96d6878d4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java @@ -96,7 +96,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java index 4b37277ce..96029652a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java @@ -96,7 +96,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java index e9f3c4883..9939cd70d 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java @@ -96,7 +96,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java index 56f361e17..ba6974172 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java @@ -84,7 +84,7 @@ public class VexController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java index 45aefa9c2..f6304abf3 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java @@ -137,7 +137,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java index 228cbf054..7d0936b0b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java @@ -108,7 +108,7 @@ public class VindicatorController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java index 188545b33..b771f4802 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java @@ -96,7 +96,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java index 56efa8e74..7c1bc8708 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java @@ -86,7 +86,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java index 29115e223..5f4a4277b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java @@ -110,7 +110,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java index bbcad8831..db82fe15b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java @@ -96,7 +96,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java index 3ae3d549b..1a96d4268 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java @@ -96,7 +96,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java index e1b97bd15..252141417 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java @@ -96,7 +96,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java index b16dbd273..ea37c7e1d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java @@ -99,7 +99,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java index 7edeade83..6a05206c4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java @@ -96,7 +96,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java index 0ed73dfc1..1093855e6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java @@ -121,7 +121,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java index 01f8f6770..2e29cebb9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java @@ -132,7 +132,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java index e8ed352c3..7e93d2960 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java @@ -147,7 +147,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java index 64c2a8cf8..dc99283e5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java @@ -123,7 +123,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java index 535a80bb4..a85e78dff 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java @@ -95,7 +95,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java index cd9604b08..280e70692 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java @@ -120,7 +120,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java index 9ca1fc4f4..ce8cc949e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java @@ -120,7 +120,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java index 52baa0819..4251cbe30 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java @@ -107,7 +107,7 @@ public class EvokerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java index 62873fafb..817e6bfa6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java @@ -87,7 +87,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java index 1e1e1640f..6dbacce12 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java @@ -106,7 +106,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java index adde2d5de..8bcae0e05 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java @@ -107,7 +107,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java index a448d6c52..57f048a00 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java @@ -107,7 +107,7 @@ public class GuardianElderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java index 1940624e2..5423d8aee 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java @@ -144,7 +144,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java index e33121414..8fc7f7b8a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java @@ -144,7 +144,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java index 4dfb5d7bf..748c0e780 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java @@ -144,7 +144,7 @@ public class HorseMuleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java index 362075ab7..fc76b74a5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java @@ -145,7 +145,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java index 8220e459c..cf406e09a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java @@ -145,7 +145,7 @@ public class HorseZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java index 89a89dab1..5493df16a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java @@ -107,7 +107,7 @@ public class IllusionerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java index ced17e959..123384259 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java @@ -106,7 +106,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java index 0c7a21b99..827c7324c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java @@ -129,7 +129,7 @@ public class LlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java index c3110e52e..adc8b4503 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java @@ -127,7 +127,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java index 36d36ca83..c9f0aa60c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java @@ -127,7 +127,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java index c89f1098d..b6918b16d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java @@ -125,7 +125,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java index 1cb941958..c40b0a7a6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java @@ -93,7 +93,7 @@ public class ParrotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java index a4d8d9191..67c9356b5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java @@ -125,7 +125,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java index 9d35f0406..a786466c3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java @@ -107,7 +107,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java index fc809a8b3..af28750cf 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java @@ -93,7 +93,7 @@ public class PolarBearController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java index 21592ac5a..13da69d0a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java @@ -119,7 +119,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java index f010ad59c..7bbffcf36 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java @@ -117,7 +117,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java index 58a99388a..7d3927345 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java @@ -116,7 +116,7 @@ public class ShulkerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java index 375c0e64b..703517823 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java @@ -106,7 +106,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java index 87fd10f82..7a91731fc 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java @@ -106,7 +106,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java index f86a66eb2..5e3705577 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java @@ -106,7 +106,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java index 8360fcba0..efa21fc0f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java @@ -106,7 +106,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java index c1036e4db..952024d55 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java @@ -128,7 +128,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java index 44fdc0661..4763da682 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java @@ -106,7 +106,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java index 52d753c65..5140df9d0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java @@ -106,7 +106,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java index 2b12a6c8d..636f84740 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java @@ -106,7 +106,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java index ba4fa5d7d..66eb9531f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java @@ -85,7 +85,7 @@ public class VexController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java index 287f96409..7b74e252e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java @@ -147,7 +147,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java index d8c2a13fd..30981330f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java @@ -118,7 +118,7 @@ public class VindicatorController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java index a935abe15..b948d1cc3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java @@ -106,7 +106,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java index 49e9fc417..1b40302c9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java @@ -87,7 +87,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java index b66556213..0022ce526 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java @@ -120,7 +120,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java index 07395d709..4f8e7f418 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java @@ -106,7 +106,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java index 4635433c5..c843de5b1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java @@ -106,7 +106,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java index d11491795..a4550ee04 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java @@ -106,7 +106,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override 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 68cc226d4..cc9286743 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 @@ -113,7 +113,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8db3d1cc0..16865fc80 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 @@ -110,7 +110,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 9b5df340b..026d57d15 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 @@ -135,7 +135,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 154d7c4b9..845bb7cca 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 @@ -148,7 +148,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 1e1a36655..5a3a9bc31 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 @@ -155,7 +155,7 @@ public class CodController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 dfa71c3c6..1d876263f 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 @@ -161,7 +161,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 fc1406622..4e6767dac 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 @@ -137,7 +137,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 380150403..9f0d91d4a 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 @@ -149,7 +149,7 @@ public class DolphinController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6bce58b74..2b897e37c 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 @@ -134,7 +134,7 @@ public class DrownedController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 310a7f5ae..34c275a58 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 @@ -111,7 +111,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 c9669673f..87bad092a 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 @@ -134,7 +134,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bdc53b993..359b85d21 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 @@ -134,7 +134,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 9135beee5..c15cb0cc0 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 @@ -121,7 +121,7 @@ public class EvokerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e3e875e0f..f7e827ae4 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 @@ -96,7 +96,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 51f5a3ccf..540a45520 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 @@ -120,7 +120,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0e785b9d5..67a51f069 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 @@ -123,7 +123,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 cf1ce1d55..a3c6b7a6f 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 @@ -123,7 +123,7 @@ public class GuardianElderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bc4a991a2..1c6d6bc32 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 @@ -158,7 +158,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 dc6f21bb2..d310f8997 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 @@ -158,7 +158,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5e7684bc4..95e2ab004 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 @@ -158,7 +158,7 @@ public class HorseMuleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 dca754d52..f4fc66d54 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 @@ -159,7 +159,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f98649505..c71001116 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 @@ -159,7 +159,7 @@ public class HorseZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0c2c348c3..95d26cc33 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 @@ -121,7 +121,7 @@ public class IllusionerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b371c85ba..3bef0a919 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 @@ -120,7 +120,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3850af43f..06a38ad61 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 @@ -143,7 +143,7 @@ public class LlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f1febb5aa..dd95294f6 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 @@ -133,7 +133,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 650a24365..554fbf466 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 @@ -141,7 +141,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0bb22602c..bb8458ddb 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 @@ -139,7 +139,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6a8c31a16..1933d4dfe 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 @@ -107,7 +107,7 @@ public class ParrotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 4f8da708a..a15383473 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 @@ -138,7 +138,7 @@ public class PhantomController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 97159b19d..0868dfb23 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 @@ -139,7 +139,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8c10c6b6f..ae00d5552 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 @@ -121,7 +121,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a44e49b1f..71e696cd8 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 @@ -107,7 +107,7 @@ public class PolarBearController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d9536aa4f..f5d41d027 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 @@ -143,7 +143,7 @@ public class PufferFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 62b8ba3fe..e50770b20 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 @@ -133,7 +133,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6bc4eed69..8992ec256 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 @@ -141,7 +141,7 @@ public class SalmonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b5d99170f..5a70857c8 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 @@ -131,7 +131,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d1ca079c7..01a19df2b 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 @@ -123,7 +123,7 @@ public class ShulkerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a060a7976..36edb3c30 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 @@ -120,7 +120,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 00d6ddf6f..8fcbaf12b 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 @@ -120,7 +120,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 42c9fc3ec..ff46fa477 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 @@ -120,7 +120,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 81fbc9e0e..2175d5f69 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 @@ -120,7 +120,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 606344343..fab9bfb0a 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 @@ -134,7 +134,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0761eeeec..fe9ff5185 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 @@ -120,7 +120,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a81dbc04e..d6469e1ff 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 @@ -120,7 +120,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 03a99e56b..b438e9b1c 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 @@ -120,7 +120,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f07e4adc9..5caa26111 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 @@ -141,7 +141,7 @@ public class TropicalFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3cdf2100f..982330742 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 @@ -129,7 +129,7 @@ public class TurtleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 329d70a3d..57a80fc38 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 @@ -99,7 +99,7 @@ public class VexController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 00cebae83..f6149e531 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 @@ -161,7 +161,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3a2ac3bff..b54d504a6 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 @@ -132,7 +132,7 @@ public class VindicatorController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 73516e99c..66af27ba9 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 @@ -120,7 +120,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f37ceb270..cbfebfff9 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 @@ -101,7 +101,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 041aea74e..44a06d806 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 @@ -134,7 +134,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5d333aecc..243840f18 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 @@ -120,7 +120,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 464bd53e4..20503eb4c 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 @@ -120,7 +120,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6c435d729..95f881276 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 @@ -120,7 +120,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override 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 c2398a618..af550dee2 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 @@ -106,7 +106,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8d152d62d..e40ea8b37 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 @@ -103,7 +103,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 10749a67a..773f54236 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 @@ -142,7 +142,7 @@ public class CatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a240e9d04..6024c0132 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 @@ -129,7 +129,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f5f7b0a6b..928020aec 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 @@ -143,7 +143,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 caa12b807..6c5fc236c 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 @@ -149,7 +149,7 @@ public class CodController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f9ad71384..ba268704f 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 @@ -157,7 +157,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0d8522795..63c697233 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 @@ -131,7 +131,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 887127589..66d87012e 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 @@ -144,7 +144,7 @@ public class DolphinController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 94639bc50..97dea348c 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 @@ -128,7 +128,7 @@ public class DrownedController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 009186993..ff7c9510a 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 @@ -103,7 +103,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b252a63ff..93165151f 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 @@ -136,7 +136,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 682a715ee..9591380a5 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 @@ -128,7 +128,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e237d4c56..cac6c3fed 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 @@ -115,7 +115,7 @@ public class EvokerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 13330ea52..6bd3c05b9 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 @@ -128,7 +128,7 @@ public class FoxController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 744d6df24..8040f0d5d 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 @@ -89,7 +89,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e227d264e..2a49bb371 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 @@ -114,7 +114,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d1f4c9e84..ac9594b98 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 @@ -115,7 +115,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 94fd9c906..7f677f17a 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 @@ -115,7 +115,7 @@ public class GuardianElderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5ae210959..860e1881b 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 @@ -161,7 +161,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 ffe2e3208..f0f7909f4 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 @@ -160,7 +160,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bc069c434..3ca6ebcd9 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 @@ -160,7 +160,7 @@ public class HorseMuleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e9cf0c6ec..94c1bd99c 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 @@ -161,7 +161,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 1a0c76e49..92fde7eab 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 @@ -161,7 +161,7 @@ public class HorseZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 06bc8e134..74627592c 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 @@ -115,7 +115,7 @@ public class IllusionerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 1a2aebdd7..72b820ca5 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 @@ -114,7 +114,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 290d8a320..fbec7d823 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 @@ -140,7 +140,7 @@ public class LlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8a347dec8..f7dc93591 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 @@ -120,7 +120,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 416afb24f..b97318a2f 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 @@ -138,7 +138,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 804407fc5..8d69c8558 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 @@ -136,7 +136,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 eb1c90d03..e3856b0da 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 @@ -128,7 +128,7 @@ public class PandaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 9dca69576..4eafa100b 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 @@ -100,7 +100,7 @@ public class ParrotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8cfe4cc94..1e4a1264c 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 @@ -129,7 +129,7 @@ public class PhantomController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 ff2b7b4f0..639b20db3 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 @@ -136,7 +136,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f147996ba..b0ab8c13d 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 @@ -115,7 +115,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 1ee9935b0..3a03a9ff5 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 @@ -128,7 +128,7 @@ public class PillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3c5a22b92..67bce07c4 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 @@ -103,7 +103,7 @@ public class PolarBearController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bfcb399cf..3a72065fa 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 @@ -147,7 +147,7 @@ public class PufferFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 507805816..fec38ac1a 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 @@ -130,7 +130,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d067d7c08..608af18b1 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 @@ -128,7 +128,7 @@ public class RavagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 2b957db0d..821859401 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 @@ -135,7 +135,7 @@ public class SalmonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5d8621af4..53bcd7c60 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 @@ -128,7 +128,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 c28a7dffe..700b617ce 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 @@ -115,7 +115,7 @@ public class ShulkerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 907c755ca..8e94a06e0 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 @@ -114,7 +114,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e36b7625b..c28b8560d 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 @@ -114,7 +114,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 00719393e..da1b66650 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 @@ -114,7 +114,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 7011aa528..34b3203ba 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 @@ -114,7 +114,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 cacc214a6..445f264df 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 @@ -121,7 +121,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 403781c60..8543ba8ea 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 @@ -114,7 +114,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 906cd896f..d7e4633d2 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 @@ -114,7 +114,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5a9696513..8c95a4bb9 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 @@ -114,7 +114,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 aedf02925..000d3a0fe 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 @@ -143,7 +143,7 @@ public class TraderLlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d6b12d6c2..0699127ac 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 @@ -135,7 +135,7 @@ public class TropicalFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6ef52e757..130a963dd 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 @@ -123,7 +123,7 @@ public class TurtleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f61e0c48a..1f9659699 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 @@ -92,7 +92,7 @@ public class VexController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 cba5a7745..001d00ef7 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 @@ -163,7 +163,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 df60598ea..cc9cd99af 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 @@ -129,7 +129,7 @@ public class VindicatorController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 48873eb67..df080bbc3 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 @@ -161,7 +161,7 @@ public class WanderingTraderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 56c02adcd..fc55bc62d 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 @@ -114,7 +114,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 4a2622249..5791fcc52 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 @@ -94,7 +94,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a47e128ac..4ce61ec44 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 @@ -131,7 +131,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 cc67df448..7bda5edb4 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 @@ -114,7 +114,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e1303bb55..309ac835b 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 @@ -114,7 +114,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 7655d610b..7119afca9 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 @@ -114,7 +114,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override 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 e733b73aa..42d6eca45 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 @@ -99,7 +99,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d8c82f53a..67c8c3d8a 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 @@ -96,7 +96,7 @@ public class BeeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 21771708b..ce9d689da 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 @@ -96,7 +96,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 efaa7177d..ae5140add 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 @@ -136,7 +136,7 @@ public class CatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bd02b38c7..a5a9252da 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 @@ -123,7 +123,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d2ba905e8..88023bee8 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 @@ -137,7 +137,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 9405f56f7..229e63bf7 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 @@ -147,7 +147,7 @@ public class CodController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b0c8bf874..1ea28c0f0 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 @@ -151,7 +151,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 cf5b350e1..1f6a01d9b 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 @@ -125,7 +125,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 badc0f3f5..e1f8cc838 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 @@ -142,7 +142,7 @@ public class DolphinController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 015387c89..d547553ce 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 @@ -122,7 +122,7 @@ public class DrownedController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 72df78a3e..d50815066 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 @@ -96,7 +96,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 9b6d2c0d1..cc782b75f 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 @@ -130,7 +130,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bbe265808..8b3e29852 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 @@ -122,7 +122,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e43ee6460..b6c8bc921 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 @@ -117,7 +117,7 @@ public class EvokerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 56d3f64e6..c3fcc0e08 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 @@ -130,7 +130,7 @@ public class FoxController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 36e7f58a3..d109cd71c 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 @@ -90,7 +90,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 4b98c56b8..0d0821b79 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 @@ -116,7 +116,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b37251f0d..c3c1f25f1 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 @@ -117,7 +117,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 4380d9892..2501f0304 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 @@ -117,7 +117,7 @@ public class GuardianElderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6297548de..b1689ae70 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 @@ -163,7 +163,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 44f42d6e8..a4c8f5121 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 @@ -162,7 +162,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8ec86ea2b..88b5d4a82 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 @@ -162,7 +162,7 @@ public class HorseMuleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f874750a2..df1025af7 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 @@ -163,7 +163,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a905f197e..0091997d8 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 @@ -163,7 +163,7 @@ public class HorseZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 14c364186..e04419942 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 @@ -117,7 +117,7 @@ public class IllusionerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 2062ad024..ca855fcb0 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 @@ -116,7 +116,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 4e2412b5a..27c3c7fd4 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 @@ -142,7 +142,7 @@ public class LlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 7bebdf082..48430df54 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 @@ -126,7 +126,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 64599a124..70cb8484f 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 @@ -140,7 +140,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 713d37436..2f28ac69b 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 @@ -132,7 +132,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e84d54a14..1a8b809b0 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 @@ -130,7 +130,7 @@ public class PandaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a1c350089..90f2bc9a3 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 @@ -101,7 +101,7 @@ public class ParrotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 045ee251f..df23f5ed6 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 @@ -137,7 +137,7 @@ public class PhantomController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 69ca0c966..ab73331c8 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 @@ -138,7 +138,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 df38480ea..9bc6b837e 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 @@ -117,7 +117,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b89a75777..503eb4ad1 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 @@ -130,7 +130,7 @@ public class PillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 481bd123f..8759fb536 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 @@ -104,7 +104,7 @@ public class PolarBearController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 99ccf5d68..b1274aa90 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 @@ -153,7 +153,7 @@ public class PufferFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 02d2c8cf6..5185282c8 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 @@ -132,7 +132,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a13c8c86d..b3e45d0c1 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 @@ -130,7 +130,7 @@ public class RavagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 83860f94a..029ae33c1 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 @@ -141,7 +141,7 @@ public class SalmonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 211cbb2e6..c7fd8b71d 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 @@ -130,7 +130,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 63837ff1d..046f687b0 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 @@ -117,7 +117,7 @@ public class ShulkerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5ee1e16f3..a848074e4 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 @@ -116,7 +116,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 93f88fec8..eedce27bb 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 @@ -116,7 +116,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 1b06c8fb2..003e7ab43 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 @@ -116,7 +116,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bc7f70eba..2f72a54d9 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 @@ -116,7 +116,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 128a263dc..be665cb67 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 @@ -127,7 +127,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d0292edcd..132541411 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 @@ -116,7 +116,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 fa4946c82..c1ebeb67f 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 @@ -116,7 +116,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8939a58de..d35025116 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 @@ -116,7 +116,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 956e8f4bf..b3cb88a35 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 @@ -145,7 +145,7 @@ public class TraderLlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 caeb85870..2e7c3aa4f 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 @@ -141,7 +141,7 @@ public class TropicalFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 2d7ab3e47..9d56894d8 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 @@ -132,7 +132,7 @@ public class TurtleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 34ffb47d6..17030c03e 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 @@ -93,7 +93,7 @@ public class VexController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 bf0edd18c..2d34dd109 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 @@ -155,7 +155,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f2b838757..c71257b49 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 @@ -131,7 +131,7 @@ public class VindicatorController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 180c49d5c..980f588eb 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 @@ -152,7 +152,7 @@ public class WanderingTraderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0c544b1fe..b9640702f 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 @@ -115,7 +115,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 91df64ab5..08573c27b 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 @@ -89,7 +89,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 08f557ebb..d6f34ffb1 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 @@ -133,7 +133,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3ff9aba36..ceb7b73df 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 @@ -116,7 +116,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 35e7f4bdf..e59aae6c5 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 @@ -116,7 +116,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 79b24bed1..a95f54140 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 @@ -116,7 +116,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override 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 3cf66a632..e4036bfe3 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 @@ -99,7 +99,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5dd4ed581..01f6ced2f 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 @@ -96,7 +96,7 @@ public class BeeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 38b62ce5e..1e3ac89ce 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 @@ -96,7 +96,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f32e587f9..a024a118e 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 @@ -127,7 +127,7 @@ public class CatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 7f13c278f..7c5456b54 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 @@ -114,7 +114,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 88e0dd41b..f94da1bee 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 @@ -128,7 +128,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 346fe0d42..f97ed70d2 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 @@ -137,7 +137,7 @@ public class CodController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 ca543277e..19de1eb23 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 @@ -143,7 +143,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f7c27b93d..56d10e0f0 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 @@ -117,7 +117,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 42282e0d5..1f5afac03 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 @@ -131,7 +131,7 @@ public class DolphinController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e98bedce9..932507f3a 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 @@ -113,7 +113,7 @@ public class DrownedController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6eb6c3144..baa4036a0 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 @@ -96,7 +96,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 aad45b62a..476c26d20 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 @@ -121,7 +121,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 7e1012564..c33a7e753 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 @@ -113,7 +113,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 2875f6a26..d8dd9a983 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 @@ -108,7 +108,7 @@ public class EvokerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3307990a7..7761599c2 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 @@ -121,7 +121,7 @@ public class FoxController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f4b61815b..bc64c9655 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 @@ -90,7 +90,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0c52e03f4..35d6ed3a3 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 @@ -107,7 +107,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 ecbcb0ee4..a7a3a1a36 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 @@ -108,7 +108,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 801a64e9b..d15ca39a6 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 @@ -108,7 +108,7 @@ public class GuardianElderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 2e794416f..51cec87cc 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 @@ -107,7 +107,7 @@ public class HoglinController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 2621117b6..53f82b561 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 @@ -149,7 +149,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 69209272b..ccb4508e7 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 @@ -145,7 +145,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 fd2f38f1e..4e9f0977e 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 @@ -145,7 +145,7 @@ public class HorseMuleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 d8e31d2bd..fa8c5af76 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 @@ -149,7 +149,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6c4a74808..8d1b27f60 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 @@ -146,7 +146,7 @@ public class HorseZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 4932fb543..8c029000b 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 @@ -108,7 +108,7 @@ public class IllusionerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0c73da07d..cc3f92d20 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 @@ -107,7 +107,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 653e8396f..89bba3d7f 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 @@ -133,7 +133,7 @@ public class LlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e0aeef04e..6ba060204 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 @@ -117,7 +117,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b8e230554..c396a35b3 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 @@ -132,7 +132,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e93f624e0..d5080204d 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 @@ -123,7 +123,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8936d2f87..df15dd635 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 @@ -121,7 +121,7 @@ public class PandaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3252d2c69..4c79f719f 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 @@ -102,7 +102,7 @@ public class ParrotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 59e97b538..67a740052 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 @@ -142,7 +142,7 @@ public class PhantomController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 c633434bf..3fdf5b61f 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 @@ -124,7 +124,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 42dbb5e76..66c75804d 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 @@ -108,7 +108,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 6c68af69e..a4ede888d 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 @@ -107,7 +107,7 @@ public class PiglinBruteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a7616a43a..76fcb49ce 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 @@ -107,7 +107,7 @@ public class PiglinController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 cefe69ef2..57d1bacf3 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 @@ -121,7 +121,7 @@ public class PillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 fdf335601..92e09dd44 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 @@ -104,7 +104,7 @@ public class PolarBearController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0f7f8db19..f9a79d4c6 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 @@ -143,7 +143,7 @@ public class PufferFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 baaef9102..b2d9d2ca3 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 @@ -123,7 +123,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 582df90fb..f3429fb0c 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 @@ -121,7 +121,7 @@ public class RavagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a143c6ceb..5b6e6189f 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 @@ -131,7 +131,7 @@ public class SalmonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a2c97cf68..5e94cf95a 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 @@ -121,7 +121,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f48477a93..e5199f8e2 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 @@ -108,7 +108,7 @@ public class ShulkerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 991c92165..b1386e587 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 @@ -107,7 +107,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 c9df59209..a39c18d12 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 @@ -107,7 +107,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 8dbc3ab8a..647f6764f 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 @@ -107,7 +107,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 e1e487814..8edb1ed41 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 @@ -107,7 +107,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 92285a92c..dd516d819 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 @@ -118,7 +118,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 72564c0a0..18a294829 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 @@ -107,7 +107,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 16ed2bb7a..0aabc902a 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 @@ -107,7 +107,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 9541b918c..7d12af29c 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 @@ -107,7 +107,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3cc4dca30..bf60c70d6 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 @@ -107,7 +107,7 @@ public class StriderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 7418e6ed5..062aff455 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 @@ -136,7 +136,7 @@ public class TraderLlamaController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 77434cae5..aa6756df2 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 @@ -131,7 +131,7 @@ public class TropicalFishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 dafee6e52..dd901ba64 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 @@ -121,7 +121,7 @@ public class TurtleController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 5cdbab8ef..62f441607 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 @@ -93,7 +93,7 @@ public class VexController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 3827ade29..a4dd18ec8 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 @@ -157,7 +157,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 a0c2a7bbb..6299bc766 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 @@ -122,7 +122,7 @@ public class VindicatorController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 0c1378eac..e3e0d6e7d 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 @@ -156,7 +156,7 @@ public class WanderingTraderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 c1b99177d..a05ceb49e 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 @@ -107,7 +107,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 df53cf12c..1c5f300f0 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 @@ -89,7 +89,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 68304e30b..5ed35e6d0 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 @@ -124,7 +124,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 b4574b5ad..a3b27b4ae 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 @@ -107,7 +107,7 @@ public class ZoglinController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 2313db832..d484dfa64 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 @@ -107,7 +107,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 f7aa6a145..2b484a026 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 @@ -107,7 +107,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @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 9a48d970d..8b1710393 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 @@ -107,7 +107,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override 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 c29eb8b83..c334c886d 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 @@ -57,7 +57,7 @@ public class AxolotlController extends MobEntityController { } } - public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { + public static class EntityAxolotlNPC extends Axolotl implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -109,7 +109,7 @@ public class AxolotlController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 56efc5859..a502a39b9 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 @@ -43,7 +43,7 @@ public class BatController extends MobEntityController { } } - public static class EntityBatNPC extends Bat implements NPCHolder { + public static class EntityBatNPC extends Bat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -88,7 +88,7 @@ public class BatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 032743171..e9ea0b72a 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 @@ -43,7 +43,7 @@ public class BeeController extends MobEntityController { } } - public static class EntityBeeNPC extends Bee implements NPCHolder { + public static class EntityBeeNPC extends Bee implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -85,7 +85,7 @@ public class BeeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java index 3e4ecf544..a1cd14be7 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 @@ -43,7 +43,7 @@ public class BlazeController extends MobEntityController { } } - public static class EntityBlazeNPC extends Blaze implements NPCHolder { + public static class EntityBlazeNPC extends Blaze implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -80,7 +80,7 @@ public class BlazeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java index 2d8b38232..5a0c45e9c 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 @@ -47,7 +47,7 @@ public class CatController extends MobEntityController { } } - public static class EntityCatNPC extends Cat implements NPCHolder { + public static class EntityCatNPC extends Cat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -102,7 +102,7 @@ public class CatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 031afe26c..cb8ca8c0d 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 @@ -46,7 +46,7 @@ public class CaveSpiderController extends MobEntityController { } } - public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { + public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java index 6d93df0c9..1a7a591e9 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 @@ -47,7 +47,7 @@ public class ChickenController extends MobEntityController { } } - public static class EntityChickenNPC extends Chicken implements NPCHolder { + public static class EntityChickenNPC extends Chicken implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -110,7 +110,7 @@ public class ChickenController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java index 3847beca1..17b53f227 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 @@ -53,7 +53,7 @@ public class CodController extends MobEntityController { } } - public static class EntityCodNPC extends Cod implements NPCHolder { + public static class EntityCodNPC extends Cod implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -135,7 +135,7 @@ public class CodController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java index 32a1dafa6..9833c4dd2 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 @@ -52,7 +52,7 @@ public class CowController extends MobEntityController { } } - public static class EntityCowNPC extends Cow implements NPCHolder { + public static class EntityCowNPC extends Cow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -107,7 +107,7 @@ public class CowController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java index 60a6732d0..df69f5007 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 @@ -48,7 +48,7 @@ public class CreeperController extends MobEntityController { } } - public static class EntityCreeperNPC extends Creeper implements NPCHolder { + public static class EntityCreeperNPC extends Creeper implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean allowPowered; private final CitizensNPC npc; @@ -103,7 +103,7 @@ public class CreeperController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java index 08e727d38..4b2ca9a97 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 @@ -49,7 +49,7 @@ public class DolphinController extends MobEntityController { } } - public static class EntityDolphinNPC extends Dolphin implements NPCHolder { + public static class EntityDolphinNPC extends Dolphin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean inProtectedTick; private final CitizensNPC npc; @@ -102,7 +102,7 @@ public class DolphinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java index 98e50488c..fb8015540 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 @@ -46,7 +46,7 @@ public class DrownedController extends MobEntityController { } } - public static class EntityDrownedNPC extends Drowned implements NPCHolder { + public static class EntityDrownedNPC extends Drowned implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class DrownedController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java index 8bd5f63be..64c540cc8 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 @@ -44,7 +44,7 @@ public class EnderDragonController extends MobEntityController { } } - public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder { + public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderDragonNPC(EntityType types, Level level) { @@ -97,7 +97,7 @@ public class EnderDragonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java index 4f2b9ee27..fec398fdc 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 @@ -49,7 +49,7 @@ public class EndermanController extends MobEntityController { } } - public static class EntityEndermanNPC extends EnderMan implements NPCHolder { + public static class EntityEndermanNPC extends EnderMan implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -106,7 +106,7 @@ public class EndermanController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java index 111a32ba2..caac122cb 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 @@ -46,7 +46,7 @@ public class EndermiteController extends MobEntityController { } } - public static class EntityEndermiteNPC extends Endermite implements NPCHolder { + public static class EntityEndermiteNPC extends Endermite implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class EndermiteController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java index 6225f1eb8..e83877746 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 @@ -40,7 +40,7 @@ public class EvokerController extends MobEntityController { return (org.bukkit.entity.Evoker) super.getBukkitEntity(); } - public static class EntityEvokerNPC extends Evoker implements NPCHolder { + public static class EntityEvokerNPC extends Evoker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class EvokerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java index 825c58780..5b83d74a1 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 @@ -41,7 +41,7 @@ public class FoxController extends MobEntityController { return (org.bukkit.entity.Fox) super.getBukkitEntity(); } - public static class EntityFoxNPC extends Fox implements NPCHolder { + public static class EntityFoxNPC extends Fox implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -96,7 +96,7 @@ public class FoxController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java index 1e85a3843..518ca24b1 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 @@ -37,7 +37,7 @@ public class GhastController extends MobEntityController { return (org.bukkit.entity.Ghast) super.getBukkitEntity(); } - public static class EntityGhastNPC extends Ghast implements NPCHolder { + public static class EntityGhastNPC extends Ghast implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -75,7 +75,7 @@ public class GhastController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java index 2c0724a89..530596600 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 @@ -40,7 +40,7 @@ public class GiantController extends MobEntityController { return (org.bukkit.entity.Giant) super.getBukkitEntity(); } - public static class EntityGiantNPC extends Giant implements NPCHolder { + public static class EntityGiantNPC extends Giant implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class GiantController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java index cc15ab332..13120da7a 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 @@ -40,7 +40,7 @@ public class GlowSquidController extends MobEntityController { return (org.bukkit.entity.GlowSquid) super.getBukkitEntity(); } - public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { + public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class GlowSquidController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java index d05ff179c..ecaf7ac0e 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 @@ -41,7 +41,7 @@ public class GoatController extends MobEntityController { return (org.bukkit.entity.Goat) super.getBukkitEntity(); } - public static class EntityGoatNPC extends Goat implements NPCHolder { + public static class EntityGoatNPC extends Goat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -96,7 +96,7 @@ public class GoatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java index 14d1457dd..48d94b9cf 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 @@ -40,7 +40,7 @@ public class GuardianController extends MobEntityController { return (org.bukkit.entity.Guardian) super.getBukkitEntity(); } - public static class EntityGuardianNPC extends Guardian implements NPCHolder { + public static class EntityGuardianNPC extends Guardian implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class GuardianController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java index 65bdc0020..f108d557a 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 @@ -40,7 +40,7 @@ public class GuardianElderController extends MobEntityController { return (org.bukkit.entity.ElderGuardian) super.getBukkitEntity(); } - public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { + public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class GuardianElderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java index cc589d177..ddb32f2ca 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 @@ -40,7 +40,7 @@ public class HoglinController extends MobEntityController { return (org.bukkit.entity.Hoglin) super.getBukkitEntity(); } - public static class EntityHoglinNPC extends Hoglin implements NPCHolder { + public static class EntityHoglinNPC extends Hoglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -96,7 +96,7 @@ public class HoglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java index e7aa89ce4..e65608b07 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 @@ -51,7 +51,7 @@ public class HorseController extends MobEntityController { return (org.bukkit.entity.Horse) super.getBukkitEntity(); } - public static class EntityHorseNPC extends Horse implements NPCHolder { + public static class EntityHorseNPC extends Horse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; private boolean calledNMSHeight = false; @@ -136,7 +136,7 @@ public class HorseController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java index 723fdb0d2..535013b65 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 @@ -51,7 +51,7 @@ public class HorseDonkeyController extends MobEntityController { return (org.bukkit.entity.Donkey) super.getBukkitEntity(); } - public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { + public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -132,7 +132,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java index 4b2cf4ff6..b03d20ef1 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 @@ -51,7 +51,7 @@ public class HorseMuleController extends MobEntityController { return (org.bukkit.entity.Mule) super.getBukkitEntity(); } - public static class EntityHorseMuleNPC extends Mule implements NPCHolder { + public static class EntityHorseMuleNPC extends Mule implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -135,7 +135,7 @@ public class HorseMuleController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java index e7935a8db..ef60d6742 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 @@ -51,7 +51,7 @@ public class HorseSkeletonController extends MobEntityController { return (org.bukkit.entity.SkeletonHorse) super.getBukkitEntity(); } - public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { + public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -135,7 +135,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java index 475267c38..23e184094 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 @@ -51,7 +51,7 @@ public class HorseZombieController extends MobEntityController { return (org.bukkit.entity.ZombieHorse) super.getBukkitEntity(); } - public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { + public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -135,7 +135,7 @@ public class HorseZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java index 3b664968c..01599f6d4 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 @@ -40,7 +40,7 @@ public class IllusionerController extends MobEntityController { return (org.bukkit.entity.Illusioner) super.getBukkitEntity(); } - public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { + public static class EntityIllusionerNPC extends Illusioner implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class IllusionerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java index ee73917a9..ccd826b33 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 @@ -40,7 +40,7 @@ public class IronGolemController extends MobEntityController { return (org.bukkit.entity.IronGolem) super.getBukkitEntity(); } - public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { + public static class EntityIronGolemNPC extends IronGolem implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class IronGolemController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java index 5ef3319c4..d755b0d6e 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 @@ -49,7 +49,7 @@ public class LlamaController extends MobEntityController { return (org.bukkit.entity.Llama) super.getBukkitEntity(); } - public static class EntityLlamaNPC extends Llama implements NPCHolder { + public static class EntityLlamaNPC extends Llama implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -113,7 +113,7 @@ public class LlamaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java index a819be517..5085d485a 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 @@ -43,7 +43,7 @@ public class MagmaCubeController extends MobEntityController { return (org.bukkit.entity.MagmaCube) super.getBukkitEntity(); } - public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { + public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -94,7 +94,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java index d75ce6931..0a3f0e23d 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 @@ -44,7 +44,7 @@ public class MushroomCowController extends MobEntityController { return (org.bukkit.entity.MushroomCow) super.getBukkitEntity(); } - public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { + public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -99,7 +99,7 @@ public class MushroomCowController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java index 14ce92e8b..5a9d70ec0 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 @@ -42,7 +42,7 @@ public class OcelotController extends MobEntityController { return (org.bukkit.entity.Ocelot) super.getBukkitEntity(); } - public static class EntityOcelotNPC extends Ocelot implements NPCHolder { + public static class EntityOcelotNPC extends Ocelot implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -102,7 +102,7 @@ public class OcelotController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java index e73988fcd..d78d2d8dd 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 @@ -41,7 +41,7 @@ public class PandaController extends MobEntityController { return (org.bukkit.entity.Panda) super.getBukkitEntity(); } - public static class EntityPandaNPC extends Panda implements NPCHolder { + public static class EntityPandaNPC extends Panda implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -96,7 +96,7 @@ public class PandaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 1e570a777..54608def4 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 @@ -40,7 +40,7 @@ public class ParrotController extends MobEntityController { return (org.bukkit.entity.Parrot) super.getBukkitEntity(); } - public static class EntityParrotNPC extends Parrot implements NPCHolder { + public static class EntityParrotNPC extends Parrot implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -84,7 +84,7 @@ public class ParrotController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java index dbb90afc1..73427a56c 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 @@ -44,7 +44,7 @@ public class PhantomController extends MobEntityController { return (org.bukkit.entity.Phantom) super.getBukkitEntity(); } - public static class EntityPhantomNPC extends Phantom implements NPCHolder { + public static class EntityPhantomNPC extends Phantom implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -121,7 +121,7 @@ public class PhantomController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java index 390e3b817..3218f2485 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 @@ -43,7 +43,7 @@ public class PigController extends MobEntityController { return (org.bukkit.entity.Pig) super.getBukkitEntity(); } - public static class EntityPigNPC extends Pig implements NPCHolder { + public static class EntityPigNPC extends Pig implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -104,7 +104,7 @@ public class PigController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java index 46d917bf5..aec6deb30 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 @@ -41,7 +41,7 @@ public class PigZombieController extends MobEntityController { return (org.bukkit.entity.PigZombie) super.getBukkitEntity(); } - public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { + public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class PigZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java index 8389552ac..1bc8e8f72 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 @@ -40,7 +40,7 @@ public class PiglinBruteController extends MobEntityController { return (org.bukkit.entity.PiglinBrute) super.getBukkitEntity(); } - public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { + public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -96,7 +96,7 @@ public class PiglinBruteController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java index fe8fd8d97..deb3fb870 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 @@ -40,7 +40,7 @@ public class PiglinController extends MobEntityController { return (org.bukkit.entity.Piglin) super.getBukkitEntity(); } - public static class EntityPiglinNPC extends Piglin implements NPCHolder { + public static class EntityPiglinNPC extends Piglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -96,7 +96,7 @@ public class PiglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java index 96870e4a2..e0954f79b 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 @@ -41,7 +41,7 @@ public class PillagerController extends MobEntityController { return (org.bukkit.entity.Pillager) super.getBukkitEntity(); } - public static class EntityPillagerNPC extends Pillager implements NPCHolder { + public static class EntityPillagerNPC extends Pillager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -96,7 +96,7 @@ public class PillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 2271f8f4d..3b16103ea 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 @@ -38,7 +38,7 @@ public class PolarBearController extends MobEntityController { return (org.bukkit.entity.PolarBear) super.getBukkitEntity(); } - public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { + public static class EntityPolarBearNPC extends PolarBear implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -78,7 +78,7 @@ public class PolarBearController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java index 698759a45..5c129b90d 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 @@ -50,7 +50,7 @@ public class PufferFishController extends MobEntityController { return (org.bukkit.entity.PufferFish) super.getBukkitEntity(); } - public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { + public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -130,7 +130,7 @@ public class PufferFishController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java index 16ca6de71..31494f87a 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 @@ -42,7 +42,7 @@ public class RabbitController extends MobEntityController { return (org.bukkit.entity.Rabbit) super.getBukkitEntity(); } - public static class EntityRabbitNPC extends Rabbit implements NPCHolder { + public static class EntityRabbitNPC extends Rabbit implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -100,7 +100,7 @@ public class RabbitController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java index fcef7c548..80acbc602 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 @@ -41,7 +41,7 @@ public class RavagerController extends MobEntityController { return (org.bukkit.entity.Ravager) super.getBukkitEntity(); } - public static class EntityRavagerNPC extends Ravager implements NPCHolder { + public static class EntityRavagerNPC extends Ravager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -96,7 +96,7 @@ public class RavagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java index 35a96ba3b..c3c8da515 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 @@ -47,7 +47,7 @@ public class SalmonController extends MobEntityController { return (org.bukkit.entity.Salmon) super.getBukkitEntity(); } - public static class EntitySalmonNPC extends Salmon implements NPCHolder { + public static class EntitySalmonNPC extends Salmon implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -127,7 +127,7 @@ public class SalmonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java index e552504d3..95fbc0b86 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 @@ -41,7 +41,7 @@ public class SheepController extends MobEntityController { return (org.bukkit.entity.Sheep) super.getBukkitEntity(); } - public static class EntitySheepNPC extends Sheep implements NPCHolder { + public static class EntitySheepNPC extends Sheep implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -96,7 +96,7 @@ public class SheepController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java index 279d5383b..8daf7d895 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 @@ -41,7 +41,7 @@ public class ShulkerController extends MobEntityController { return (org.bukkit.entity.Shulker) super.getBukkitEntity(); } - public static class EntityShulkerNPC extends Shulker implements NPCHolder { + public static class EntityShulkerNPC extends Shulker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -97,7 +97,7 @@ public class ShulkerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java index d34e16c3c..57188dbec 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 @@ -41,7 +41,7 @@ public class SilverfishController extends MobEntityController { return (org.bukkit.entity.Silverfish) super.getBukkitEntity(); } - public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { + public static class EntitySilverfishNPC extends Silverfish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { 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 f316263f6..889cbc8ff 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 @@ -40,7 +40,7 @@ public class SkeletonController extends MobEntityController { return (org.bukkit.entity.Skeleton) super.getBukkitEntity(); } - public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { + public static class EntitySkeletonNPC extends Skeleton implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class SkeletonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java index 38a739b72..ce38ac0bd 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 @@ -40,7 +40,7 @@ public class SkeletonStrayController extends MobEntityController { return (org.bukkit.entity.Stray) super.getBukkitEntity(); } - public static class EntityStrayNPC extends Stray implements NPCHolder { + public static class EntityStrayNPC extends Stray implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java index 30cb0504d..9e356b900 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 @@ -40,7 +40,7 @@ public class SkeletonWitherController extends MobEntityController { return (org.bukkit.entity.WitherSkeleton) super.getBukkitEntity(); } - public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { + public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java index 79783be95..5206a23ad 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 @@ -43,7 +43,7 @@ public class SlimeController extends MobEntityController { return (org.bukkit.entity.Slime) super.getBukkitEntity(); } - public static class EntitySlimeNPC extends Slime implements NPCHolder { + public static class EntitySlimeNPC extends Slime implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -94,7 +94,7 @@ public class SlimeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java index 68780cd01..a8bc1dc05 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 @@ -40,7 +40,7 @@ public class SnowmanController extends MobEntityController { return (org.bukkit.entity.Snowman) super.getBukkitEntity(); } - public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { + public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class SnowmanController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java index 15a5c7af8..80ac0025b 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 @@ -40,7 +40,7 @@ public class SpiderController extends MobEntityController { return (org.bukkit.entity.Spider) super.getBukkitEntity(); } - public static class EntitySpiderNPC extends Spider implements NPCHolder { + public static class EntitySpiderNPC extends Spider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class SpiderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java index 21dd9f935..9df33c13a 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 @@ -40,7 +40,7 @@ public class SquidController extends MobEntityController { return (org.bukkit.entity.Squid) super.getBukkitEntity(); } - public static class EntitySquidNPC extends Squid implements NPCHolder { + public static class EntitySquidNPC extends Squid implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class SquidController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java index 31a71501f..a032711c5 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 @@ -40,7 +40,7 @@ public class StriderController extends MobEntityController { return (org.bukkit.entity.Strider) super.getBukkitEntity(); } - public static class EntityStriderNPC extends Strider implements NPCHolder { + public static class EntityStriderNPC extends Strider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class StriderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java index 3e052cb3e..886f01d74 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 @@ -49,7 +49,7 @@ public class TraderLlamaController extends MobEntityController { return (org.bukkit.entity.TraderLlama) super.getBukkitEntity(); } - public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { + public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -114,7 +114,7 @@ public class TraderLlamaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java index effbf8767..6493a0571 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 @@ -47,7 +47,7 @@ public class TropicalFishController extends MobEntityController { return (org.bukkit.entity.TropicalFish) super.getBukkitEntity(); } - public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { + public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -129,7 +129,7 @@ public class TropicalFishController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java index a87c93bb2..6fa554ba4 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 @@ -44,7 +44,7 @@ public class TurtleController extends MobEntityController { return (org.bukkit.entity.Turtle) super.getBukkitEntity(); } - public static class EntityTurtleNPC extends Turtle implements NPCHolder { + public static class EntityTurtleNPC extends Turtle implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private JumpControl oldJumpController; @@ -115,7 +115,7 @@ public class TurtleController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 2321b4a4f..d0fcb91ec 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 @@ -37,7 +37,7 @@ public class VexController extends MobEntityController { return (org.bukkit.entity.Vex) super.getBukkitEntity(); } - public static class EntityVexNPC extends Vex implements NPCHolder { + public static class EntityVexNPC extends Vex implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -78,7 +78,7 @@ public class VexController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java index b2b24732c..e54d3ef2c 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 @@ -48,7 +48,7 @@ public class VillagerController extends MobEntityController { return (org.bukkit.entity.Villager) super.getBukkitEntity(); } - public static class EntityVillagerNPC extends Villager implements NPCHolder { + public static class EntityVillagerNPC extends Villager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean blockingATrade; boolean calledNMSHeight = false; @@ -110,7 +110,7 @@ public class VillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java index a33644df5..d1dea9393 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 @@ -41,7 +41,7 @@ public class VindicatorController extends MobEntityController { return (org.bukkit.entity.Vindicator) super.getBukkitEntity(); } - public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { + public static class EntityVindicatorNPC extends Vindicator implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -96,7 +96,7 @@ public class VindicatorController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java index 9f254d19f..3c8411a71 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 @@ -47,7 +47,7 @@ public class WanderingTraderController extends MobEntityController { return (org.bukkit.entity.WanderingTrader) super.getBukkitEntity(); } - public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { + public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean blockingATrade; private boolean blockTrades = true; @@ -109,7 +109,7 @@ public class WanderingTraderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java index 19a9acbae..7879b61a4 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 @@ -40,7 +40,7 @@ public class WitchController extends MobEntityController { return (org.bukkit.entity.Witch) super.getBukkitEntity(); } - public static class EntityWitchNPC extends Witch implements NPCHolder { + public static class EntityWitchNPC extends Witch implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class WitchController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java index bf26ca6cd..10437fb10 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 @@ -37,7 +37,7 @@ public class WitherController extends MobEntityController { return (org.bukkit.entity.Wither) super.getBukkitEntity(); } - public static class EntityWitherNPC extends WitherBoss implements NPCHolder { + public static class EntityWitherNPC extends WitherBoss implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -79,7 +79,7 @@ public class WitherController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java index 59d76d9ef..fddbfe6dc 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 @@ -43,7 +43,7 @@ public class WolfController extends MobEntityController { return (org.bukkit.entity.Wolf) super.getBukkitEntity(); } - public static class EntityWolfNPC extends Wolf implements NPCHolder { + public static class EntityWolfNPC extends Wolf implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -98,7 +98,7 @@ public class WolfController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java index 9de8a1bae..d0a23bc71 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 @@ -40,7 +40,7 @@ public class ZoglinController extends MobEntityController { return (org.bukkit.entity.Zoglin) super.getBukkitEntity(); } - public static class EntityZoglinNPC extends Zoglin implements NPCHolder { + public static class EntityZoglinNPC extends Zoglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class ZoglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java index 9e61c99a3..80929e722 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 @@ -40,7 +40,7 @@ public class ZombieController extends MobEntityController { return (org.bukkit.entity.Zombie) super.getBukkitEntity(); } - public static class EntityZombieNPC extends Zombie implements NPCHolder { + public static class EntityZombieNPC extends Zombie implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class ZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java index 152d66783..ce2ad7941 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 @@ -40,7 +40,7 @@ public class ZombieHuskController extends MobEntityController { return (org.bukkit.entity.Husk) super.getBukkitEntity(); } - public static class EntityZombieHuskNPC extends Husk implements NPCHolder { + public static class EntityZombieHuskNPC extends Husk implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java index ad59115bf..ce6684975 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 @@ -40,7 +40,7 @@ public class ZombieVillagerController extends MobEntityController { return (org.bukkit.entity.ZombieVillager) super.getBukkitEntity(); } - public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { + public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -93,7 +93,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 66932d176..754a628bd 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 @@ -39,7 +39,7 @@ public class AreaEffectCloudController extends MobEntityController { } } - public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder { + public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityType types, Level level) { 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 a446de32e..5d9e10cf5 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 @@ -44,7 +44,7 @@ public class ArmorStandController extends MobEntityController { } } - public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder { + public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { 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 8c1344193..23beabebc 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 @@ -46,7 +46,7 @@ public class BoatController extends MobEntityController { } } - public static class EntityBoatNPC extends Boat implements NPCHolder { + public static class EntityBoatNPC extends Boat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double aC; private float aD; 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 96f038fbc..258c40449 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 @@ -39,7 +39,7 @@ public class DragonFireballController extends MobEntityController { } } - public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { + public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { 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 130e7e0e9..bfd75b563 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 @@ -49,7 +49,7 @@ public class EggController extends AbstractEntityController { } } - public static class EntityEggNPC extends ThrownEgg implements NPCHolder { + public static class EntityEggNPC extends ThrownEgg implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { 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 3581b6b80..5edd8f386 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 @@ -39,7 +39,7 @@ public class EnderCrystalController extends MobEntityController { } } - public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { + public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { 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 96143abfb..4d20af2a6 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 @@ -40,7 +40,7 @@ public class EnderPearlController extends MobEntityController { } } - public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { + public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { 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 3e8ad515a..ac192f4e5 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 @@ -40,7 +40,7 @@ public class EnderSignalController extends MobEntityController { } } - public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { + public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { 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 a85041b2b..3d6448282 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 @@ -38,7 +38,7 @@ public class EvokerFangsController extends MobEntityController { return (org.bukkit.entity.EvokerFangs) super.getBukkitEntity(); } - public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { + public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { 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 9b73c7a29..bf08daaa5 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 @@ -33,7 +33,7 @@ public class ExperienceOrbController extends MobEntityController { return (org.bukkit.entity.ExperienceOrb) super.getBukkitEntity(); } - public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { + public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { 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 9b378b3fa..4f0de3824 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 @@ -50,7 +50,7 @@ public class FallingBlockController extends AbstractEntityController { return (FallingBlock) super.getBukkitEntity(); } - public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { + public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { 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 9a890094c..fcde25be0 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 @@ -34,7 +34,7 @@ public class FireworkController extends MobEntityController { return (Firework) super.getBukkitEntity(); } - public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { + public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { 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 5c1cc661b..644473fa0 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 @@ -43,7 +43,7 @@ public class FishingHookController extends MobEntityController { return (FishHook) super.getBukkitEntity(); } - public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { + public static class EntityFishingHookNPC extends FishingHook implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { 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 2160cb63f..07ebb984f 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 @@ -45,7 +45,7 @@ public class GlowItemFrameController extends MobEntityController { return (org.bukkit.entity.GlowItemFrame) super.getBukkitEntity(); } - public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { + public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { 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 167be96e4..49d616731 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 @@ -45,7 +45,7 @@ public class ItemController extends AbstractEntityController { return (Item) super.getBukkitEntity(); } - public static class EntityItemNPC extends ItemEntity implements NPCHolder { + public static class EntityItemNPC extends ItemEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { 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 baa3fc41b..73e04f9f2 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 @@ -44,7 +44,7 @@ public class ItemFrameController extends MobEntityController { return (org.bukkit.entity.ItemFrame) super.getBukkitEntity(); } - public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { + public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { 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 49abb82b4..5a9028b6f 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 @@ -33,7 +33,7 @@ public class LargeFireballController extends MobEntityController { return (org.bukkit.entity.LargeFireball) super.getBukkitEntity(); } - public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { + public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { 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 adee43dd8..26cf22a61 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 @@ -34,7 +34,7 @@ public class LeashController extends MobEntityController { return (LeashHitch) super.getBukkitEntity(); } - public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { + public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { 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 75bdef404..26e30f00b 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 @@ -46,7 +46,7 @@ public class LlamaSpitController extends AbstractEntityController { return (org.bukkit.entity.LlamaSpit) super.getBukkitEntity(); } - public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { + public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { 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 7b032765b..41ab6814c 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 @@ -33,7 +33,7 @@ public class MarkerController extends MobEntityController { return (org.bukkit.entity.Marker) super.getBukkitEntity(); } - public static class EntityMarkerNPC extends Marker implements NPCHolder { + public static class EntityMarkerNPC extends Marker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { 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 615e9cfd6..c7a7baef8 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 @@ -34,7 +34,7 @@ public class MinecartChestController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { + public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { 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 a7e2231a6..80ee22b79 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 @@ -34,7 +34,7 @@ public class MinecartCommandController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { + public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { 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 723815d8a..a4fa5e7b5 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 @@ -34,7 +34,7 @@ public class MinecartFurnaceController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { + public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { 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 0a99ce2f0..e19b29e17 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 @@ -29,7 +29,7 @@ public class MinecartHopperController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { + public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { 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 8c3279624..87cf276fb 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 @@ -33,7 +33,7 @@ public class MinecartRideableController extends MobEntityController { return (org.bukkit.entity.Minecart) super.getBukkitEntity(); } - public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { + public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { 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 cd27c2c74..12c5f084a 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 @@ -29,7 +29,7 @@ public class MinecartSpawnerController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { + public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { 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 f8b113984..23f150e16 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 @@ -29,7 +29,7 @@ public class MinecartTNTController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { + public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { 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 e704b966e..c0fc1301b 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 @@ -33,7 +33,7 @@ public class PaintingController extends MobEntityController { return (org.bukkit.entity.Painting) super.getBukkitEntity(); } - public static class EntityPaintingNPC extends Painting implements NPCHolder { + public static class EntityPaintingNPC extends Painting implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { 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 5345304a6..aeb361b04 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 @@ -33,7 +33,7 @@ public class ShulkerBulletController extends MobEntityController { return (org.bukkit.entity.ShulkerBullet) super.getBukkitEntity(); } - public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { + public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { 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 1f85fa579..7e1f2e976 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 @@ -33,7 +33,7 @@ public class SmallFireballController extends MobEntityController { return (org.bukkit.entity.SmallFireball) super.getBukkitEntity(); } - public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { + public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { 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 dc43a9f9e..cebe3ea09 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 @@ -33,7 +33,7 @@ public class SnowballController extends MobEntityController { return (org.bukkit.entity.Snowball) super.getBukkitEntity(); } - public static class EntitySnowballNPC extends Snowball implements NPCHolder { + public static class EntitySnowballNPC extends Snowball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { 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 3570aca5f..677e382b5 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 @@ -34,7 +34,7 @@ public class SpectralArrowController extends MobEntityController { return (Arrow) super.getBukkitEntity(); } - public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { + public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { 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 3cc1eee63..e7fdf433e 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 @@ -34,7 +34,7 @@ public class TNTPrimedController extends MobEntityController { return (TNTPrimed) super.getBukkitEntity(); } - public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { + public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { 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 87cbc355d..fc4779fe6 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 @@ -34,7 +34,7 @@ public class ThrownExpBottleController extends MobEntityController { return (ThrownExpBottle) super.getBukkitEntity(); } - public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { + public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { 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 2950869ed..abfba298d 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 @@ -34,7 +34,7 @@ public class ThrownPotionController extends MobEntityController { return (org.bukkit.entity.ThrownPotion) super.getBukkitEntity(); } - public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { + public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { 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 b8c1655fe..c25c209ec 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 @@ -34,7 +34,7 @@ public class ThrownTridentController extends MobEntityController { return (Trident) super.getBukkitEntity(); } - public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { + public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { 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 6f4d08f44..39897f64f 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 @@ -33,7 +33,7 @@ public class TippedArrowController extends MobEntityController { return (org.bukkit.entity.Arrow) super.getBukkitEntity(); } - public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { + public static class EntityTippedArrowNPC extends Arrow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { 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 ab4e83550..db7b4d35d 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 @@ -33,7 +33,7 @@ public class WitherSkullController extends MobEntityController { return (org.bukkit.entity.WitherSkull) super.getBukkitEntity(); } - public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { + public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { 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 3a34629ea..666fc3865 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 @@ -57,7 +57,7 @@ public class AxolotlController extends MobEntityController { } } - public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { + public static class EntityAxolotlNPC extends Axolotl implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -109,7 +109,7 @@ public class AxolotlController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 ef19b1f7d..b072ba453 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 @@ -45,7 +45,7 @@ public class BatController extends MobEntityController { } } - public static class EntityBatNPC extends Bat implements NPCHolder { + public static class EntityBatNPC extends Bat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -90,7 +90,7 @@ public class BatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 50397e5a5..15b875677 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 @@ -45,7 +45,7 @@ public class BeeController extends MobEntityController { } } - public static class EntityBeeNPC extends Bee implements NPCHolder { + public static class EntityBeeNPC extends Bee implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -87,7 +87,7 @@ public class BeeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java index 5df247760..a3a349245 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 @@ -45,7 +45,7 @@ public class BlazeController extends MobEntityController { } } - public static class EntityBlazeNPC extends Blaze implements NPCHolder { + public static class EntityBlazeNPC extends Blaze implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -82,7 +82,7 @@ public class BlazeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java index 3400d068b..22fd9a89a 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 @@ -48,7 +48,7 @@ public class CatController extends MobEntityController { } } - public static class EntityCatNPC extends Cat implements NPCHolder { + public static class EntityCatNPC extends Cat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -103,7 +103,7 @@ public class CatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 befec4198..ce76a08a2 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 @@ -47,7 +47,7 @@ public class CaveSpiderController extends MobEntityController { } } - public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { + public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -100,7 +100,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java index 6a7fc126e..6bff2ea57 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 @@ -48,7 +48,7 @@ public class ChickenController extends MobEntityController { } } - public static class EntityChickenNPC extends Chicken implements NPCHolder { + public static class EntityChickenNPC extends Chicken implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -111,7 +111,7 @@ public class ChickenController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java index bcdb37f94..19ca73ba3 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 @@ -54,7 +54,7 @@ public class CodController extends MobEntityController { } } - public static class EntityCodNPC extends Cod implements NPCHolder { + public static class EntityCodNPC extends Cod implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -136,7 +136,7 @@ public class CodController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java index f75d6929c..b5b3bdf3a 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 @@ -53,7 +53,7 @@ public class CowController extends MobEntityController { } } - public static class EntityCowNPC extends Cow implements NPCHolder { + public static class EntityCowNPC extends Cow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -108,7 +108,7 @@ public class CowController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java index 4d16ab6bc..0cf5012f4 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 @@ -48,7 +48,7 @@ public class CreeperController extends MobEntityController { } } - public static class EntityCreeperNPC extends Creeper implements NPCHolder { + public static class EntityCreeperNPC extends Creeper implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean allowPowered; private final CitizensNPC npc; @@ -103,7 +103,7 @@ public class CreeperController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java index 45fe59131..c3a7d580f 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 @@ -49,7 +49,7 @@ public class DolphinController extends MobEntityController { } } - public static class EntityDolphinNPC extends Dolphin implements NPCHolder { + public static class EntityDolphinNPC extends Dolphin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean inProtectedTick; private final CitizensNPC npc; @@ -102,7 +102,7 @@ public class DolphinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java index 3a3f0dfa1..2e3df4d7b 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 @@ -47,7 +47,7 @@ public class DrownedController extends MobEntityController { } } - public static class EntityDrownedNPC extends Drowned implements NPCHolder { + public static class EntityDrownedNPC extends Drowned implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -100,7 +100,7 @@ public class DrownedController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java index 0ebd812af..429329a58 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 @@ -46,7 +46,7 @@ public class EnderDragonController extends MobEntityController { } } - public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder { + public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderDragonNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class EnderDragonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java index b4b2699ec..7a5f00329 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 @@ -50,7 +50,7 @@ public class EndermanController extends MobEntityController { } } - public static class EntityEndermanNPC extends EnderMan implements NPCHolder { + public static class EntityEndermanNPC extends EnderMan implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -103,7 +103,7 @@ public class EndermanController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java index f9d7a1fe1..85b4bd6d9 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 @@ -47,7 +47,7 @@ public class EndermiteController extends MobEntityController { } } - public static class EntityEndermiteNPC extends Endermite implements NPCHolder { + public static class EntityEndermiteNPC extends Endermite implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -100,7 +100,7 @@ public class EndermiteController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java index 88a7216d0..ab8611e7f 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 @@ -41,7 +41,7 @@ public class EvokerController extends MobEntityController { return (org.bukkit.entity.Evoker) super.getBukkitEntity(); } - public static class EntityEvokerNPC extends Evoker implements NPCHolder { + public static class EntityEvokerNPC extends Evoker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class EvokerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java index fdafee62d..f202e4f50 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 @@ -42,7 +42,7 @@ public class FoxController extends MobEntityController { return (org.bukkit.entity.Fox) super.getBukkitEntity(); } - public static class EntityFoxNPC extends Fox implements NPCHolder { + public static class EntityFoxNPC extends Fox implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class FoxController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java index 89e174dbc..407c2e2b0 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 @@ -39,7 +39,7 @@ public class GhastController extends MobEntityController { return (org.bukkit.entity.Ghast) super.getBukkitEntity(); } - public static class EntityGhastNPC extends Ghast implements NPCHolder { + public static class EntityGhastNPC extends Ghast implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -77,7 +77,7 @@ public class GhastController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java index 9dbf6eefc..ee35f25f7 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 @@ -41,7 +41,7 @@ public class GiantController extends MobEntityController { return (org.bukkit.entity.Giant) super.getBukkitEntity(); } - public static class EntityGiantNPC extends Giant implements NPCHolder { + public static class EntityGiantNPC extends Giant implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class GiantController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java index 2d3afdfc4..cde0fb106 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 @@ -41,7 +41,7 @@ public class GlowSquidController extends MobEntityController { return (org.bukkit.entity.GlowSquid) super.getBukkitEntity(); } - public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { + public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class GlowSquidController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java index 1caf9b5df..e7cfa5ac7 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 @@ -42,7 +42,7 @@ public class GoatController extends MobEntityController { return (org.bukkit.entity.Goat) super.getBukkitEntity(); } - public static class EntityGoatNPC extends Goat implements NPCHolder { + public static class EntityGoatNPC extends Goat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class GoatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java index 83c4ee0eb..44b65d7aa 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 @@ -41,7 +41,7 @@ public class GuardianController extends MobEntityController { return (org.bukkit.entity.Guardian) super.getBukkitEntity(); } - public static class EntityGuardianNPC extends Guardian implements NPCHolder { + public static class EntityGuardianNPC extends Guardian implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -100,7 +100,7 @@ public class GuardianController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java index 9b9240721..617e75fd7 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 @@ -41,7 +41,7 @@ public class GuardianElderController extends MobEntityController { return (org.bukkit.entity.ElderGuardian) super.getBukkitEntity(); } - public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { + public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -100,7 +100,7 @@ public class GuardianElderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java index 70b516c2f..da4e6049c 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 @@ -41,7 +41,7 @@ public class HoglinController extends MobEntityController { return (org.bukkit.entity.Hoglin) super.getBukkitEntity(); } - public static class EntityHoglinNPC extends Hoglin implements NPCHolder { + public static class EntityHoglinNPC extends Hoglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -97,7 +97,7 @@ public class HoglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java index 6f05b947d..6c97bfa3f 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 @@ -52,7 +52,7 @@ public class HorseController extends MobEntityController { return (org.bukkit.entity.Horse) super.getBukkitEntity(); } - public static class EntityHorseNPC extends Horse implements NPCHolder { + public static class EntityHorseNPC extends Horse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; private boolean calledNMSHeight = false; @@ -135,7 +135,7 @@ public class HorseController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java index e7219789e..415574578 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 @@ -52,7 +52,7 @@ public class HorseDonkeyController extends MobEntityController { return (org.bukkit.entity.Donkey) super.getBukkitEntity(); } - public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { + public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -136,7 +136,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java index f06b5ff3b..64d8cd29d 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 @@ -52,7 +52,7 @@ public class HorseMuleController extends MobEntityController { return (org.bukkit.entity.Mule) super.getBukkitEntity(); } - public static class EntityHorseMuleNPC extends Mule implements NPCHolder { + public static class EntityHorseMuleNPC extends Mule implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -136,7 +136,7 @@ public class HorseMuleController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java index 713a5204b..b320d7c72 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 @@ -52,7 +52,7 @@ public class HorseSkeletonController extends MobEntityController { return (org.bukkit.entity.SkeletonHorse) super.getBukkitEntity(); } - public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { + public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -136,7 +136,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java index 9ca2bdae4..8e1345bfc 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 @@ -52,7 +52,7 @@ public class HorseZombieController extends MobEntityController { return (org.bukkit.entity.ZombieHorse) super.getBukkitEntity(); } - public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { + public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -136,7 +136,7 @@ public class HorseZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java index b668ca39c..5f410e1be 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 @@ -41,7 +41,7 @@ public class IllusionerController extends MobEntityController { return (org.bukkit.entity.Illusioner) super.getBukkitEntity(); } - public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { + public static class EntityIllusionerNPC extends Illusioner implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class IllusionerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java index 87febffd7..1f9d45c87 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 @@ -41,7 +41,7 @@ public class IronGolemController extends MobEntityController { return (org.bukkit.entity.IronGolem) super.getBukkitEntity(); } - public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { + public static class EntityIronGolemNPC extends IronGolem implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class IronGolemController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java index f86c18893..1a0a70954 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 @@ -50,7 +50,7 @@ public class LlamaController extends MobEntityController { return (org.bukkit.entity.Llama) super.getBukkitEntity(); } - public static class EntityLlamaNPC extends Llama implements NPCHolder { + public static class EntityLlamaNPC extends Llama implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -114,7 +114,7 @@ public class LlamaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java index 56bc43ab8..aa69991e7 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 @@ -44,7 +44,7 @@ public class MagmaCubeController extends MobEntityController { return (org.bukkit.entity.MagmaCube) super.getBukkitEntity(); } - public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { + public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -95,7 +95,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java index 33f505f54..3e38df6f3 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 @@ -45,7 +45,7 @@ public class MushroomCowController extends MobEntityController { return (org.bukkit.entity.MushroomCow) super.getBukkitEntity(); } - public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { + public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -100,7 +100,7 @@ public class MushroomCowController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java index bdf309162..ef1a49c99 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 @@ -43,7 +43,7 @@ public class OcelotController extends MobEntityController { return (org.bukkit.entity.Ocelot) super.getBukkitEntity(); } - public static class EntityOcelotNPC extends Ocelot implements NPCHolder { + public static class EntityOcelotNPC extends Ocelot implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -103,7 +103,7 @@ public class OcelotController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java index 92ed16483..07f947aec 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 @@ -42,7 +42,7 @@ public class PandaController extends MobEntityController { return (org.bukkit.entity.Panda) super.getBukkitEntity(); } - public static class EntityPandaNPC extends Panda implements NPCHolder { + public static class EntityPandaNPC extends Panda implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class PandaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 271a020a6..0c267cdc7 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 @@ -42,7 +42,7 @@ public class ParrotController extends MobEntityController { return (org.bukkit.entity.Parrot) super.getBukkitEntity(); } - public static class EntityParrotNPC extends Parrot implements NPCHolder { + public static class EntityParrotNPC extends Parrot implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -86,7 +86,7 @@ public class ParrotController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java index a81357369..f045af2c9 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 @@ -45,7 +45,7 @@ public class PhantomController extends MobEntityController { return (org.bukkit.entity.Phantom) super.getBukkitEntity(); } - public static class EntityPhantomNPC extends Phantom implements NPCHolder { + public static class EntityPhantomNPC extends Phantom implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -122,7 +122,7 @@ public class PhantomController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java index 9c0394f6a..a7eb20fc4 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 @@ -43,7 +43,7 @@ public class PigController extends MobEntityController { return (org.bukkit.entity.Pig) super.getBukkitEntity(); } - public static class EntityPigNPC extends Pig implements NPCHolder { + public static class EntityPigNPC extends Pig implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -104,7 +104,7 @@ public class PigController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java index 41daf1f70..fafa69d5d 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 @@ -42,7 +42,7 @@ public class PigZombieController extends MobEntityController { return (org.bukkit.entity.PigZombie) super.getBukkitEntity(); } - public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { + public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class PigZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java index a05e57058..fb6df6062 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 @@ -41,7 +41,7 @@ public class PiglinBruteController extends MobEntityController { return (org.bukkit.entity.PiglinBrute) super.getBukkitEntity(); } - public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { + public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -97,7 +97,7 @@ public class PiglinBruteController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java index bce763445..05b1e5564 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 @@ -41,7 +41,7 @@ public class PiglinController extends MobEntityController { return (org.bukkit.entity.Piglin) super.getBukkitEntity(); } - public static class EntityPiglinNPC extends Piglin implements NPCHolder { + public static class EntityPiglinNPC extends Piglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -97,7 +97,7 @@ public class PiglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java index 985dfd2e0..c02b93e55 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 @@ -42,7 +42,7 @@ public class PillagerController extends MobEntityController { return (org.bukkit.entity.Pillager) super.getBukkitEntity(); } - public static class EntityPillagerNPC extends Pillager implements NPCHolder { + public static class EntityPillagerNPC extends Pillager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class PillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 f7ebef9eb..2d8fbd293 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 @@ -40,7 +40,7 @@ public class PolarBearController extends MobEntityController { return (org.bukkit.entity.PolarBear) super.getBukkitEntity(); } - public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { + public static class EntityPolarBearNPC extends PolarBear implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -80,7 +80,7 @@ public class PolarBearController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java index 98c7b73d3..73e8eacfb 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 @@ -51,7 +51,7 @@ public class PufferFishController extends MobEntityController { return (org.bukkit.entity.PufferFish) super.getBukkitEntity(); } - public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { + public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -131,7 +131,7 @@ public class PufferFishController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java index 3624a2b72..2b8e46300 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 @@ -43,7 +43,7 @@ public class RabbitController extends MobEntityController { return (org.bukkit.entity.Rabbit) super.getBukkitEntity(); } - public static class EntityRabbitNPC extends Rabbit implements NPCHolder { + public static class EntityRabbitNPC extends Rabbit implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -101,7 +101,7 @@ public class RabbitController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java index 408202f94..ae38b6b2c 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 @@ -42,7 +42,7 @@ public class RavagerController extends MobEntityController { return (org.bukkit.entity.Ravager) super.getBukkitEntity(); } - public static class EntityRavagerNPC extends Ravager implements NPCHolder { + public static class EntityRavagerNPC extends Ravager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -102,7 +102,7 @@ public class RavagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java index b574598f8..f760a2b9c 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 @@ -48,7 +48,7 @@ public class SalmonController extends MobEntityController { return (org.bukkit.entity.Salmon) super.getBukkitEntity(); } - public static class EntitySalmonNPC extends Salmon implements NPCHolder { + public static class EntitySalmonNPC extends Salmon implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -128,7 +128,7 @@ public class SalmonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java index 4c5957e68..4142b18ea 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 @@ -42,7 +42,7 @@ public class SheepController extends MobEntityController { return (org.bukkit.entity.Sheep) super.getBukkitEntity(); } - public static class EntitySheepNPC extends Sheep implements NPCHolder { + public static class EntitySheepNPC extends Sheep implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class SheepController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java index d9d33159a..92df88eaf 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 @@ -42,7 +42,7 @@ public class ShulkerController extends MobEntityController { return (org.bukkit.entity.Shulker) super.getBukkitEntity(); } - public static class EntityShulkerNPC extends Shulker implements NPCHolder { + public static class EntityShulkerNPC extends Shulker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -98,7 +98,7 @@ public class ShulkerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java index 069ccf998..be3aeacd9 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 @@ -42,7 +42,7 @@ public class SilverfishController extends MobEntityController { return (org.bukkit.entity.Silverfish) super.getBukkitEntity(); } - public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { + public static class EntitySilverfishNPC extends Silverfish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { 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 cb00b7b58..b0bf9e451 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 @@ -41,7 +41,7 @@ public class SkeletonController extends MobEntityController { return (org.bukkit.entity.Skeleton) super.getBukkitEntity(); } - public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { + public static class EntitySkeletonNPC extends Skeleton implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class SkeletonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java index 24dddc288..8ca75c559 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 @@ -41,7 +41,7 @@ public class SkeletonStrayController extends MobEntityController { return (org.bukkit.entity.Stray) super.getBukkitEntity(); } - public static class EntityStrayNPC extends Stray implements NPCHolder { + public static class EntityStrayNPC extends Stray implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java index 964548480..c33821781 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 @@ -41,7 +41,7 @@ public class SkeletonWitherController extends MobEntityController { return (org.bukkit.entity.WitherSkeleton) super.getBukkitEntity(); } - public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { + public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java index 4a312acdb..83f994f3b 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 @@ -44,7 +44,7 @@ public class SlimeController extends MobEntityController { return (org.bukkit.entity.Slime) super.getBukkitEntity(); } - public static class EntitySlimeNPC extends Slime implements NPCHolder { + public static class EntitySlimeNPC extends Slime implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -95,7 +95,7 @@ public class SlimeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java index 040d19c5e..1c8ee90a9 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 @@ -41,7 +41,7 @@ public class SnowmanController extends MobEntityController { return (org.bukkit.entity.Snowman) super.getBukkitEntity(); } - public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { + public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class SnowmanController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java index 7055393b3..83205e6e4 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 @@ -41,7 +41,7 @@ public class SpiderController extends MobEntityController { return (org.bukkit.entity.Spider) super.getBukkitEntity(); } - public static class EntitySpiderNPC extends Spider implements NPCHolder { + public static class EntitySpiderNPC extends Spider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class SpiderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java index 13432747b..b436cfd8d 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 @@ -41,7 +41,7 @@ public class SquidController extends MobEntityController { return (org.bukkit.entity.Squid) super.getBukkitEntity(); } - public static class EntitySquidNPC extends Squid implements NPCHolder { + public static class EntitySquidNPC extends Squid implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class SquidController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java index 4553c4475..1ee84431f 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 @@ -41,7 +41,7 @@ public class StriderController extends MobEntityController { return (org.bukkit.entity.Strider) super.getBukkitEntity(); } - public static class EntityStriderNPC extends Strider implements NPCHolder { + public static class EntityStriderNPC extends Strider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class StriderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java index 8dde072ec..ac3868e2a 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 @@ -50,7 +50,7 @@ public class TraderLlamaController extends MobEntityController { return (org.bukkit.entity.TraderLlama) super.getBukkitEntity(); } - public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { + public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -115,7 +115,7 @@ public class TraderLlamaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java index 6fbaf3d08..e8aad1607 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 @@ -48,7 +48,7 @@ public class TropicalFishController extends MobEntityController { return (org.bukkit.entity.TropicalFish) super.getBukkitEntity(); } - public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { + public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -130,7 +130,7 @@ public class TropicalFishController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java index cf29e4139..39f71a680 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 @@ -45,7 +45,7 @@ public class TurtleController extends MobEntityController { return (org.bukkit.entity.Turtle) super.getBukkitEntity(); } - public static class EntityTurtleNPC extends Turtle implements NPCHolder { + public static class EntityTurtleNPC extends Turtle implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private JumpControl oldJumpController; @@ -116,7 +116,7 @@ public class TurtleController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 1fe79f82e..951b09ffc 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 @@ -39,7 +39,7 @@ public class VexController extends MobEntityController { return (org.bukkit.entity.Vex) super.getBukkitEntity(); } - public static class EntityVexNPC extends Vex implements NPCHolder { + public static class EntityVexNPC extends Vex implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -80,7 +80,7 @@ public class VexController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java index ca4288dd1..fa47cb64f 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 @@ -48,7 +48,7 @@ public class VillagerController extends MobEntityController { return (org.bukkit.entity.Villager) super.getBukkitEntity(); } - public static class EntityVillagerNPC extends Villager implements NPCHolder { + public static class EntityVillagerNPC extends Villager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean blockingATrade; boolean calledNMSHeight = false; @@ -110,7 +110,7 @@ public class VillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java index 3a3da2423..65fd60e74 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 @@ -42,7 +42,7 @@ public class VindicatorController extends MobEntityController { return (org.bukkit.entity.Vindicator) super.getBukkitEntity(); } - public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { + public static class EntityVindicatorNPC extends Vindicator implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class VindicatorController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java index feb49d67f..5f29faf0f 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 @@ -47,7 +47,7 @@ public class WanderingTraderController extends MobEntityController { return (org.bukkit.entity.WanderingTrader) super.getBukkitEntity(); } - public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { + public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean blockingATrade; private boolean blockTrades = true; @@ -107,7 +107,7 @@ public class WanderingTraderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java index af74b910a..16d27dc84 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 @@ -41,7 +41,7 @@ public class WitchController extends MobEntityController { return (org.bukkit.entity.Witch) super.getBukkitEntity(); } - public static class EntityWitchNPC extends Witch implements NPCHolder { + public static class EntityWitchNPC extends Witch implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class WitchController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java index 14cc77969..ceb260994 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 @@ -39,7 +39,7 @@ public class WitherController extends MobEntityController { return (org.bukkit.entity.Wither) super.getBukkitEntity(); } - public static class EntityWitherNPC extends WitherBoss implements NPCHolder { + public static class EntityWitherNPC extends WitherBoss implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -81,7 +81,7 @@ public class WitherController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java index d926045c9..02d4a3882 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 @@ -44,7 +44,7 @@ public class WolfController extends MobEntityController { return (org.bukkit.entity.Wolf) super.getBukkitEntity(); } - public static class EntityWolfNPC extends Wolf implements NPCHolder { + public static class EntityWolfNPC extends Wolf implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -99,7 +99,7 @@ public class WolfController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java index 74cfef756..16a7b5394 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 @@ -41,7 +41,7 @@ public class ZoglinController extends MobEntityController { return (org.bukkit.entity.Zoglin) super.getBukkitEntity(); } - public static class EntityZoglinNPC extends Zoglin implements NPCHolder { + public static class EntityZoglinNPC extends Zoglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -96,7 +96,7 @@ public class ZoglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java index 193967f41..c79ce2985 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 @@ -41,7 +41,7 @@ public class ZombieController extends MobEntityController { return (org.bukkit.entity.Zombie) super.getBukkitEntity(); } - public static class EntityZombieNPC extends Zombie implements NPCHolder { + public static class EntityZombieNPC extends Zombie implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class ZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java index de202d6ed..5d3cfa75e 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 @@ -41,7 +41,7 @@ public class ZombieHuskController extends MobEntityController { return (org.bukkit.entity.Husk) super.getBukkitEntity(); } - public static class EntityZombieHuskNPC extends Husk implements NPCHolder { + public static class EntityZombieHuskNPC extends Husk implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java index ddee65483..57375495f 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 @@ -41,7 +41,7 @@ public class ZombieVillagerController extends MobEntityController { return (org.bukkit.entity.ZombieVillager) super.getBukkitEntity(); } - public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { + public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -94,7 +94,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 68b56a707..fdac96139 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 @@ -41,7 +41,7 @@ public class AreaEffectCloudController extends MobEntityController { } } - public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder { + public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityType types, Level level) { 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 225a48e23..62fe8f62a 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 @@ -46,7 +46,7 @@ public class ArmorStandController extends MobEntityController { } } - public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder { + public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { 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 02597569f..5f2f65b07 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 @@ -47,7 +47,7 @@ public class BoatController extends MobEntityController { } } - public static class EntityBoatNPC extends Boat implements NPCHolder { + public static class EntityBoatNPC extends Boat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double aC; private float aD; 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 c0afe764a..be399e3a1 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 @@ -41,7 +41,7 @@ public class DragonFireballController extends MobEntityController { } } - public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { + public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { 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 6953c7ad8..e37879594 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 @@ -50,7 +50,7 @@ public class EggController extends AbstractEntityController { } } - public static class EntityEggNPC extends ThrownEgg implements NPCHolder { + public static class EntityEggNPC extends ThrownEgg implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { 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 43d932f17..8e11ac8fd 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 @@ -41,7 +41,7 @@ public class EnderCrystalController extends MobEntityController { } } - public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { + public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { 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 f1094c052..d7e63e12d 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 @@ -42,7 +42,7 @@ public class EnderPearlController extends MobEntityController { } } - public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { + public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { 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 7352a31ac..4abfd45db 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 @@ -42,7 +42,7 @@ public class EnderSignalController extends MobEntityController { } } - public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { + public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { 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 fa17ecd91..a21658fa0 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 @@ -40,7 +40,7 @@ public class EvokerFangsController extends MobEntityController { return (org.bukkit.entity.EvokerFangs) super.getBukkitEntity(); } - public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { + public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { 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 357286800..500ec3f7d 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 @@ -35,7 +35,7 @@ public class ExperienceOrbController extends MobEntityController { return (org.bukkit.entity.ExperienceOrb) super.getBukkitEntity(); } - public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { + public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { 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 cf1c6dda9..910815f4d 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 @@ -53,7 +53,7 @@ public class FallingBlockController extends AbstractEntityController { return (FallingBlock) super.getBukkitEntity(); } - public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { + public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { 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 520257ae6..58b0448da 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 @@ -36,7 +36,7 @@ public class FireworkController extends MobEntityController { return (Firework) super.getBukkitEntity(); } - public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { + public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { 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 401e865fd..5a2d14491 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 @@ -44,7 +44,7 @@ public class FishingHookController extends MobEntityController { return (FishHook) super.getBukkitEntity(); } - public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { + public static class EntityFishingHookNPC extends FishingHook implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { 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 a42140af5..19dc04920 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 @@ -46,7 +46,7 @@ public class GlowItemFrameController extends MobEntityController { return (org.bukkit.entity.GlowItemFrame) super.getBukkitEntity(); } - public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { + public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { 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 53b4609eb..7d77fd044 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 @@ -47,7 +47,7 @@ public class ItemController extends AbstractEntityController { return (Item) super.getBukkitEntity(); } - public static class EntityItemNPC extends ItemEntity implements NPCHolder { + public static class EntityItemNPC extends ItemEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { 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 4d99b9439..3fba17e56 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 @@ -45,7 +45,7 @@ public class ItemFrameController extends MobEntityController { return (org.bukkit.entity.ItemFrame) super.getBukkitEntity(); } - public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { + public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { 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 3ac604826..6aaffd347 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 @@ -35,7 +35,7 @@ public class LargeFireballController extends MobEntityController { return (org.bukkit.entity.LargeFireball) super.getBukkitEntity(); } - public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { + public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { 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 3af0623d7..74db5678f 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 @@ -36,7 +36,7 @@ public class LeashController extends MobEntityController { return (LeashHitch) super.getBukkitEntity(); } - public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { + public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { 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 b7e1e8329..efddeee54 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 @@ -47,7 +47,7 @@ public class LlamaSpitController extends AbstractEntityController { return (org.bukkit.entity.LlamaSpit) super.getBukkitEntity(); } - public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { + public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { 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 ad3e45269..6dc7e2b15 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 @@ -35,7 +35,7 @@ public class MarkerController extends MobEntityController { return (org.bukkit.entity.Marker) super.getBukkitEntity(); } - public static class EntityMarkerNPC extends Marker implements NPCHolder { + public static class EntityMarkerNPC extends Marker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { 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 734c35f61..4955fd9c9 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 @@ -36,7 +36,7 @@ public class MinecartChestController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { + public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { 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 25b468522..50e259836 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 @@ -36,7 +36,7 @@ public class MinecartCommandController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { + public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { 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 9db14df10..13136193d 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 @@ -36,7 +36,7 @@ public class MinecartFurnaceController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { + public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { 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 67db9bc75..753a60057 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 @@ -31,7 +31,7 @@ public class MinecartHopperController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { + public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { 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 b12dbb1bb..86e2ae73d 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 @@ -35,7 +35,7 @@ public class MinecartRideableController extends MobEntityController { return (org.bukkit.entity.Minecart) super.getBukkitEntity(); } - public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { + public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { 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 414e43f98..efe773f91 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 @@ -31,7 +31,7 @@ public class MinecartSpawnerController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { + public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { 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 9d977d288..b7fb8a7e5 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 @@ -31,7 +31,7 @@ public class MinecartTNTController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { + public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { 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 e4367b604..9ef4256b6 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 @@ -35,7 +35,7 @@ public class PaintingController extends MobEntityController { return (org.bukkit.entity.Painting) super.getBukkitEntity(); } - public static class EntityPaintingNPC extends Painting implements NPCHolder { + public static class EntityPaintingNPC extends Painting implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { 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 1d68c267e..3fde3f3a3 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 @@ -35,7 +35,7 @@ public class ShulkerBulletController extends MobEntityController { return (org.bukkit.entity.ShulkerBullet) super.getBukkitEntity(); } - public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { + public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { 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 907201f52..19ee9ffe3 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 @@ -35,7 +35,7 @@ public class SmallFireballController extends MobEntityController { return (org.bukkit.entity.SmallFireball) super.getBukkitEntity(); } - public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { + public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { 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 be2e0e0ac..d0a021fa9 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 @@ -35,7 +35,7 @@ public class SnowballController extends MobEntityController { return (org.bukkit.entity.Snowball) super.getBukkitEntity(); } - public static class EntitySnowballNPC extends Snowball implements NPCHolder { + public static class EntitySnowballNPC extends Snowball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { 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 233189499..7629a62fb 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 @@ -36,7 +36,7 @@ public class SpectralArrowController extends MobEntityController { return (Arrow) super.getBukkitEntity(); } - public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { + public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { 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 fea20be20..46f1210ca 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 @@ -36,7 +36,7 @@ public class TNTPrimedController extends MobEntityController { return (TNTPrimed) super.getBukkitEntity(); } - public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { + public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { 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 628ee7a08..656a24c5e 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 @@ -36,7 +36,7 @@ public class ThrownExpBottleController extends MobEntityController { return (ThrownExpBottle) super.getBukkitEntity(); } - public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { + public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { 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 599dd63e7..ce9cb08b2 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 @@ -36,7 +36,7 @@ public class ThrownPotionController extends MobEntityController { return (org.bukkit.entity.ThrownPotion) super.getBukkitEntity(); } - public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { + public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { 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 924c2031a..ba8f3ef67 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 @@ -36,7 +36,7 @@ public class ThrownTridentController extends MobEntityController { return (Trident) super.getBukkitEntity(); } - public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { + public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { 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 6aba9038e..ef5f1525e 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 @@ -35,7 +35,7 @@ public class TippedArrowController extends MobEntityController { return (org.bukkit.entity.Arrow) super.getBukkitEntity(); } - public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { + public static class EntityTippedArrowNPC extends Arrow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { 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 9a0347d8b..aac7bce8e 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 @@ -35,7 +35,7 @@ public class WitherSkullController extends MobEntityController { return (org.bukkit.entity.WitherSkull) super.getBukkitEntity(); } - public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { + public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { 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 de411e71f..17a3cc5f7 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 @@ -57,7 +57,7 @@ public class AllayController extends MobEntityController { } } - public static class EntityAllayNPC extends Allay implements NPCHolder { + public static class EntityAllayNPC extends Allay implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private int taskId = -1; @@ -111,7 +111,7 @@ public class AllayController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java index 5770a5872..939bd32f4 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 @@ -58,7 +58,7 @@ public class AxolotlController extends MobEntityController { } } - public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { + public static class EntityAxolotlNPC extends Axolotl implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -109,7 +109,7 @@ public class AxolotlController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java index 86f85ec03..f56cde200 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 @@ -45,7 +45,7 @@ public class BatController extends MobEntityController { } } - public static class EntityBatNPC extends Bat implements NPCHolder { + public static class EntityBatNPC extends Bat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -90,7 +90,7 @@ public class BatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java index 550550bd5..9c467f660 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 @@ -45,7 +45,7 @@ public class BeeController extends MobEntityController { } } - public static class EntityBeeNPC extends Bee implements NPCHolder { + public static class EntityBeeNPC extends Bee implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -87,7 +87,7 @@ public class BeeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java index c56c62609..cfe77d689 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 @@ -45,7 +45,7 @@ public class BlazeController extends MobEntityController { } } - public static class EntityBlazeNPC extends Blaze implements NPCHolder { + public static class EntityBlazeNPC extends Blaze implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -82,7 +82,7 @@ public class BlazeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java index e9eeb7f86..57fe01f91 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 @@ -57,7 +57,7 @@ public class CamelController extends MobEntityController { } } - public static class EntityCamelNPC extends Camel implements NPCHolder { + public static class EntityCamelNPC extends Camel implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -120,7 +120,7 @@ public class CamelController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java index 5edb49780..636cd36bd 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 @@ -49,7 +49,7 @@ public class CatController extends MobEntityController { } } - public static class EntityCatNPC extends Cat implements NPCHolder { + public static class EntityCatNPC extends Cat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -103,7 +103,7 @@ public class CatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java index 03a9d7a0b..8ee7853fd 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 @@ -48,7 +48,7 @@ public class CaveSpiderController extends MobEntityController { } } - public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { + public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -101,7 +101,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java index 3eee2c3d1..aa1ca1f0e 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 @@ -49,7 +49,7 @@ public class ChickenController extends MobEntityController { } } - public static class EntityChickenNPC extends Chicken implements NPCHolder { + public static class EntityChickenNPC extends Chicken implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -111,7 +111,7 @@ public class ChickenController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java index c875bd6df..fe653ab73 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 @@ -55,7 +55,7 @@ public class CodController extends MobEntityController { } } - public static class EntityCodNPC extends Cod implements NPCHolder { + public static class EntityCodNPC extends Cod implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -136,7 +136,7 @@ public class CodController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java index 4738df0e6..c728fc605 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 @@ -54,7 +54,7 @@ public class CowController extends MobEntityController { } } - public static class EntityCowNPC extends Cow implements NPCHolder { + public static class EntityCowNPC extends Cow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -108,7 +108,7 @@ public class CowController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java index be4d91c67..d096fde5d 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 @@ -49,7 +49,7 @@ public class CreeperController extends MobEntityController { } } - public static class EntityCreeperNPC extends Creeper implements NPCHolder { + public static class EntityCreeperNPC extends Creeper implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean allowPowered; private final CitizensNPC npc; @@ -103,7 +103,7 @@ public class CreeperController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java index 80f7719ef..53dfca16e 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 @@ -50,7 +50,7 @@ public class DolphinController extends MobEntityController { } } - public static class EntityDolphinNPC extends Dolphin implements NPCHolder { + public static class EntityDolphinNPC extends Dolphin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean inProtectedTick; private final CitizensNPC npc; private MoveControl oldMoveController; @@ -102,7 +102,7 @@ public class DolphinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java index 401a3db0b..b6961fbe6 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 @@ -48,7 +48,7 @@ public class DrownedController extends MobEntityController { } } - public static class EntityDrownedNPC extends Drowned implements NPCHolder { + public static class EntityDrownedNPC extends Drowned implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -101,7 +101,7 @@ public class DrownedController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java index dfade54ae..fe533e5c5 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 @@ -46,7 +46,7 @@ public class EnderDragonController extends MobEntityController { } } - public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder { + public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderDragonNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class EnderDragonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java index 67ea81fed..a1bf24473 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 @@ -51,7 +51,7 @@ public class EndermanController extends MobEntityController { } } - public static class EntityEndermanNPC extends EnderMan implements NPCHolder { + public static class EntityEndermanNPC extends EnderMan implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -104,7 +104,7 @@ public class EndermanController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java index f663d2548..945d9e0eb 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 @@ -48,7 +48,7 @@ public class EndermiteController extends MobEntityController { } } - public static class EntityEndermiteNPC extends Endermite implements NPCHolder { + public static class EntityEndermiteNPC extends Endermite implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -101,7 +101,7 @@ public class EndermiteController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java index 542442953..588386766 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 @@ -42,7 +42,7 @@ public class EvokerController extends MobEntityController { return (org.bukkit.entity.Evoker) super.getBukkitEntity(); } - public static class EntityEvokerNPC extends Evoker implements NPCHolder { + public static class EntityEvokerNPC extends Evoker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class EvokerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java index ad3471152..8dbc6c028 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 @@ -43,7 +43,7 @@ public class FoxController extends MobEntityController { return (org.bukkit.entity.Fox) super.getBukkitEntity(); } - public static class EntityFoxNPC extends Fox implements NPCHolder { + public static class EntityFoxNPC extends Fox implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class FoxController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java index ef165f3c4..c286bd9c9 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 @@ -43,7 +43,7 @@ public class FrogController extends MobEntityController { return (org.bukkit.entity.Frog) super.getBukkitEntity(); } - public static class EntityFrogNPC extends Frog implements NPCHolder { + public static class EntityFrogNPC extends Frog implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -100,7 +100,7 @@ public class FrogController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java index 3bbca69eb..51eaf4ac6 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 @@ -39,7 +39,7 @@ public class GhastController extends MobEntityController { return (org.bukkit.entity.Ghast) super.getBukkitEntity(); } - public static class EntityGhastNPC extends Ghast implements NPCHolder { + public static class EntityGhastNPC extends Ghast implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -77,7 +77,7 @@ public class GhastController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java index 3b2e13b0f..4c53b488c 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 @@ -42,7 +42,7 @@ public class GiantController extends MobEntityController { return (org.bukkit.entity.Giant) super.getBukkitEntity(); } - public static class EntityGiantNPC extends Giant implements NPCHolder { + public static class EntityGiantNPC extends Giant implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class GiantController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java index cf5cda7e1..ebe65a41f 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 @@ -42,7 +42,7 @@ public class GlowSquidController extends MobEntityController { return (org.bukkit.entity.GlowSquid) super.getBukkitEntity(); } - public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { + public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class GlowSquidController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java index 316209425..f9d27c673 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 @@ -43,7 +43,7 @@ public class GoatController extends MobEntityController { return (org.bukkit.entity.Goat) super.getBukkitEntity(); } - public static class EntityGoatNPC extends Goat implements NPCHolder { + public static class EntityGoatNPC extends Goat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class GoatController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java index 2bc3fa474..ea5f130f8 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 @@ -42,7 +42,7 @@ public class GuardianController extends MobEntityController { return (org.bukkit.entity.Guardian) super.getBukkitEntity(); } - public static class EntityGuardianNPC extends Guardian implements NPCHolder { + public static class EntityGuardianNPC extends Guardian implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -101,7 +101,7 @@ public class GuardianController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java index 9a9bebab5..48ae7353a 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 @@ -42,7 +42,7 @@ public class GuardianElderController extends MobEntityController { return (org.bukkit.entity.ElderGuardian) super.getBukkitEntity(); } - public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { + public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -101,7 +101,7 @@ public class GuardianElderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java index 19b4ba258..ae72289e6 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 @@ -42,7 +42,7 @@ public class HoglinController extends MobEntityController { return (org.bukkit.entity.Hoglin) super.getBukkitEntity(); } - public static class EntityHoglinNPC extends Hoglin implements NPCHolder { + public static class EntityHoglinNPC extends Hoglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -101,7 +101,7 @@ public class HoglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java index bca376c26..bb10046cf 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 @@ -53,7 +53,7 @@ public class HorseController extends MobEntityController { return (org.bukkit.entity.Horse) super.getBukkitEntity(); } - public static class EntityHorseNPC extends Horse implements NPCHolder { + public static class EntityHorseNPC extends Horse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; private boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -130,7 +130,7 @@ public class HorseController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java index 6785b1dac..7a557bf5a 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 @@ -53,7 +53,7 @@ public class HorseDonkeyController extends MobEntityController { return (org.bukkit.entity.Donkey) super.getBukkitEntity(); } - public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { + public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -130,7 +130,7 @@ public class HorseDonkeyController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java index 9e9ae1c36..68b3285ee 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 @@ -53,7 +53,7 @@ public class HorseMuleController extends MobEntityController { return (org.bukkit.entity.Mule) super.getBukkitEntity(); } - public static class EntityHorseMuleNPC extends Mule implements NPCHolder { + public static class EntityHorseMuleNPC extends Mule implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -130,7 +130,7 @@ public class HorseMuleController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java index 8ce0ddb86..972f3e22e 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 @@ -53,7 +53,7 @@ public class HorseSkeletonController extends MobEntityController { return (org.bukkit.entity.SkeletonHorse) super.getBukkitEntity(); } - public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { + public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -130,7 +130,7 @@ public class HorseSkeletonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java index 1aceb5dff..4bedc47db 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 @@ -53,7 +53,7 @@ public class HorseZombieController extends MobEntityController { return (org.bukkit.entity.ZombieHorse) super.getBukkitEntity(); } - public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { + public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double baseMovementSpeed; boolean calledNMSHeight = false; @@ -130,7 +130,7 @@ public class HorseZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java index 7eaf18b9b..8d2e81263 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 @@ -42,7 +42,7 @@ public class IllusionerController extends MobEntityController { return (org.bukkit.entity.Illusioner) super.getBukkitEntity(); } - public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { + public static class EntityIllusionerNPC extends Illusioner implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class IllusionerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java index 72e5acd02..83d7fafc0 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 @@ -42,7 +42,7 @@ public class IronGolemController extends MobEntityController { return (org.bukkit.entity.IronGolem) super.getBukkitEntity(); } - public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { + public static class EntityIronGolemNPC extends IronGolem implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class IronGolemController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java index 857c23c92..2cb125cb3 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 @@ -51,7 +51,7 @@ public class LlamaController extends MobEntityController { return (org.bukkit.entity.Llama) super.getBukkitEntity(); } - public static class EntityLlamaNPC extends Llama implements NPCHolder { + public static class EntityLlamaNPC extends Llama implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -114,7 +114,7 @@ public class LlamaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java index 81762fc00..be9948229 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 @@ -45,7 +45,7 @@ public class MagmaCubeController extends MobEntityController { return (org.bukkit.entity.MagmaCube) super.getBukkitEntity(); } - public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { + public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -95,7 +95,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java index 1f9bfa636..0cc9ac990 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 @@ -46,7 +46,7 @@ public class MushroomCowController extends MobEntityController { return (org.bukkit.entity.MushroomCow) super.getBukkitEntity(); } - public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { + public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -100,7 +100,7 @@ public class MushroomCowController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java index 4db9f8956..36e082de0 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 @@ -44,7 +44,7 @@ public class OcelotController extends MobEntityController { return (org.bukkit.entity.Ocelot) super.getBukkitEntity(); } - public static class EntityOcelotNPC extends Ocelot implements NPCHolder { + public static class EntityOcelotNPC extends Ocelot implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -103,7 +103,7 @@ public class OcelotController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java index 13bdf05da..c1915e853 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 @@ -43,7 +43,7 @@ public class PandaController extends MobEntityController { return (org.bukkit.entity.Panda) super.getBukkitEntity(); } - public static class EntityPandaNPC extends Panda implements NPCHolder { + public static class EntityPandaNPC extends Panda implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class PandaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java index 4daab0544..0a9c90aa8 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 @@ -42,7 +42,7 @@ public class ParrotController extends MobEntityController { return (org.bukkit.entity.Parrot) super.getBukkitEntity(); } - public static class EntityParrotNPC extends Parrot implements NPCHolder { + public static class EntityParrotNPC extends Parrot implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -86,7 +86,7 @@ public class ParrotController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java index ff7867cbc..80af238ea 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 @@ -46,7 +46,7 @@ public class PhantomController extends MobEntityController { return (org.bukkit.entity.Phantom) super.getBukkitEntity(); } - public static class EntityPhantomNPC extends Phantom implements NPCHolder { + public static class EntityPhantomNPC extends Phantom implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; private LookControl oldLookController; @@ -120,7 +120,7 @@ public class PhantomController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java index 0e69be550..fd84d9ae0 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 @@ -44,7 +44,7 @@ public class PigController extends MobEntityController { return (org.bukkit.entity.Pig) super.getBukkitEntity(); } - public static class EntityPigNPC extends Pig implements NPCHolder { + public static class EntityPigNPC extends Pig implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -98,7 +98,7 @@ public class PigController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java index 2832326ba..c23bc3c66 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 @@ -43,7 +43,7 @@ public class PigZombieController extends MobEntityController { return (org.bukkit.entity.PigZombie) super.getBukkitEntity(); } - public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { + public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -96,7 +96,7 @@ public class PigZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java index 21fa1125c..cb773dca2 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 @@ -42,7 +42,7 @@ public class PiglinBruteController extends MobEntityController { return (org.bukkit.entity.PiglinBrute) super.getBukkitEntity(); } - public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { + public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -98,7 +98,7 @@ public class PiglinBruteController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java index 970b02057..0589753d0 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 @@ -42,7 +42,7 @@ public class PiglinController extends MobEntityController { return (org.bukkit.entity.Piglin) super.getBukkitEntity(); } - public static class EntityPiglinNPC extends Piglin implements NPCHolder { + public static class EntityPiglinNPC extends Piglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -98,7 +98,7 @@ public class PiglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java index 6b981b5f8..107690023 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 @@ -43,7 +43,7 @@ public class PillagerController extends MobEntityController { return (org.bukkit.entity.Pillager) super.getBukkitEntity(); } - public static class EntityPillagerNPC extends Pillager implements NPCHolder { + public static class EntityPillagerNPC extends Pillager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class PillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java index a99e0312f..9cde902a8 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 @@ -40,7 +40,7 @@ public class PolarBearController extends MobEntityController { return (org.bukkit.entity.PolarBear) super.getBukkitEntity(); } - public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { + public static class EntityPolarBearNPC extends PolarBear implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -79,7 +79,7 @@ public class PolarBearController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java index d7d138d07..b5935fbe3 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 @@ -52,7 +52,7 @@ public class PufferFishController extends MobEntityController { return (org.bukkit.entity.PufferFish) super.getBukkitEntity(); } - public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { + public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -131,7 +131,7 @@ public class PufferFishController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java index 006ccf61c..ceff6ec16 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 @@ -44,7 +44,7 @@ public class RabbitController extends MobEntityController { return (org.bukkit.entity.Rabbit) super.getBukkitEntity(); } - public static class EntityRabbitNPC extends Rabbit implements NPCHolder { + public static class EntityRabbitNPC extends Rabbit implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -101,7 +101,7 @@ public class RabbitController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java index 315db2aa3..80c077c62 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 @@ -43,7 +43,7 @@ public class RavagerController extends MobEntityController { return (org.bukkit.entity.Ravager) super.getBukkitEntity(); } - public static class EntityRavagerNPC extends Ravager implements NPCHolder { + public static class EntityRavagerNPC extends Ravager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class RavagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java index a02c89898..a58903ea0 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 @@ -49,7 +49,7 @@ public class SalmonController extends MobEntityController { return (org.bukkit.entity.Salmon) super.getBukkitEntity(); } - public static class EntitySalmonNPC extends Salmon implements NPCHolder { + public static class EntitySalmonNPC extends Salmon implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -128,7 +128,7 @@ public class SalmonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java index f7cfcc552..dedbe2cb8 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 @@ -43,7 +43,7 @@ public class SheepController extends MobEntityController { return (org.bukkit.entity.Sheep) super.getBukkitEntity(); } - public static class EntitySheepNPC extends Sheep implements NPCHolder { + public static class EntitySheepNPC extends Sheep implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class SheepController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java index 497b49100..54b6288e4 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 @@ -43,7 +43,7 @@ public class ShulkerController extends MobEntityController { return (org.bukkit.entity.Shulker) super.getBukkitEntity(); } - public static class EntityShulkerNPC extends Shulker implements NPCHolder { + public static class EntityShulkerNPC extends Shulker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -99,7 +99,7 @@ public class ShulkerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java index ab9738b3e..a58277beb 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 @@ -43,7 +43,7 @@ public class SilverfishController extends MobEntityController { return (org.bukkit.entity.Silverfish) super.getBukkitEntity(); } - public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { + public static class EntitySilverfishNPC extends Silverfish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { 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 99c8bbdab..24053b5b2 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 @@ -42,7 +42,7 @@ public class SkeletonController extends MobEntityController { return (org.bukkit.entity.Skeleton) super.getBukkitEntity(); } - public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { + public static class EntitySkeletonNPC extends Skeleton implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class SkeletonController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java index efdd7a540..ff2422fc9 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 @@ -42,7 +42,7 @@ public class SkeletonStrayController extends MobEntityController { return (org.bukkit.entity.Stray) super.getBukkitEntity(); } - public static class EntityStrayNPC extends Stray implements NPCHolder { + public static class EntityStrayNPC extends Stray implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class SkeletonStrayController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java index fb3cbdfde..34ce316d3 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 @@ -42,7 +42,7 @@ public class SkeletonWitherController extends MobEntityController { return (org.bukkit.entity.WitherSkeleton) super.getBukkitEntity(); } - public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { + public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class SkeletonWitherController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java index 755493669..85aeb0ea8 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 @@ -45,7 +45,7 @@ public class SlimeController extends MobEntityController { return (org.bukkit.entity.Slime) super.getBukkitEntity(); } - public static class EntitySlimeNPC extends Slime implements NPCHolder { + public static class EntitySlimeNPC extends Slime implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -95,7 +95,7 @@ public class SlimeController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java index 81e606b82..b7c4d5931 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 @@ -42,7 +42,7 @@ public class SnowmanController extends MobEntityController { return (org.bukkit.entity.Snowman) super.getBukkitEntity(); } - public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { + public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class SnowmanController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java index 96d64c257..18ad1f143 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 @@ -42,7 +42,7 @@ public class SpiderController extends MobEntityController { return (org.bukkit.entity.Spider) super.getBukkitEntity(); } - public static class EntitySpiderNPC extends Spider implements NPCHolder { + public static class EntitySpiderNPC extends Spider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class SpiderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java index 15f3fc891..5b0e23dfe 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 @@ -42,7 +42,7 @@ public class SquidController extends MobEntityController { return (org.bukkit.entity.Squid) super.getBukkitEntity(); } - public static class EntitySquidNPC extends Squid implements NPCHolder { + public static class EntitySquidNPC extends Squid implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class SquidController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java index 07d8ed5fb..117737b43 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 @@ -42,7 +42,7 @@ public class StriderController extends MobEntityController { return (org.bukkit.entity.Strider) super.getBukkitEntity(); } - public static class EntityStriderNPC extends Strider implements NPCHolder { + public static class EntityStriderNPC extends Strider implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class StriderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java index 21732beca..794779868 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 @@ -50,7 +50,7 @@ public class TadpoleController extends MobEntityController { return (org.bukkit.entity.Tadpole) super.getBukkitEntity(); } - public static class EntityTadpoleNPC extends Tadpole implements NPCHolder { + public static class EntityTadpoleNPC extends Tadpole implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -128,7 +128,7 @@ public class TadpoleController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java index 3c4b0a5f5..951a3e3e6 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 @@ -51,7 +51,7 @@ public class TraderLlamaController extends MobEntityController { return (org.bukkit.entity.TraderLlama) super.getBukkitEntity(); } - public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { + public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -115,7 +115,7 @@ public class TraderLlamaController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java index b588e8ad8..f053de3d1 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 @@ -49,7 +49,7 @@ public class TropicalFishController extends MobEntityController { return (org.bukkit.entity.TropicalFish) super.getBukkitEntity(); } - public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { + public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private MoveControl oldMoveController; @@ -130,7 +130,7 @@ public class TropicalFishController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java index 919047fd2..ec1934ccb 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 @@ -46,7 +46,7 @@ public class TurtleController extends MobEntityController { return (org.bukkit.entity.Turtle) super.getBukkitEntity(); } - public static class EntityTurtleNPC extends Turtle implements NPCHolder { + public static class EntityTurtleNPC extends Turtle implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; private JumpControl oldJumpController; @@ -116,7 +116,7 @@ public class TurtleController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java index 8f691738b..900f6935d 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 @@ -39,7 +39,7 @@ public class VexController extends MobEntityController { return (org.bukkit.entity.Vex) super.getBukkitEntity(); } - public static class EntityVexNPC extends Vex implements NPCHolder { + public static class EntityVexNPC extends Vex implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -80,7 +80,7 @@ public class VexController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java index 32079b8a1..2b1061819 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 @@ -49,7 +49,7 @@ public class VillagerController extends MobEntityController { return (org.bukkit.entity.Villager) super.getBukkitEntity(); } - public static class EntityVillagerNPC extends Villager implements NPCHolder { + public static class EntityVillagerNPC extends Villager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean blockingATrade; boolean calledNMSHeight = false; @@ -110,7 +110,7 @@ public class VillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java index a83773892..2fa85a6b0 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 @@ -43,7 +43,7 @@ public class VindicatorController extends MobEntityController { return (org.bukkit.entity.Vindicator) super.getBukkitEntity(); } - public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { + public static class EntityVindicatorNPC extends Vindicator implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -97,7 +97,7 @@ public class VindicatorController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java index 587b304d0..ee0975922 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 @@ -48,7 +48,7 @@ public class WanderingTraderController extends MobEntityController { return (org.bukkit.entity.WanderingTrader) super.getBukkitEntity(); } - public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { + public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private boolean blockingATrade; private boolean blockTrades = true; boolean calledNMSHeight = false; @@ -107,7 +107,7 @@ public class WanderingTraderController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java index b9190ba3a..f2c1360eb 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 @@ -44,7 +44,7 @@ public class WardenController extends MobEntityController { return (org.bukkit.entity.Warden) super.getBukkitEntity(); } - public static class EntityWardenNPC extends Warden implements NPCHolder { + public static class EntityWardenNPC extends Warden implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWardenNPC(EntityType types, Level level) { @@ -105,7 +105,7 @@ public class WardenController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java index bdc1a3b6b..b4825e072 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 @@ -42,7 +42,7 @@ public class WitchController extends MobEntityController { return (org.bukkit.entity.Witch) super.getBukkitEntity(); } - public static class EntityWitchNPC extends Witch implements NPCHolder { + public static class EntityWitchNPC extends Witch implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class WitchController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java index 3a634c1c0..a1194c9aa 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 @@ -39,7 +39,7 @@ public class WitherController extends MobEntityController { return (org.bukkit.entity.Wither) super.getBukkitEntity(); } - public static class EntityWitherNPC extends WitherBoss implements NPCHolder { + public static class EntityWitherNPC extends WitherBoss implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -81,7 +81,7 @@ public class WitherController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java index 3a1eb76f8..a9ad7ae60 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 @@ -45,7 +45,7 @@ public class WolfController extends MobEntityController { return (org.bukkit.entity.Wolf) super.getBukkitEntity(); } - public static class EntityWolfNPC extends Wolf implements NPCHolder { + public static class EntityWolfNPC extends Wolf implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } boolean calledNMSHeight = false; private final CitizensNPC npc; @@ -99,7 +99,7 @@ public class WolfController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java index b7fa366cf..e05b5a23f 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 @@ -42,7 +42,7 @@ public class ZoglinController extends MobEntityController { return (org.bukkit.entity.Zoglin) super.getBukkitEntity(); } - public static class EntityZoglinNPC extends Zoglin implements NPCHolder { + public static class EntityZoglinNPC extends Zoglin implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -97,7 +97,7 @@ public class ZoglinController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java index 86b11c7e2..41adfa74c 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 @@ -42,7 +42,7 @@ public class ZombieController extends MobEntityController { return (org.bukkit.entity.Zombie) super.getBukkitEntity(); } - public static class EntityZombieNPC extends Zombie implements NPCHolder { + public static class EntityZombieNPC extends Zombie implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class ZombieController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java index bc76442bb..ee6922cc1 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 @@ -42,7 +42,7 @@ public class ZombieHuskController extends MobEntityController { return (org.bukkit.entity.Husk) super.getBukkitEntity(); } - public static class EntityZombieHuskNPC extends Husk implements NPCHolder { + public static class EntityZombieHuskNPC extends Husk implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class ZombieHuskController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java index dab3d6802..9bde01c5c 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 @@ -42,7 +42,7 @@ public class ZombieVillagerController extends MobEntityController { return (org.bukkit.entity.ZombieVillager) super.getBukkitEntity(); } - public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { + public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -95,7 +95,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.dismountTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); } @Override 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 9daee774b..ffec0485c 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 @@ -41,7 +41,7 @@ public class AreaEffectCloudController extends MobEntityController { } } - public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder { + public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityType types, Level level) { 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 aed5a4906..d0b497d2e 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 @@ -46,7 +46,7 @@ public class ArmorStandController extends MobEntityController { } } - public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder { + public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { 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 2b2a8c46e..66aadb56a 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 @@ -48,7 +48,7 @@ public class BoatController extends MobEntityController { } } - public static class EntityBoatNPC extends Boat implements NPCHolder { + public static class EntityBoatNPC extends Boat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double aC; private float aD; private Status aE; 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 e2d1476a8..13b3e891b 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 @@ -49,7 +49,7 @@ public class ChestBoatController extends MobEntityController { } } - public static class EntityChestBoatNPC extends ChestBoat implements NPCHolder { + public static class EntityChestBoatNPC extends ChestBoat implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private double aC; private float aD; private Status aE; 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 852483774..47afd9608 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 @@ -41,7 +41,7 @@ public class DragonFireballController extends MobEntityController { } } - public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { + public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { 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 f990febec..2b44443e7 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 @@ -50,7 +50,7 @@ public class EggController extends AbstractEntityController { } } - public static class EntityEggNPC extends ThrownEgg implements NPCHolder { + public static class EntityEggNPC extends ThrownEgg implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { 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 832bcb216..5cffcc823 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 @@ -41,7 +41,7 @@ public class EnderCrystalController extends MobEntityController { } } - public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { + public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { 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 91f1402cb..b883cc4b1 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 @@ -42,7 +42,7 @@ public class EnderPearlController extends MobEntityController { } } - public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { + public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { 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 ff1c3d2d0..3bfd7aaa0 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 @@ -42,7 +42,7 @@ public class EnderSignalController extends MobEntityController { } } - public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { + public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { 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 182dfdf7d..7509654cd 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 @@ -40,7 +40,7 @@ public class EvokerFangsController extends MobEntityController { return (org.bukkit.entity.EvokerFangs) super.getBukkitEntity(); } - public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { + public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { 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 0d3af5e19..6c1e8b813 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 @@ -35,7 +35,7 @@ public class ExperienceOrbController extends MobEntityController { return (org.bukkit.entity.ExperienceOrb) super.getBukkitEntity(); } - public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { + public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { 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 de5e81b22..e133fc9dc 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 @@ -52,7 +52,7 @@ public class FallingBlockController extends AbstractEntityController { return (FallingBlock) super.getBukkitEntity(); } - public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { + public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { 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 ecf5eaad1..8a72293e9 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 @@ -36,7 +36,7 @@ public class FireworkController extends MobEntityController { return (Firework) super.getBukkitEntity(); } - public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { + public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { 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 f4bc3a0e4..f889fb4c0 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 @@ -44,7 +44,7 @@ public class FishingHookController extends MobEntityController { return (FishHook) super.getBukkitEntity(); } - public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { + public static class EntityFishingHookNPC extends FishingHook implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { 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 3df77e8a2..d76cad070 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 @@ -47,7 +47,7 @@ public class GlowItemFrameController extends MobEntityController { return (org.bukkit.entity.GlowItemFrame) super.getBukkitEntity(); } - public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { + public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { 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 72d32e26c..acd8ae058 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 @@ -47,7 +47,7 @@ public class ItemController extends AbstractEntityController { return (Item) super.getBukkitEntity(); } - public static class EntityItemNPC extends ItemEntity implements NPCHolder { + public static class EntityItemNPC extends ItemEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { 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 2cef3ba42..3258e5c53 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 @@ -46,7 +46,7 @@ public class ItemFrameController extends MobEntityController { return (org.bukkit.entity.ItemFrame) super.getBukkitEntity(); } - public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { + public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { 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 9a43c22fc..fbd61f0cd 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 @@ -35,7 +35,7 @@ public class LargeFireballController extends MobEntityController { return (org.bukkit.entity.LargeFireball) super.getBukkitEntity(); } - public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { + public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { 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 43968a729..c7e96c34b 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 @@ -36,7 +36,7 @@ public class LeashController extends MobEntityController { return (LeashHitch) super.getBukkitEntity(); } - public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { + public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { 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 b2bcf50cb..42421928c 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 @@ -47,7 +47,7 @@ public class LlamaSpitController extends AbstractEntityController { return (org.bukkit.entity.LlamaSpit) super.getBukkitEntity(); } - public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { + public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { 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 f9dc54fff..e6bc00528 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 @@ -35,7 +35,7 @@ public class MarkerController extends MobEntityController { return (org.bukkit.entity.Marker) super.getBukkitEntity(); } - public static class EntityMarkerNPC extends Marker implements NPCHolder { + public static class EntityMarkerNPC extends Marker implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { 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 58e483bed..3cfbc29b3 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 @@ -36,7 +36,7 @@ public class MinecartChestController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { + public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { 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 fadd2ccce..564769e2a 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 @@ -36,7 +36,7 @@ public class MinecartCommandController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { + public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { 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 ec3d937e6..a25e296d7 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 @@ -36,7 +36,7 @@ public class MinecartFurnaceController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { + public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { 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 c9d68a11e..db069822f 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 @@ -31,7 +31,7 @@ public class MinecartHopperController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { + public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { 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 3a029d1d1..a45128c8b 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 @@ -35,7 +35,7 @@ public class MinecartRideableController extends MobEntityController { return (org.bukkit.entity.Minecart) super.getBukkitEntity(); } - public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { + public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { 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 c5a33bdd8..22f751b52 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 @@ -31,7 +31,7 @@ public class MinecartSpawnerController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { + public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { 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 bf954b5a1..fed4bc6b2 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 @@ -31,7 +31,7 @@ public class MinecartTNTController extends MobEntityController { return (Minecart) super.getBukkitEntity(); } - public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { + public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { 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 3f29a4529..7d1b64793 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 @@ -35,7 +35,7 @@ public class PaintingController extends MobEntityController { return (org.bukkit.entity.Painting) super.getBukkitEntity(); } - public static class EntityPaintingNPC extends Painting implements NPCHolder { + public static class EntityPaintingNPC extends Painting implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { 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 f4dc635b5..2ea792deb 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 @@ -35,7 +35,7 @@ public class ShulkerBulletController extends MobEntityController { return (org.bukkit.entity.ShulkerBullet) super.getBukkitEntity(); } - public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { + public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { 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 40ef582c8..adaebd677 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 @@ -35,7 +35,7 @@ public class SmallFireballController extends MobEntityController { return (org.bukkit.entity.SmallFireball) super.getBukkitEntity(); } - public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { + public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { 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 0f8690f13..e77027569 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 @@ -35,7 +35,7 @@ public class SnowballController extends MobEntityController { return (org.bukkit.entity.Snowball) super.getBukkitEntity(); } - public static class EntitySnowballNPC extends Snowball implements NPCHolder { + public static class EntitySnowballNPC extends Snowball implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { 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 985da6c02..dcb459ffb 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 @@ -36,7 +36,7 @@ public class SpectralArrowController extends MobEntityController { return (Arrow) super.getBukkitEntity(); } - public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { + public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { 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 3ea2e7b4c..84da897f6 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 @@ -36,7 +36,7 @@ public class TNTPrimedController extends MobEntityController { return (TNTPrimed) super.getBukkitEntity(); } - public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { + public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { 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 018c1f5a2..efc4f3315 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 @@ -36,7 +36,7 @@ public class ThrownExpBottleController extends MobEntityController { return (ThrownExpBottle) super.getBukkitEntity(); } - public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { + public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { 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 1f5401d45..df5980a6b 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 @@ -36,7 +36,7 @@ public class ThrownPotionController extends MobEntityController { return (org.bukkit.entity.ThrownPotion) super.getBukkitEntity(); } - public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { + public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { 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 d7dbce04c..e713f7d04 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 @@ -36,7 +36,7 @@ public class ThrownTridentController extends MobEntityController { return (Trident) super.getBukkitEntity(); } - public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { + public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { 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 62136b275..2c5cb83b9 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 @@ -35,7 +35,7 @@ public class TippedArrowController extends MobEntityController { return (org.bukkit.entity.Arrow) super.getBukkitEntity(); } - public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { + public static class EntityTippedArrowNPC extends Arrow implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { 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 5b128eb67..eb71c9c41 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 @@ -35,7 +35,7 @@ public class WitherSkullController extends MobEntityController { return (org.bukkit.entity.WitherSkull) super.getBukkitEntity(); } - public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { + public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder {@Override public boolean isPushable() { return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java index 879ef8c19..b42e4f4d9 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java @@ -119,7 +119,7 @@ public class BatController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java index 79898dcb3..9292b7800 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java @@ -113,7 +113,7 @@ public class BlazeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java index a5096b1a6..9df91c723 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java @@ -130,7 +130,7 @@ public class CaveSpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java index 1ec368e7d..3d7437831 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java @@ -141,7 +141,7 @@ public class ChickenController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java index 2b49c5544..2d1cd7c9f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java @@ -156,7 +156,7 @@ public class CowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java index ccca727a7..0957739fb 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java @@ -139,7 +139,7 @@ public class CreeperController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java index bafd4a96f..eedea9e6c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java @@ -105,7 +105,7 @@ public class EnderDragonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java index fa412f9c1..117edfc1a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java @@ -129,7 +129,7 @@ public class EndermanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java index 145437147..06f0b6bba 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java @@ -128,7 +128,7 @@ public class EndermiteController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java index 9b68799b2..5a41a5733 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java @@ -105,7 +105,7 @@ public class GhastController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java index c5600eb3d..7fde7ee26 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java @@ -115,7 +115,7 @@ public class GiantController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java index 5e7c4bfa2..fbc8bec09 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java @@ -108,7 +108,7 @@ public class GuardianController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java index fedc66eb5..8e823734a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java @@ -148,7 +148,7 @@ public class HorseController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java index e51965643..6cde3f27b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java @@ -115,7 +115,7 @@ public class IronGolemController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java index 9ec41a217..3666c84b4 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java @@ -120,7 +120,7 @@ public class MagmaCubeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java index 68e7184bc..3ad4e3548 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java @@ -134,7 +134,7 @@ public class MushroomCowController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java index 241bb8d7a..b7898650f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java @@ -132,7 +132,7 @@ public class OcelotController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java index e73138970..f74be48cf 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java @@ -136,7 +136,7 @@ public class PigController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java index 819d8848b..2cd6199d5 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java @@ -115,7 +115,7 @@ public class PigZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java index bfbaf2b7b..4b0b2cdee 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java @@ -131,7 +131,7 @@ public class RabbitController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java index 420cbcecf..28fb6c089 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java @@ -125,7 +125,7 @@ public class SheepController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java index 696deb93c..2b836b37d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java @@ -114,7 +114,7 @@ public class SilverfishController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java index 9850f4371..fe3ad4cba 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java @@ -115,7 +115,7 @@ public class SkeletonController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java index 8703ec05f..8f3703b7b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java @@ -121,7 +121,7 @@ public class SlimeController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java index 12cae9d2a..d5d4cc1da 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java @@ -115,7 +115,7 @@ public class SnowmanController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java index 2738f4a6d..731be4436 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java @@ -114,7 +114,7 @@ public class SpiderController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java index e41b9ffd5..14b4dad2c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java @@ -107,7 +107,7 @@ public class SquidController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java index 2814c650e..0b9f9c144 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java @@ -148,7 +148,7 @@ public class VillagerController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java index f95107f97..177e37061 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java @@ -114,7 +114,7 @@ public class WitchController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java index 6921fe2f8..71c06cbdd 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java @@ -106,7 +106,7 @@ public class WitherController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java index 2bccd7e42..dfef6e37c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java @@ -129,7 +129,7 @@ public class WolfController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java index 13e43f865..e68a64b76 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java @@ -115,7 +115,7 @@ public class ZombieController extends MobEntityController { @Override public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, d0, d1, d2, () -> super.enderTeleportTo(d0, d1, d2)); + NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); } @Override