diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java index 0df50ae4f..52ece266e 100644 --- a/main/src/main/java/net/citizensnpcs/Settings.java +++ b/main/src/main/java/net/citizensnpcs/Settings.java @@ -264,7 +264,7 @@ public class Settings { PATHFINDER_FALL_DISTANCE( "The default allowed maximum fall distance when pathfinding, set to -1 to use the default value", "npc.pathfinding.allowed-fall-distance", -1), - PLACEHOLDER_SKIN_UPDATE_FREQUENCY("How often to update placeholders", + PLACEHOLDER_SKIN_UPDATE_FREQUENCY("How often to update skin placeholders", "npc.skins.placeholder-update-frequency-ticks", "npc.skins.placeholder-update-frequency", "5m"), PLAYER_TELEPORT_DELAY("npc.delay-player-teleport-ticks", "npc.delay-player-teleport", -1), REMOVE_PLAYERS_FROM_PLAYER_LIST("Whether to remove NPCs from the Java list of players", diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java index 2d7ee494c..22cd81995 100644 --- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java +++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java @@ -32,7 +32,6 @@ import net.citizensnpcs.api.util.RemoveReason; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.ArmorStandTrait; import net.citizensnpcs.trait.LookClose; -import net.citizensnpcs.util.NMS; public class CitizensNPCRegistry implements NPCRegistry { private final String name; @@ -187,9 +186,7 @@ public class CitizensNPCRegistry implements NPCRegistry { @Override public NPC getNPC(Entity entity) { - if (entity == null) - return null; - return entity instanceof NPCHolder ? ((NPCHolder) entity).getNPC() : NMS.getNPC(entity); + return entity instanceof NPCHolder ? ((NPCHolder) entity).getNPC() : null; } @Override diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java index 7eebc18b7..50f65813d 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMS.java +++ b/main/src/main/java/net/citizensnpcs/util/NMS.java @@ -505,29 +505,13 @@ public class NMS { return original; } - public static Method getMethod(Class clazz, String method, boolean log, Class... params) { - if (clazz == null) - return null; - Method f = null; - try { - f = clazz.getDeclaredMethod(method, params); - f.setAccessible(true); - } catch (Exception e) { - if (log) { - Messaging.severeTr(Messages.ERROR_GETTING_METHOD, method, e.getLocalizedMessage()); - if (Messaging.isDebugging()) { - e.printStackTrace(); - } - } - } - return f; - } - public static MethodHandle getMethodHandle(Class clazz, String method, boolean log, Class... params) { if (clazz == null) return null; try { - return LOOKUP.unreflect(getMethod(clazz, method, log, params)); + Method m = clazz.getDeclaredMethod(method, params); + m.setAccessible(true); + return LOOKUP.unreflect(m); } catch (Exception e) { if (log) { Messaging.severeTr(Messages.ERROR_GETTING_METHOD, method, e.getLocalizedMessage()); @@ -547,10 +531,6 @@ public class NMS { return Lists.newArrayList(CitizensAPI.getLocationLookup().getNearbyVisiblePlayers(from, location, radius)); } - public static NPC getNPC(Entity entity) { - return BRIDGE.getNPC(entity); - } - public static EntityPacketTracker getPacketTracker(Entity entity) { if (entity == null) return null; diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java index cf23505c1..3f852d97b 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java +++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java @@ -97,8 +97,6 @@ public interface NMSBridge { public float getHorizontalMovement(Entity entity); - public NPC getNPC(Entity entity); - public EntityPacketTracker getPacketTracker(Entity entity); public List getPassengers(Entity entity); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java index 750f886e2..ebf5884f0 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java @@ -52,11 +52,6 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArmorStandNPC(World world) { @@ -83,6 +78,11 @@ public class ArmorStandController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); 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 437ebf8ac..fe63b51c6 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 @@ -47,11 +47,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(World world) { @@ -77,6 +72,11 @@ public class BatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 53d7c23e0..5b638ea21 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 @@ -47,11 +47,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(World world) { @@ -74,6 +69,11 @@ public class BlazeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 805ac120f..da3e26a0e 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 @@ -49,11 +49,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(World world) { @@ -83,6 +78,11 @@ public class CaveSpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 0d2f31028..ff45a8f68 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 @@ -49,11 +49,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(World world) { @@ -92,6 +87,11 @@ public class ChickenController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 ba1753fd1..c5bb4873e 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 @@ -53,11 +53,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(World world) { @@ -106,6 +101,11 @@ public class CowController extends MobEntityController { return super.a(entityhuman, enumhand, itemstack); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 73bc8ae3a..e9bff35c6 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 @@ -53,11 +53,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -94,6 +89,11 @@ public class CreeperController extends MobEntityController { return npc == null || !npc.isProtected() ? super.a(entityhuman, enumhand, itemstack) : false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 604e1914e..7ac13583c 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 @@ -53,11 +53,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(World world) { @@ -80,6 +75,11 @@ public class EnderDragonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 6ec813c2d..eb4195c22 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 @@ -49,11 +49,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(World world) { @@ -83,6 +78,11 @@ public class EndermanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 80b9a23bb..e879f38fe 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 @@ -49,11 +49,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(World world) { @@ -83,6 +78,11 @@ public class EndermiteController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 eea38ab89..1b2f1f035 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 @@ -33,11 +33,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(World world) { @@ -60,6 +55,11 @@ public class GhastController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 0d5080871..22e77d87f 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 @@ -35,11 +35,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(World world) { @@ -69,6 +64,11 @@ public class GiantController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 d6a465f47..136a45171 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 @@ -35,11 +35,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(World world) { @@ -69,6 +64,11 @@ public class GuardianController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 e4c05b81f..5bc242507 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 @@ -47,11 +47,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 59f822e17..2e82da41b 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 @@ -35,11 +35,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(World world) { @@ -69,6 +64,11 @@ public class IronGolemController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 fc127da40..c9ddfb9f2 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 @@ -37,11 +37,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMagmaCubeNPC(World world) { @@ -75,6 +70,11 @@ public class MagmaCubeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 04e4e3edb..80111bbb5 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 @@ -38,11 +38,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(World world) { @@ -88,6 +83,11 @@ public class MushroomCowController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 4989ba3c9..2d8043962 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 @@ -35,11 +35,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(World world) { @@ -78,6 +73,11 @@ public class OcelotController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 2cde38787..1f23f0ec1 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 @@ -36,11 +36,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(World world) { @@ -79,6 +74,11 @@ public class PigController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 57f1544ba..6262b844b 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 @@ -35,11 +35,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(World world) { @@ -69,6 +64,11 @@ public class PigZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 724f37db5..109fc302e 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 @@ -33,11 +33,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(World world) { @@ -69,6 +64,11 @@ public class PolarBearController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 d7e61d33e..cfb2898a5 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 @@ -36,11 +36,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(World world) { @@ -79,6 +74,11 @@ public class RabbitController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 a6c0340b6..70a7214af 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 @@ -35,11 +35,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(World world) { @@ -78,6 +73,11 @@ public class SheepController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 c0247065d..895bf7a8e 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 @@ -36,11 +36,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(World world) { @@ -70,6 +65,11 @@ public class ShulkerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 d811c7a2c..d2cb69acf 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 @@ -35,11 +35,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(World world) { @@ -69,6 +64,11 @@ public class SilverfishController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 e90bd43d8..482c41bef 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 @@ -35,11 +35,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(World world) { @@ -69,6 +64,11 @@ public class SkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 bd6b79036..5434e379d 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 @@ -37,11 +37,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySlimeNPC(World world) { @@ -75,6 +70,11 @@ public class SlimeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 cac0f7b95..d5cf79698 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 @@ -35,11 +35,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(World world) { @@ -69,6 +64,11 @@ public class SnowmanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 70619abe5..c3187ac1f 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 @@ -35,11 +35,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(World world) { @@ -69,6 +64,11 @@ public class SpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 e4fdc6bbf..6642e8bd7 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 @@ -35,11 +35,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(World world) { @@ -69,6 +64,11 @@ public class SquidController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 8c752448e..2e1851e4a 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 @@ -39,11 +39,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -92,6 +87,11 @@ public class VillagerController extends MobEntityController { return super.a(entityhuman, enumhand, itemstack); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 22df8a57b..cf15f093c 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 @@ -35,11 +35,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(World world) { @@ -69,6 +64,11 @@ public class WitchController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 24efd9ba1..bcad45f77 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 @@ -33,11 +33,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(World world) { @@ -60,6 +55,11 @@ public class WitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 a3e44e29e..130be50e5 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 @@ -37,11 +37,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(World world) { @@ -80,6 +75,11 @@ public class WolfController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 3a1e241d1..9d1e82379 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 @@ -35,11 +35,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(World world) { @@ -69,6 +64,11 @@ public class ZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java index 1c5f68c9f..47f81b9a6 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java @@ -45,11 +45,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(World world) { @@ -66,6 +61,11 @@ public class AreaEffectCloudController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java index 2610a2250..9ff1519bb 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java @@ -46,11 +46,6 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBoatNPC(World world) { @@ -67,6 +62,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java index bd9e0c925..d4abef8f3 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java @@ -46,11 +46,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(World world) { @@ -67,6 +62,11 @@ public class DragonFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java index 0fd6919bb..c4dbffc51 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java @@ -56,11 +56,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(World world) { @@ -82,6 +77,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java index 2983e3e49..5e44a5248 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java @@ -45,11 +45,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(World world) { @@ -66,6 +61,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java index 5bd97091d..1cccb334d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java @@ -45,11 +45,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(World world) { @@ -66,6 +61,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java index d6dfebdc5..feb2c1ffe 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java @@ -45,11 +45,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(World world) { @@ -66,6 +61,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java index d9ec1ab40..fccf00810 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java @@ -31,11 +31,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(World world) { @@ -52,6 +47,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java index c3e818c6b..6bc910a59 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java @@ -48,11 +48,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(World world) { @@ -74,6 +69,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java index c1faae22d..d6caec80b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java @@ -31,11 +31,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(World world) { @@ -52,6 +47,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java index 6b7287f4e..a438659bc 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java @@ -31,11 +31,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(World world) { @@ -52,6 +47,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java index cbfa60f40..62c833bac 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java @@ -43,11 +43,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(World world) { @@ -65,6 +60,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java index 0f89681fe..05b850e65 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java @@ -44,11 +44,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(World world) { @@ -65,6 +60,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java index 2b510dcb0..1677c3430 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java @@ -32,11 +32,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(World world) { @@ -53,6 +48,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java index 60058ca6b..25582bad1 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java @@ -31,11 +31,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(World world) { @@ -52,6 +47,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java index 8d08ae5ab..67a510373 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java @@ -32,11 +32,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java index 01876898e..842d4084c 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java @@ -32,11 +32,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java index 06c22ad92..f137c1890 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java @@ -32,11 +32,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java index de932c915..99f60a488 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java @@ -28,11 +28,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java index 26fb661eb..2f123d39c 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java @@ -32,11 +32,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java index f851d41f6..80bd31963 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java @@ -28,11 +28,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java index da7b4f4c8..f466d920f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java @@ -28,11 +28,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java index 26f19cbcc..347031ffd 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java @@ -31,11 +31,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(World world) { @@ -52,6 +47,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java index f8bfe3797..0e8527ebb 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java @@ -31,11 +31,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(World world) { @@ -52,6 +47,11 @@ public class ShulkerBulletController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java index 14986fe60..11e120806 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java @@ -31,11 +31,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(World world) { @@ -52,6 +47,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java index cf2f1cb3f..f65d183e9 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java @@ -31,11 +31,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(World world) { @@ -52,6 +47,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java index a38bb8250..0a6339a53 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java @@ -31,11 +31,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(World world) { @@ -52,6 +47,11 @@ public class SpectralArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java index 7c178d88a..fd60d2930 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java @@ -31,11 +31,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(World world) { @@ -52,6 +47,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java index cc1ffe77e..49bc3d43f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java @@ -31,11 +31,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(World world) { @@ -52,6 +47,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java index 41b7c1e99..e2e0e5335 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java @@ -32,11 +32,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(World world) { @@ -53,6 +48,11 @@ public class ThrownPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java index 7d22f44ec..cb1d424e6 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java @@ -31,11 +31,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(World world) { @@ -52,6 +47,11 @@ public class TippedArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java index a5b96f259..950d3a5db 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java @@ -31,11 +31,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(World world) { @@ -52,6 +47,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean bg() { return npc == null ? super.bg() : npc.isPushableByFluids(); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index 405f9f664..477629b3e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java @@ -482,12 +482,6 @@ public class NMSImpl implements NMSBridge { return handle.bg; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java index 6e38450d7..ea0ebbd3c 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java @@ -50,11 +50,6 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArmorStandNPC(World world) { @@ -81,6 +76,11 @@ public class ArmorStandController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); 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 42ae33862..b75bbaabb 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 @@ -47,11 +47,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(World world) { @@ -77,6 +72,11 @@ public class BatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 5e7d4118f..14bc9220a 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 @@ -47,11 +47,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(World world) { @@ -74,6 +69,11 @@ public class BlazeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 34eecfc04..fa8b6aaf3 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 @@ -49,11 +49,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(World world) { @@ -83,6 +78,11 @@ public class CaveSpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 7a8896f8d..0365da924 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 @@ -49,11 +49,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(World world) { @@ -92,6 +87,11 @@ public class ChickenController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 a4660d614..b9bdbd037 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 @@ -53,11 +53,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(World world) { @@ -106,6 +101,11 @@ public class CowController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 c20a891e8..6ac6ab2a0 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 @@ -50,11 +50,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -86,6 +81,11 @@ public class CreeperController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 7eca67492..63ce4e1a0 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 @@ -54,11 +54,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(World world) { @@ -81,6 +76,11 @@ public class EnderDragonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 d023ce542..1d60fd4c1 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 @@ -49,11 +49,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(World world) { @@ -83,6 +78,11 @@ public class EndermanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 23bb27c5f..632b27931 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 @@ -49,11 +49,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(World world) { @@ -83,6 +78,11 @@ public class EndermiteController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 63d04d996..08b547acf 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 @@ -35,11 +35,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(World world) { @@ -69,6 +64,11 @@ public class EvokerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 b5e9b28d3..5ae1b89c5 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 @@ -33,11 +33,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(World world) { @@ -60,6 +55,11 @@ public class GhastController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 99066b4cc..738bc0528 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 @@ -35,11 +35,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(World world) { @@ -69,6 +64,11 @@ public class GiantController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 abfe9ab1f..aee10ccdc 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 @@ -35,11 +35,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(World world) { @@ -69,6 +64,11 @@ public class GuardianController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 0ea86de51..5a71306cc 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 @@ -35,11 +35,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(World world) { @@ -69,6 +64,11 @@ public class GuardianElderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 428e789f0..e861ea251 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 @@ -45,11 +45,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -96,6 +91,11 @@ public class HorseController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 13e19acf3..db7f33df7 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 @@ -46,11 +46,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseDonkeyController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 9eee76785..b67867fe7 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 @@ -46,11 +46,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseMuleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 a6f9294fb..a7cc4a2d5 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 @@ -46,11 +46,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseSkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 055a5ba86..70ba41398 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 @@ -46,11 +46,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 fe442a89b..36b54e358 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 @@ -35,11 +35,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(World world) { @@ -69,6 +64,11 @@ public class IronGolemController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 a0dc62ff9..27be73e9b 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 @@ -43,11 +43,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends EntityLlama implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLlamaNPC(World world) { @@ -89,6 +84,11 @@ public class LlamaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 2a41a2927..7e9e6eaf9 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 @@ -37,11 +37,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMagmaCubeNPC(World world) { @@ -75,6 +70,11 @@ public class MagmaCubeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); 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 b68025a55..43f00108b 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 @@ -37,11 +37,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(World world) { @@ -87,6 +82,11 @@ public class MushroomCowController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 c7c0fc69c..8b3e91a98 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 @@ -35,11 +35,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(World world) { @@ -78,6 +73,11 @@ public class OcelotController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 b6fb30be2..555e946f7 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 @@ -36,11 +36,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(World world) { @@ -79,6 +74,11 @@ public class PigController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 b64e627ee..15d427814 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 @@ -35,11 +35,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(World world) { @@ -69,6 +64,11 @@ public class PigZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 2e94c0f91..e4a053245 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 @@ -33,11 +33,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(World world) { @@ -69,6 +64,11 @@ public class PolarBearController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 7ba3038be..c7f853cdf 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 @@ -36,11 +36,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(World world) { @@ -79,6 +74,11 @@ public class RabbitController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 f8f276db6..6976b0e95 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 @@ -35,11 +35,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(World world) { @@ -78,6 +73,11 @@ public class SheepController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 abae4b119..00cb84352 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 @@ -36,11 +36,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(World world) { @@ -70,6 +65,11 @@ public class ShulkerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); 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 ac2529e76..b23b84f30 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 @@ -35,11 +35,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(World world) { @@ -69,6 +64,11 @@ public class SilverfishController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 f919a77c0..8d249c03f 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 @@ -35,11 +35,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(World world) { @@ -69,6 +64,11 @@ public class SkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 daacd32a0..175842591 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 @@ -35,11 +35,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(World world) { @@ -69,6 +64,11 @@ public class SkeletonStrayController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 a51068404..c43df81de 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 @@ -35,11 +35,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(World world) { @@ -69,6 +64,11 @@ public class SkeletonWitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 578011c60..4e9d46b12 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 @@ -37,11 +37,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySlimeNPC(World world) { @@ -75,6 +70,11 @@ public class SlimeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); 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 efcbbaa2e..9adcf3030 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 @@ -35,11 +35,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(World world) { @@ -69,6 +64,11 @@ public class SnowmanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 6ed318e74..2097b209d 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 @@ -35,11 +35,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(World world) { @@ -69,6 +64,11 @@ public class SpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 b41efa115..e5aeb7a29 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 @@ -35,11 +35,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(World world) { @@ -69,6 +64,11 @@ public class SquidController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 3bb13a4f7..4168e9e95 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 @@ -33,11 +33,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends EntityVex implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVexNPC(World world) { @@ -63,6 +58,11 @@ public class VexController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 ec58b8600..63c981062 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 @@ -41,11 +41,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class VillagerController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 319dd6eb2..715f7a2f5 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 @@ -35,11 +35,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(World world) { @@ -78,6 +73,11 @@ public class VindicatorController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 dfbcf8bbd..5eb130616 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 @@ -35,11 +35,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(World world) { @@ -69,6 +64,11 @@ public class WitchController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 7d3462723..21d3c4eea 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 @@ -33,11 +33,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(World world) { @@ -60,6 +55,11 @@ public class WitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 b407f761e..37e039611 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 @@ -37,11 +37,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(World world) { @@ -80,6 +75,11 @@ public class WolfController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 c7bf37e94..716bb2521 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 @@ -35,11 +35,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(World world) { @@ -69,6 +64,11 @@ public class ZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 20cad675a..895402ad8 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 @@ -35,11 +35,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(World world) { @@ -69,6 +64,11 @@ public class ZombieHuskController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); 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 96f67776d..1d4cf2625 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 @@ -35,11 +35,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(World world) { @@ -69,6 +64,11 @@ public class ZombieVillagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aY() { return NMS.getFallDistance(npc, super.aY()); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java index 24efc3538..e0ce54185 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java @@ -45,11 +45,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(World world) { @@ -66,6 +61,11 @@ public class AreaEffectCloudController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java index 38c55bf67..60cfb68d8 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java @@ -46,11 +46,6 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBoatNPC(World world) { @@ -67,6 +62,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java index c5ec27037..5a4a20278 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java @@ -46,11 +46,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(World world) { @@ -67,6 +62,11 @@ public class DragonFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java index 2ffd1be33..717f4268e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java @@ -56,11 +56,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(World world) { @@ -82,6 +77,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java index 7179ceb15..da85c387d 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java @@ -45,11 +45,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(World world) { @@ -66,6 +61,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java index 42bcceea0..84993db03 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java @@ -45,11 +45,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(World world) { @@ -66,6 +61,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java index 7d409f5a8..ca87edb95 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java @@ -45,11 +45,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(World world) { @@ -66,6 +61,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java index 292acc08b..172f73521 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java @@ -37,11 +37,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(World world) { @@ -68,6 +63,11 @@ public class EvokerFangsController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java index b06cb12c1..e71014f44 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java @@ -31,11 +31,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(World world) { @@ -52,6 +47,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java index ccc777b12..1d2de5ba3 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java @@ -49,11 +49,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(World world) { @@ -75,6 +70,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java index 62d432fbd..4a8d706ba 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java @@ -31,11 +31,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(World world) { @@ -52,6 +47,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java index 705a05bdd..5d5d3c848 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java @@ -31,11 +31,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(World world) { @@ -52,6 +47,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java index f995b4359..3c7a216bb 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java @@ -43,11 +43,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(World world) { @@ -65,6 +60,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java index d75621de4..015a310aa 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java @@ -44,11 +44,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(World world) { @@ -65,6 +60,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java index 1ca9c5b1f..e781f1690 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java @@ -32,11 +32,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(World world) { @@ -53,6 +48,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java index f856f7c5a..ff7c86912 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java @@ -31,11 +31,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(World world) { @@ -52,6 +47,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java index 0f60372da..759d94daf 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java @@ -44,11 +44,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(World world) { @@ -70,6 +65,11 @@ public class LlamaSpitController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java index 83ac1cb46..f00c5a10e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java @@ -32,11 +32,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java index aff89f85f..0551238ae 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java @@ -32,11 +32,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java index 0967b2f51..2f71576b4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java @@ -32,11 +32,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java index aa49b7087..b062a9ff3 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java @@ -28,11 +28,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java index 39bfe5aa5..e41375a43 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java @@ -32,11 +32,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java index ece727fa9..cb4dbc167 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java @@ -28,11 +28,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java index 87632c5cb..75ff7da99 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java @@ -28,11 +28,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { super.A_(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java index acf3e2acf..3f163f9cd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java @@ -31,11 +31,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(World world) { @@ -52,6 +47,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java index 841f2c415..b5d829e51 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java @@ -31,11 +31,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(World world) { @@ -52,6 +47,11 @@ public class ShulkerBulletController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java index 59d1fdfa5..14555e725 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java @@ -31,11 +31,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(World world) { @@ -52,6 +47,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java index 8899b172d..823412e95 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java @@ -31,11 +31,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(World world) { @@ -52,6 +47,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java index 9938edf19..502908b2b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java @@ -31,11 +31,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(World world) { @@ -52,6 +47,11 @@ public class SpectralArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java index b6ba9107e..27749632f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java @@ -31,11 +31,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(World world) { @@ -52,6 +47,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java index eed345d07..e12806751 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java @@ -31,11 +31,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(World world) { @@ -52,6 +47,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java index abbd1bdbd..5d4d202b3 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java @@ -32,11 +32,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(World world) { @@ -53,6 +48,11 @@ public class ThrownPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java index f32770c97..70d0f4cb5 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java @@ -31,11 +31,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(World world) { @@ -52,6 +47,11 @@ public class TippedArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java index a7a453edf..b05c330fa 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java @@ -31,11 +31,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(World world) { @@ -52,6 +47,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void A_() { if (npc != null) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java index e72d4460f..40e09b828 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java @@ -502,12 +502,6 @@ public class NMSImpl implements NMSBridge { return handle.bf; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java index bacebbee1..a6137f6d5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java @@ -51,11 +51,6 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArmorStandNPC(World world) { @@ -82,6 +77,11 @@ public class ArmorStandController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); 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 967ad0b35..a310acfb8 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 @@ -49,11 +49,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(World world) { @@ -79,6 +74,11 @@ public class BatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 20a64bec4..ae4b05386 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 @@ -49,11 +49,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(World world) { @@ -76,6 +71,11 @@ public class BlazeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 a2200e0e5..18118f5e4 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 @@ -51,11 +51,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(World world) { @@ -85,6 +80,11 @@ public class CaveSpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 d0eeb36ac..b85b79335 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 @@ -51,11 +51,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(World world) { @@ -94,6 +89,11 @@ public class ChickenController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 3d209a122..d0046c6cd 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 @@ -55,11 +55,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(World world) { @@ -108,6 +103,11 @@ public class CowController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 34bdf876a..624e6aa29 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 @@ -52,11 +52,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -88,6 +83,11 @@ public class CreeperController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 7d0f4a371..2c0a88a43 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 @@ -55,11 +55,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(World world) { @@ -82,6 +77,11 @@ public class EnderDragonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 01124874b..e8d19a820 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 @@ -51,11 +51,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(World world) { @@ -85,6 +80,11 @@ public class EndermanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 01c709e9c..1894cdecf 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 @@ -51,11 +51,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(World world) { @@ -85,6 +80,11 @@ public class EndermiteController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java index e6170af6e..7581d4587 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java @@ -1,7 +1,6 @@ package net.citizensnpcs.nms.v1_12_R1.entity; import java.io.IOException; -import java.lang.invoke.MethodHandle; import java.util.List; import java.util.Map; @@ -40,6 +39,7 @@ import net.citizensnpcs.trait.Gravity; import net.citizensnpcs.trait.SkinTrait; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_12_R1.AdvancementDataPlayer; import net.minecraft.server.v1_12_R1.AttributeInstance; import net.minecraft.server.v1_12_R1.AxisAlignedBB; import net.minecraft.server.v1_12_R1.BlockPosition; @@ -201,6 +201,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } + @Override + public AdvancementDataPlayer getAdvancementData() { + return npc == null ? super.getAdvancementData() + : new EmptyAdvancementDataPlayer(server, CitizensAPI.getDataFolder().getParentFile(), this); + } + @Override public CraftPlayer getBukkitEntity() { if (npc != null && !(bukkitEntity instanceof NPCHolder)) { @@ -274,13 +280,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable invulnerableTicks = 0; NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing setSkinFlags((byte) 0xFF); - EmptyAdvancementDataPlayer.clear(this.getAdvancementData()); - try { - ADVANCEMENT_DATA_PLAYER.invoke(this, - new EmptyAdvancementDataPlayer(minecraftServer, CitizensAPI.getDataFolder().getParentFile(), this)); - } catch (Throwable e) { - e.printStackTrace(); - } } @Override @@ -531,7 +530,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - private static MethodHandle ADVANCEMENT_DATA_PLAYER = NMS.getFinalSetter(EntityPlayer.class, "bY"); private static final float EPSILON = 0.005F; private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0); } 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 11a3a2995..eac3e7619 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 @@ -37,11 +37,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(World world) { @@ -71,6 +66,11 @@ public class EvokerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 d574fc9d5..9a08722de 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 @@ -35,11 +35,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(World world) { @@ -62,6 +57,11 @@ public class GhastController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 f5711393f..429ed1eb0 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 @@ -37,11 +37,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(World world) { @@ -71,6 +66,11 @@ public class GiantController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 8eb34b2d2..42aa43455 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 @@ -37,11 +37,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(World world) { @@ -71,6 +66,11 @@ public class GuardianController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 a822c6ff7..5f89d621d 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 @@ -37,11 +37,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(World world) { @@ -71,6 +66,11 @@ public class GuardianElderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 fd4644989..b7b65c4ea 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 @@ -47,11 +47,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 40893eed5..da8678ccd 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 @@ -47,11 +47,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseDonkeyController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 3f4b21f46..8aa5de7b9 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 @@ -47,11 +47,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class HorseMuleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 19f0aa2c5..0a08b95c8 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 @@ -47,11 +47,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -99,6 +94,11 @@ public class HorseSkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 95e97ffa1..4e030e826 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 @@ -47,11 +47,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -99,6 +94,11 @@ public class HorseZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 1f0a3de48..2f8d60c0b 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 @@ -37,11 +37,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends EntityIllagerIllusioner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(World world) { @@ -71,6 +66,11 @@ public class IllusionerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 6722ea62b..427dbd019 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 @@ -37,11 +37,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(World world) { @@ -71,6 +66,11 @@ public class IronGolemController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 fdd6275ad..96cee903e 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 @@ -47,11 +47,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends EntityLlama implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -98,6 +93,11 @@ public class LlamaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 4e463e372..7457dc753 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 @@ -39,11 +39,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMagmaCubeNPC(World world) { @@ -77,6 +72,11 @@ public class MagmaCubeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 b035e891e..880d4e485 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 @@ -39,11 +39,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(World world) { @@ -89,6 +84,11 @@ public class MushroomCowController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 17959a573..09ef54065 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 @@ -37,11 +37,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(World world) { @@ -80,6 +75,11 @@ public class OcelotController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 72851c9ab..5d378ad52 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 @@ -37,11 +37,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends EntityParrot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(World world) { @@ -72,6 +67,11 @@ public class ParrotController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 83073dd57..3c5104633 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 @@ -38,11 +38,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(World world) { @@ -81,6 +76,11 @@ public class PigController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 ea2d30970..9c4346dd0 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 @@ -37,11 +37,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(World world) { @@ -71,6 +66,11 @@ public class PigZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 20cfa71f6..46f43006e 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 @@ -35,11 +35,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(World world) { @@ -71,6 +66,11 @@ public class PolarBearController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 2400b7006..c26b0c25a 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 @@ -38,11 +38,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(World world) { @@ -81,6 +76,11 @@ public class RabbitController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 0fc7c0881..a31aaf3ec 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 @@ -37,11 +37,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(World world) { @@ -80,6 +75,11 @@ public class SheepController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 654235949..819b67ee7 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 @@ -38,11 +38,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(World world) { @@ -72,6 +67,11 @@ public class ShulkerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 c7954e26a..c24f6b6ad 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 @@ -37,11 +37,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(World world) { @@ -71,6 +66,11 @@ public class SilverfishController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 e83b897a5..2770fb65d 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 @@ -37,11 +37,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(World world) { @@ -71,6 +66,11 @@ public class SkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 0ab9315c2..12b20f1de 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 @@ -37,11 +37,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(World world) { @@ -71,6 +66,11 @@ public class SkeletonStrayController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 745d732ad..a33399d1d 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 @@ -37,11 +37,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(World world) { @@ -71,6 +66,11 @@ public class SkeletonWitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 6ca4eba8e..d7afa83eb 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 @@ -39,11 +39,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySlimeNPC(World world) { @@ -77,6 +72,11 @@ public class SlimeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 ee788d9a2..fb62b03f6 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 @@ -37,11 +37,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(World world) { @@ -71,6 +66,11 @@ public class SnowmanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 f97da91aa..b7525715b 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 @@ -37,11 +37,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(World world) { @@ -71,6 +66,11 @@ public class SpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 732f9af56..6b0bf9889 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 @@ -37,11 +37,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(World world) { @@ -71,6 +66,11 @@ public class SquidController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 44574c263..0775e3b2f 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 @@ -35,11 +35,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends EntityVex implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVexNPC(World world) { @@ -65,6 +60,11 @@ public class VexController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 4efe5066c..104a0a16e 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 @@ -43,11 +43,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -100,6 +95,11 @@ public class VillagerController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 8bc3d9860..3f28e46e4 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 @@ -37,11 +37,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(World world) { @@ -80,6 +75,11 @@ public class VindicatorController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 f52bc85e1..2da36bcd2 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 @@ -37,11 +37,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(World world) { @@ -71,6 +66,11 @@ public class WitchController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 1b566437a..76ff60299 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 @@ -35,11 +35,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(World world) { @@ -62,6 +57,11 @@ public class WitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int bg() { return NMS.getFallDistance(npc, super.bg()); 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 f9e5e0006..446c069f9 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 @@ -39,11 +39,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(World world) { @@ -82,6 +77,11 @@ public class WolfController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 f6648c16e..83723bf47 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 @@ -37,11 +37,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(World world) { @@ -71,6 +66,11 @@ public class ZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 5ed146575..f9df6c1e7 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 @@ -37,11 +37,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(World world) { @@ -71,6 +66,11 @@ public class ZombieHuskController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 a5f6dc361..386613cf5 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 @@ -37,11 +37,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(World world) { @@ -71,6 +66,11 @@ public class ZombieVillagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java index d0852960a..40648c0b4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java @@ -46,11 +46,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(World world) { @@ -67,6 +62,11 @@ public class AreaEffectCloudController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java index 091604824..2b6a5b148 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java @@ -47,11 +47,6 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBoatNPC(World world) { @@ -68,6 +63,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java index 18e13490c..36b31e6af 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java @@ -47,11 +47,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(World world) { @@ -68,6 +63,11 @@ public class DragonFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java index 3d5c80372..36f2cbeea 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java @@ -57,11 +57,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(World world) { @@ -83,6 +78,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java index 65f976a2f..b6268af73 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java @@ -46,11 +46,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(World world) { @@ -67,6 +62,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java index f6e178692..b26420bb4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java @@ -46,11 +46,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(World world) { @@ -67,6 +62,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java index 981ddc7a0..cc971a165 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java @@ -46,11 +46,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(World world) { @@ -67,6 +62,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java index 147e28e66..aada77601 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java @@ -38,11 +38,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(World world) { @@ -69,6 +64,11 @@ public class EvokerFangsController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java index 18f243ebf..221614a6a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java @@ -32,11 +32,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(World world) { @@ -53,6 +48,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java index cf8b4ed6b..d4d94fcd1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java @@ -50,11 +50,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(World world) { @@ -76,6 +71,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java index 85bd389c6..d098821bd 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java @@ -32,11 +32,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(World world) { @@ -53,6 +48,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java index b70b44d39..6463bebdc 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java @@ -32,11 +32,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(World world) { @@ -53,6 +48,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java index c2a855452..f9bfd37c6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java @@ -44,11 +44,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(World world) { @@ -66,6 +61,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java index 15cf25434..f5d9a01fc 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java @@ -45,11 +45,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(World world) { @@ -66,6 +61,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java index a21420dbe..88f7cae71 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java @@ -33,11 +33,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(World world) { @@ -54,6 +49,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java index ec2ee7671..77da7f808 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java @@ -32,11 +32,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(World world) { @@ -53,6 +48,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java index 8235cb412..d4ef7c9c4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java @@ -45,11 +45,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(World world) { @@ -71,6 +66,11 @@ public class LlamaSpitController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java index 615437387..bc8089560 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java @@ -33,11 +33,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(World world) { @@ -54,6 +49,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java index c4f37f334..054a92266 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java @@ -33,11 +33,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(World world) { @@ -54,6 +49,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java index 60c318b7b..eb3171d44 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java @@ -33,11 +33,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(World world) { @@ -54,6 +49,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java index 1bce101a7..04938d543 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java @@ -29,11 +29,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(World world) { @@ -50,6 +45,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java index 229f736f4..d535383b9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java @@ -33,11 +33,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(World world) { @@ -54,6 +49,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java index 3c17b7f08..4660ca68c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java @@ -29,11 +29,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(World world) { @@ -50,6 +45,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java index d290e790a..76e27664e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java @@ -29,11 +29,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(World world) { @@ -50,6 +45,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { super.B_(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java index db41dc7bf..9bd17c0c3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java @@ -32,11 +32,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(World world) { @@ -53,6 +48,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java index befc03169..7b221bdaf 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java @@ -32,11 +32,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(World world) { @@ -53,6 +48,11 @@ public class ShulkerBulletController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java index b62afb9e6..3ce287878 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java @@ -32,11 +32,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(World world) { @@ -53,6 +48,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java index cd9bd7cad..0b5f1063f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java @@ -32,11 +32,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(World world) { @@ -53,6 +48,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java index 48e9da8d3..15dd9d43c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java @@ -32,11 +32,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(World world) { @@ -53,6 +48,11 @@ public class SpectralArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java index a2b31a62c..1e2c39d21 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java @@ -32,11 +32,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(World world) { @@ -53,6 +48,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java index 5a174c610..d86db026b 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java @@ -32,11 +32,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(World world) { @@ -53,6 +48,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java index 695df310d..ee51be89b 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java @@ -33,11 +33,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(World world) { @@ -54,6 +49,11 @@ public class ThrownPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java index 4ef67c405..b4732bb3c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java @@ -32,11 +32,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(World world) { @@ -53,6 +48,11 @@ public class TippedArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java index 641f0c292..edae9da55 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java @@ -32,11 +32,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(World world) { @@ -53,6 +48,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void B_() { if (npc != null) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java index 437a70898..eb296540c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java @@ -503,12 +503,6 @@ public class NMSImpl implements NMSBridge { return handle.bg; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java index 1cec0faae..4434dcde4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java @@ -53,11 +53,6 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArmorStandNPC(World world) { @@ -84,6 +79,11 @@ public class ArmorStandController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 dfbb08a37..94b98836b 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 @@ -53,11 +53,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(World world) { @@ -83,6 +78,11 @@ public class BatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 0c56eecbf..c3a651bb7 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 @@ -53,11 +53,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(World world) { @@ -80,6 +75,11 @@ public class BlazeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 34e636333..a62cf9bc3 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 @@ -55,11 +55,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(World world) { @@ -89,6 +84,11 @@ public class CaveSpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 3d500c653..cb087b970 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 @@ -1,6 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity; -import java.lang.reflect.Method; +import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; @@ -57,11 +57,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(World world) { @@ -100,6 +95,11 @@ public class ChickenController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { @@ -249,6 +249,6 @@ public class ChickenController extends MobEntityController { return false; } - private static final Method MOVEMENT_TICK = NMS.getMethod(EntityChicken.class, "k", false); + private static final MethodHandle MOVEMENT_TICK = NMS.getMethodHandle(EntityChicken.class, "k", false); } } 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 2f8464aaf..0f34f7530 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 @@ -60,11 +60,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends EntityCod implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCodNPC(World world) { @@ -107,6 +102,11 @@ public class CodController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 0752bc034..9ce6bd9a9 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 @@ -59,11 +59,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(World world) { @@ -112,6 +107,11 @@ public class CowController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 ff60ec083..6bffe114e 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 @@ -56,11 +56,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -92,6 +87,11 @@ public class CreeperController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 538425eec..50ff326ba 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 @@ -56,11 +56,6 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends EntityDolphin implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean inProtectedTick; private final CitizensNPC npc; @@ -97,6 +92,11 @@ public class DolphinController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 d85f4a245..90c6add99 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 @@ -55,11 +55,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends EntityDrowned implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(World world) { @@ -89,6 +84,11 @@ public class DrownedController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 059f74995..aeb8e747e 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 @@ -1,7 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity; import java.lang.invoke.MethodHandle; -import java.lang.reflect.Method; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; @@ -60,11 +59,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(World world) { @@ -87,6 +81,11 @@ public class EnderDragonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) @@ -288,6 +287,6 @@ public class EnderDragonController extends MobEntityController { java.util.List.class); private static final MethodHandle KNOCKBACK = NMS.getMethodHandle(EntityEnderDragon.class, "a", true, java.util.List.class); - private static final Method MOVEMENT_TICK = NMS.getMethod(EntityEnderDragon.class, "k", false); + private static final MethodHandle MOVEMENT_TICK = NMS.getMethodHandle(EntityEnderDragon.class, "k", false); } } 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 d2780262b..d01e18251 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 @@ -55,11 +55,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(World world) { @@ -89,6 +84,11 @@ public class EndermanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 e69a5722e..b69d20d37 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 @@ -55,11 +55,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(World world) { @@ -89,6 +84,11 @@ public class EndermiteController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 0d614e091..6baf9531c 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 @@ -41,11 +41,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(World world) { @@ -75,6 +70,11 @@ public class EvokerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 caf7f95e3..f3a303787 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 @@ -39,11 +39,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(World world) { @@ -66,6 +61,11 @@ public class GhastController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 fe911f616..db466952a 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 @@ -41,11 +41,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(World world) { @@ -75,6 +70,11 @@ public class GiantController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 b8cb80b92..1e1603082 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 @@ -1,6 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity; -import java.lang.reflect.Method; +import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; @@ -43,11 +43,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(World world) { @@ -77,6 +72,11 @@ public class GuardianController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { @@ -229,7 +229,7 @@ public class GuardianController extends MobEntityController { return false; } - private static final Method MOVEMENT_TICK = NMS.getMethod(EntityGuardian.class, "k", false); + private static final MethodHandle MOVEMENT_TICK = NMS.getMethodHandle(EntityGuardian.class, "k", false); } public static class GuardianNPC extends CraftGuardian implements NPCHolder { 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 76d88b88e..4ab1a4138 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 @@ -1,6 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity; -import java.lang.reflect.Method; +import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; @@ -43,11 +43,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(World world) { @@ -77,6 +72,11 @@ public class GuardianElderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { @@ -229,7 +229,7 @@ public class GuardianElderController extends MobEntityController { return false; } - private static final Method MOVEMENT_TICK = NMS.getMethod(EntityGuardianElder.class, "k", false); + private static final MethodHandle MOVEMENT_TICK = NMS.getMethodHandle(EntityGuardianElder.class, "k", false); } public static class GuardianElderNPC extends CraftElderGuardian implements NPCHolder { 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 3ddcbbd5b..6f045694a 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 @@ -51,11 +51,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -102,6 +97,11 @@ public class HorseController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 7f2a000a1..bae8b9f9e 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 @@ -51,11 +51,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -102,6 +97,11 @@ public class HorseDonkeyController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 bbc4a004d..e4438c6af 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 @@ -51,11 +51,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -102,6 +97,11 @@ public class HorseMuleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 d13de7689..66bcbc6c3 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 @@ -51,11 +51,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -103,6 +98,11 @@ public class HorseSkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 27bbaf557..76059d2ca 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 @@ -51,11 +51,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -103,6 +98,11 @@ public class HorseZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 da1e1f337..c17cef928 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 @@ -41,11 +41,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends EntityIllagerIllusioner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(World world) { @@ -75,6 +70,11 @@ public class IllusionerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 1bc4ac2a2..90096b63d 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 @@ -41,11 +41,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(World world) { @@ -75,6 +70,11 @@ public class IronGolemController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 89c33d3af..50295c4a5 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 @@ -51,11 +51,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends EntityLlama implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -102,6 +97,11 @@ public class LlamaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 8c05ac010..a9003dc44 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 @@ -43,11 +43,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMagmaCubeNPC(World world) { @@ -81,6 +76,11 @@ public class MagmaCubeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 ea0897168..7c7fac1e4 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 @@ -43,11 +43,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(World world) { @@ -93,6 +88,11 @@ public class MushroomCowController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 15cd0cf8e..4edc91e78 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 @@ -41,11 +41,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(World world) { @@ -84,6 +79,11 @@ public class OcelotController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 84a18df38..b5405745c 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 @@ -41,11 +41,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends EntityParrot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(World world) { @@ -76,6 +71,11 @@ public class ParrotController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 2429366f7..2a4e32595 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 @@ -1,6 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity; -import java.lang.reflect.Method; +import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; @@ -46,11 +46,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends EntityPhantom implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPhantomNPC(World world) { @@ -86,6 +81,11 @@ public class PhantomController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { @@ -250,7 +250,7 @@ public class PhantomController extends MobEntityController { return false; } - private static final Method MOVEMENT_TICK = NMS.getMethod(EntityPhantom.class, "k", false); + private static final MethodHandle MOVEMENT_TICK = NMS.getMethodHandle(EntityPhantom.class, "k", false); } public static class PhantomNPC extends CraftPhantom implements NPCHolder { 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 80644956a..217e927b7 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 @@ -42,11 +42,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(World world) { @@ -85,6 +80,11 @@ public class PigController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 0ac13a822..ec5bb88a9 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 @@ -41,11 +41,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(World world) { @@ -75,6 +70,11 @@ public class PigZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 d1a4eee7e..67671f1d7 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 @@ -39,11 +39,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(World world) { @@ -75,6 +70,11 @@ public class PolarBearController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 4d7518fcd..e9ed74766 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 @@ -47,11 +47,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends EntityPufferFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPufferFishNPC(World world) { @@ -94,6 +89,11 @@ public class PufferFishController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 13b45eed1..44d0606a4 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 @@ -42,11 +42,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(World world) { @@ -85,6 +80,11 @@ public class RabbitController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 75f56ed8a..7ac43d681 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 @@ -46,11 +46,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends EntitySalmon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySalmonNPC(World world) { @@ -93,6 +88,11 @@ public class SalmonController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 320ad8262..a0dc5b6a6 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 @@ -41,11 +41,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(World world) { @@ -84,6 +79,11 @@ public class SheepController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 b858f23d4..414a539a8 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 @@ -1,6 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity; -import java.lang.reflect.Method; +import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; @@ -44,11 +44,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(World world) { @@ -78,6 +73,11 @@ public class ShulkerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { @@ -245,7 +245,7 @@ public class ShulkerController extends MobEntityController { return false; } - private static final Method MOVEMENT_TICK = NMS.getMethod(EntityShulker.class, "k", false); + private static final MethodHandle MOVEMENT_TICK = NMS.getMethodHandle(EntityShulker.class, "k", false); } public static class ShulkerNPC extends CraftShulker implements NPCHolder { 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 e41f06e95..9e060121f 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 @@ -41,11 +41,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(World world) { @@ -75,6 +70,11 @@ public class SilverfishController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 33bcc0035..a6fd3ed30 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 @@ -41,11 +41,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(World world) { @@ -75,6 +70,11 @@ public class SkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 a2c6c4df3..67a4d2559 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 @@ -41,11 +41,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(World world) { @@ -75,6 +70,11 @@ public class SkeletonStrayController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 d269e205e..36a6c4ab6 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 @@ -41,11 +41,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(World world) { @@ -75,6 +70,11 @@ public class SkeletonWitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 ab5504432..11ffe0616 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 @@ -43,11 +43,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySlimeNPC(World world) { @@ -81,6 +76,11 @@ public class SlimeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 760b510de..69113cf17 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 @@ -41,11 +41,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(World world) { @@ -75,6 +70,11 @@ public class SnowmanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 18ef61b80..8870acf9e 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 @@ -41,11 +41,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(World world) { @@ -75,6 +70,11 @@ public class SpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 95d0b487a..e709ff2f7 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 @@ -41,11 +41,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(World world) { @@ -75,6 +70,11 @@ public class SquidController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 0f84fd425..5a23b5314 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 @@ -46,11 +46,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends EntityTropicalFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTropicalFishNPC(World world) { @@ -93,6 +88,11 @@ public class TropicalFishController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 fcec4c5de..839e58bb9 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 @@ -44,11 +44,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends EntityTurtle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTurtleNPC(World world) { @@ -82,6 +77,11 @@ public class TurtleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 e0cd4d19a..baa06158b 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 @@ -39,11 +39,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends EntityVex implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVexNPC(World world) { @@ -69,6 +64,11 @@ public class VexController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 86a7d4e5f..4a82c1982 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 @@ -47,11 +47,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -104,6 +99,11 @@ public class VillagerController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 21df73b89..d4281c132 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 @@ -41,11 +41,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(World world) { @@ -84,6 +79,11 @@ public class VindicatorController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 c8aceb803..c4fa6e975 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 @@ -41,11 +41,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(World world) { @@ -75,6 +70,11 @@ public class WitchController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 36beee085..be7daeef7 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 @@ -39,11 +39,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(World world) { @@ -66,6 +61,11 @@ public class WitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 ad37ec2f5..15265199b 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 @@ -43,11 +43,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(World world) { @@ -86,6 +81,11 @@ public class WolfController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 be270d0ad..bed20f3e5 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 @@ -41,11 +41,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(World world) { @@ -75,6 +70,11 @@ public class ZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 374c53614..975435d9e 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 @@ -41,11 +41,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(World world) { @@ -75,6 +70,11 @@ public class ZombieHuskController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { 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 2a36143af..14c46e368 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 @@ -41,11 +41,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(World world) { @@ -75,6 +70,11 @@ public class ZombieVillagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float f, float f1, float f2) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java index 49650b7bc..d8c9f2c3e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java @@ -48,11 +48,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(World world) { @@ -69,6 +64,11 @@ public class AreaEffectCloudController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java index 751162e19..f2cae5c90 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java @@ -49,11 +49,6 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBoatNPC(World world) { @@ -70,6 +65,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java index 587556a31..8b83fa27f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java @@ -49,11 +49,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(World world) { @@ -70,6 +65,11 @@ public class DragonFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java index aa818e066..77ac782a2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java @@ -59,11 +59,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(World world) { @@ -85,6 +80,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java index bae0e4bdf..31833ed35 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java @@ -48,11 +48,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(World world) { @@ -69,6 +64,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java index 54bf1f48b..b09470db7 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java @@ -48,11 +48,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(World world) { @@ -69,6 +64,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java index 9d792c268..57fc175ca 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java @@ -48,11 +48,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(World world) { @@ -69,6 +64,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java index 80ea1c89f..54e7103fa 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java @@ -40,11 +40,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(World world) { @@ -71,6 +66,11 @@ public class EvokerFangsController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java index ece33544e..8a0092935 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java @@ -34,11 +34,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(World world) { @@ -55,6 +50,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java index 67b9122e5..b0cb25270 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java @@ -52,11 +52,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(World world) { @@ -78,6 +73,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java index 23c4c67c3..47749b501 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java @@ -34,11 +34,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(World world) { @@ -55,6 +50,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java index 70acdfa70..91028d277 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java @@ -40,11 +40,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(World world) { @@ -63,6 +58,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java index b523888d9..9fa37936a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java @@ -46,11 +46,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(World world) { @@ -68,6 +63,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java index e75cc48d1..df503e2ae 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java @@ -47,11 +47,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(World world) { @@ -68,6 +63,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java index 8363f165a..4823b946e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java @@ -35,11 +35,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(World world) { @@ -56,6 +51,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java index 08b70bfe4..e67ee7b6b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java @@ -34,11 +34,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(World world) { @@ -55,6 +50,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java index a26e360c9..3237cc00c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java @@ -47,11 +47,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(World world) { @@ -73,6 +68,11 @@ public class LlamaSpitController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java index 3f56938d1..839cf7c9b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java @@ -35,11 +35,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(World world) { @@ -56,6 +51,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java index 6cf49d9c6..d8b211ae5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java @@ -35,11 +35,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(World world) { @@ -56,6 +51,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java index 87ee605cc..7824d39b4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java @@ -35,11 +35,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(World world) { @@ -56,6 +51,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java index e10754f55..b2f8ca0cf 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java @@ -31,11 +31,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(World world) { @@ -52,6 +47,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java index 585f9cfee..f568954ce 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java @@ -35,11 +35,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(World world) { @@ -56,6 +51,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java index 240cbfc57..0c1dc99f3 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java @@ -31,11 +31,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(World world) { @@ -52,6 +47,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java index 6fb0d5c16..91192f513 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java @@ -31,11 +31,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(World world) { @@ -52,6 +47,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java index 56bc02cdb..533982944 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java @@ -34,11 +34,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(World world) { @@ -55,6 +50,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java index 01821b3af..334f9689c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java @@ -34,11 +34,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(World world) { @@ -55,6 +50,11 @@ public class ShulkerBulletController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java index 46869f89b..356329db2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java @@ -34,11 +34,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(World world) { @@ -55,6 +50,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java index ce9f214c8..9054012d3 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java @@ -34,11 +34,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(World world) { @@ -55,6 +50,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java index 4f0f40efa..c09650217 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java @@ -34,11 +34,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(World world) { @@ -55,6 +50,11 @@ public class SpectralArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java index 9df7d312e..19fd07343 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java @@ -34,11 +34,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(World world) { @@ -55,6 +50,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java index 82fb318bf..dad4a60ab 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java @@ -34,11 +34,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(World world) { @@ -55,6 +50,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java index 5e53c3f38..fb2647180 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java @@ -35,11 +35,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(World world) { @@ -56,6 +51,11 @@ public class ThrownPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java index 7bfa8b96c..c6b66710f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java @@ -34,11 +34,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends EntityThrownTrident implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(World world) { @@ -55,6 +50,11 @@ public class ThrownTridentController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java index dd2d35750..bdfd1578c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java @@ -34,11 +34,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(World world) { @@ -55,6 +50,11 @@ public class TippedArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java index 2458e179f..c29a3f014 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java @@ -34,11 +34,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(World world) { @@ -55,6 +50,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index 39b8959a4..a7310f03b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -525,12 +525,6 @@ public class NMSImpl implements NMSBridge { return handle.bj; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); @@ -2051,7 +2045,7 @@ public class NMSImpl implements NMSBridge { } else if (ENTITY_FISH_METHOD != null) { ENTITY_FISH_METHOD.invoke(entity, false); } - } catch (Exception ex) { + } catch (Throwable ex) { ex.printStackTrace(); } } @@ -2091,26 +2085,20 @@ public class NMSImpl implements NMSBridge { navigation.d(); } - private static MethodHandle ADVANCEMENT_PLAYER_FIELD = NMS.getFinalSetter(EntityPlayer.class, "cf"); - private static final Set BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.SILVERFISH, EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, EntityType.SHULKER, EntityType.PHANTOM); - - private static final Method BLOCK_POSITION_B_D = NMS.getMethod(BlockPosition.PooledBlockPosition.class, "e", false, - double.class, double.class, double.class); - + private static final MethodHandle BLOCK_POSITION_B_D = NMS.getMethodHandle(BlockPosition.PooledBlockPosition.class, + "e", false, double.class, double.class, double.class); private static final Field CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getField(CraftBossBar.class, "handle"); - private static final float DEFAULT_SPEED = 1F; - private static final Field ENDERDRAGON_BATTLE_BAR_FIELD = NMS.getField(EnderDragonBattle.class, "c", false); private static final Field ENDERDRAGON_BATTLE_FIELD = NMS.getField(EntityEnderDragon.class, "bR"); public static MethodHandle ENDERDRAGON_CHECK_WALLS = NMS.getFirstMethodHandleWithReturnType(EntityEnderDragon.class, true, boolean.class, AxisAlignedBB.class); private static DataWatcherObject ENDERMAN_ANGRY; - private static Method ENTITY_FISH_METHOD = NMS.getMethod(EntityFish.class, "t", false, boolean.class); + private static MethodHandle ENTITY_FISH_METHOD = NMS.getMethodHandle(EntityFish.class, "t", false, boolean.class); private static Field ENTITY_FISH_NUM_IN_SCHOOL; private static MethodHandle ENTITY_NAVIGATION = NMS.getFirstSetter(EntityInsentient.class, Navigation.class); private static CustomEntityRegistry ENTITY_REGISTRY; diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java index 9fae46e65..f6ac8e248 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java @@ -1,6 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.util; -import java.lang.reflect.Method; +import java.lang.invoke.MethodHandle; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC; @@ -528,7 +528,8 @@ public class PlayerNavigation extends NavigationAbstract { } } - private static final Method GET_MONOTONIC_MILLIS = NMS.getMethod(SystemUtils.class, "b", false); - private static final Method PROFILER_ENTER = NMS.getMethod(MethodProfiler.class, "a", false, String.class); - private static final Method PROFILER_EXIT = NMS.getMethod(MethodProfiler.class, "e", false); + private static final MethodHandle GET_MONOTONIC_MILLIS = NMS.getMethodHandle(SystemUtils.class, "b", false); + private static final MethodHandle PROFILER_ENTER = NMS.getMethodHandle(MethodProfiler.class, "a", false, + String.class); + private static final MethodHandle PROFILER_EXIT = NMS.getMethodHandle(MethodProfiler.class, "e", false); } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java index 8ffd7956a..0f8a2b4cb 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java @@ -1,6 +1,6 @@ package net.citizensnpcs.nms.v1_13_R2.util; -import java.lang.reflect.Method; +import java.lang.invoke.MethodHandle; import java.util.EnumSet; import java.util.HashSet; import java.util.Iterator; @@ -450,17 +450,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract { try { VoxelShape var3 = (VoxelShape) GET_COLLISION_SHAPE.invoke(var0.getType(var2), var0, var2); return var2.getY() + ((Boolean) IS_EMPTY.invoke(var3) ? 0.0D : var3.c(EnumAxis.Y)); - } catch (Exception ex2) { + } catch (Throwable ex2) { ex2.printStackTrace(); return 0; } } } - private static final Method BLOCK_POSITION_B_C = NMS.getMethod(BlockPosition.PooledBlockPosition.class, "f", false, - int.class, int.class, int.class); - private static final Method GET_COLLISION_SHAPE = NMS.getMethod(IBlockData.class, "h", false, IBlockAccess.class, + private static final MethodHandle BLOCK_POSITION_B_C = NMS.getMethodHandle(BlockPosition.PooledBlockPosition.class, + "f", false, int.class, int.class, int.class); + private static final MethodHandle GET_COLLISION_SHAPE = NMS.getMethodHandle(IBlockData.class, "h", false, + IBlockAccess.class, BlockPosition.class); + private static final MethodHandle GET_FLUID = NMS.getMethodHandle(IBlockAccess.class, "b", false, BlockPosition.class); - private static final Method GET_FLUID = NMS.getMethod(IBlockAccess.class, "b", false, BlockPosition.class); - private static final Method IS_EMPTY = NMS.getMethod(VoxelShape.class, "b", false); + private static final MethodHandle IS_EMPTY = NMS.getMethodHandle(VoxelShape.class, "b", false); } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java index c5d3c4654..8ee243985 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java @@ -55,11 +55,6 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArmorStandNPC(EntityTypes types, World world) { @@ -86,6 +81,11 @@ public class ArmorStandController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 cedc02e5a..7720c4d0b 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 @@ -55,11 +55,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityTypes types, World world) { @@ -85,6 +80,11 @@ public class BatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 446fb6095..e9198c6a8 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 @@ -55,11 +55,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityTypes types, World world) { @@ -82,6 +77,11 @@ public class BlazeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 6fac63056..4ef5ca559 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 @@ -58,11 +58,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends EntityCat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityTypes types, World world) { @@ -101,6 +96,11 @@ public class CatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 a849296e6..c4fe10d7f 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 @@ -57,11 +57,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityTypes types, World world) { @@ -91,6 +86,11 @@ public class CaveSpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 7c460a0c5..8f227bf52 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 @@ -58,11 +58,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityTypes types, World world) { @@ -101,6 +96,11 @@ public class ChickenController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 e85b742d3..071a21ee5 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 @@ -62,11 +62,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends EntityCod implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCodNPC(EntityTypes types, World world) { @@ -109,6 +104,11 @@ public class CodController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 34e3a8b09..597ca3888 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 @@ -62,11 +62,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityTypes types, World world) { @@ -115,6 +110,11 @@ public class CowController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 95441f7fd..36bf0eb9c 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 @@ -58,11 +58,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -94,6 +89,11 @@ public class CreeperController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 b4d9b5baf..dd03e98aa 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 @@ -59,11 +59,6 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends EntityDolphin implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean inProtectedTick; private final CitizensNPC npc; @@ -100,6 +95,11 @@ public class DolphinController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean au() { return inProtectedTick ? true : super.au(); 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 1cb0293c3..e0d9a692b 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 @@ -57,11 +57,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends EntityDrowned implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityTypes types, World world) { @@ -91,6 +86,11 @@ public class DrownedController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 744bede06..b63fab0c7 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 @@ -60,11 +60,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(EntityTypes types, World world) { @@ -87,6 +82,11 @@ public class EnderDragonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 fe0a59a5f..f1bda3970 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 @@ -57,11 +57,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityTypes types, World world) { @@ -98,6 +93,11 @@ public class EndermanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 8dba9ed29..980ddae33 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 @@ -57,11 +57,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityTypes types, World world) { @@ -91,6 +86,11 @@ public class EndermiteController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 2d9024d27..ee4364a73 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 @@ -43,11 +43,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class EvokerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 d41d1eec8..f76cfba45 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 @@ -47,11 +47,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends EntityFox implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityTypes types, World world) { @@ -90,6 +85,11 @@ public class FoxController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 b925b1440..93f9f5c47 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 @@ -41,11 +41,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityTypes types, World world) { @@ -68,6 +63,11 @@ public class GhastController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 00c95d270..9378954e4 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 @@ -43,11 +43,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class GiantController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 3020f2ee9..e2210c3a3 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 @@ -43,11 +43,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class GuardianController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 13b2bdadf..317e7f90f 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 @@ -43,11 +43,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class GuardianElderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 f0cbf152e..e744c52f7 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 @@ -54,11 +54,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -106,6 +101,11 @@ public class HorseController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 658dcce88..61a270495 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 @@ -54,11 +54,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -105,6 +100,11 @@ public class HorseDonkeyController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 981f3f22e..eb0545865 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 @@ -54,11 +54,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -105,6 +100,11 @@ public class HorseMuleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 086958d68..605f3056e 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 @@ -54,11 +54,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -106,6 +101,11 @@ public class HorseSkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 6dcf68678..8d2d523e7 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 @@ -54,11 +54,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -106,6 +101,11 @@ public class HorseZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 adb8b2357..e5dbf0eb1 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 @@ -43,11 +43,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends EntityIllagerIllusioner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class IllusionerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 81ecd3d7e..d6e662686 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 @@ -43,11 +43,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class IronGolemController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 f8ece0f04..17fe541a8 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 @@ -54,11 +54,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends EntityLlama implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -105,6 +100,11 @@ public class LlamaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 ddba06f52..f2a4b6780 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 @@ -45,11 +45,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMagmaCubeNPC(EntityTypes types, World world) { @@ -83,6 +78,11 @@ public class MagmaCubeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 472c54b3e..31956fe55 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 @@ -46,11 +46,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityTypes types, World world) { @@ -96,6 +91,11 @@ public class MushroomCowController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 87c478e3c..9b3d663c5 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 @@ -44,11 +44,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityTypes types, World world) { @@ -87,6 +82,11 @@ public class OcelotController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 794b5ef89..9dd7f6aad 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 @@ -44,11 +44,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends EntityPanda implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityTypes types, World world) { @@ -87,6 +82,11 @@ public class PandaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 f735389d1..6cb898e4e 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 @@ -43,11 +43,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends EntityParrot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class ParrotController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 8e4955c4c..a78fbd9da 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 @@ -46,11 +46,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends EntityPhantom implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPhantomNPC(EntityTypes types, World world) { @@ -85,6 +80,11 @@ public class PhantomController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 da0f3edb4..1d6e76b53 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 @@ -45,11 +45,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class PigController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 f70c32f91..696649453 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 @@ -43,11 +43,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class PigZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 43cb3b11d..fa1dee1dc 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 @@ -44,11 +44,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends EntityPillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityTypes types, World world) { @@ -87,6 +82,11 @@ public class PillagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 1f8b3dfaa..ae1f8d198 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 @@ -42,11 +42,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class PolarBearController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 4f883abc2..3acb67104 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 @@ -51,11 +51,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends EntityPufferFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPufferFishNPC(EntityTypes types, World world) { @@ -98,6 +93,11 @@ public class PufferFishController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public EntitySize a(EntityPose entitypose) { if (npc == null) 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 b58267b99..52ae573a0 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 @@ -45,11 +45,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class RabbitController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 8f251a755..7cd66df1f 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 @@ -44,11 +44,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends EntityRavager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityTypes types, World world) { @@ -87,6 +82,11 @@ public class RavagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 2f41f18b1..92692ecfb 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 @@ -48,11 +48,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends EntitySalmon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySalmonNPC(EntityTypes types, World world) { @@ -95,6 +90,11 @@ public class SalmonController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 a89d6db65..158074ca7 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 @@ -44,11 +44,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityTypes types, World world) { @@ -87,6 +82,11 @@ public class SheepController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 fb4a7bbe6..07135f8fb 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 @@ -44,11 +44,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class ShulkerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 e831f3e43..cbba453a9 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 @@ -43,11 +43,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class SilverfishController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 f948840c2..dcc0f9462 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 @@ -43,11 +43,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class SkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 ddfbe883a..6a91191a7 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 @@ -43,11 +43,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class SkeletonStrayController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 965fc0f46..53e1c3656 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 @@ -43,11 +43,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class SkeletonWitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 28515b2b9..d9611020f 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 @@ -45,11 +45,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySlimeNPC(EntityTypes types, World world) { @@ -83,6 +78,11 @@ public class SlimeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 6f52ea4f7..a00fa21de 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 @@ -43,11 +43,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class SnowmanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 161db6ae7..47d885d98 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 @@ -43,11 +43,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class SpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 e71b617b4..466f3cfde 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 @@ -43,11 +43,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class SquidController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 32197ca45..f575a29a7 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 @@ -54,11 +54,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends EntityLlamaTrader implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityTypes types, World world) { @@ -101,6 +96,11 @@ public class TraderLlamaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 5d0f55c56..31f526454 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 @@ -48,11 +48,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends EntityTropicalFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTropicalFishNPC(EntityTypes types, World world) { @@ -95,6 +90,11 @@ public class TropicalFishController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 9791cc2f8..3b764f3b4 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 @@ -46,11 +46,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends EntityTurtle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTurtleNPC(EntityTypes types, World world) { @@ -84,6 +79,11 @@ public class TurtleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 427681666..15d1be88e 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 @@ -41,11 +41,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends EntityVex implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class VexController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 f6aff55d6..d719a254c 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 @@ -52,11 +52,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private TreeMap behaviorMap; private boolean blockingATrade; @@ -113,6 +108,11 @@ public class VillagerController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 97ac42e42..147a79246 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 @@ -44,11 +44,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityTypes types, World world) { @@ -87,6 +82,11 @@ public class VindicatorController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 843f9a400..9223e43c6 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 @@ -52,11 +52,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends EntityVillagerTrader implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private TreeMap behaviorMap; private boolean blockingATrade; @@ -113,6 +108,11 @@ public class WanderingTraderController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 f802c2c16..3997c9f2c 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 @@ -43,11 +43,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class WitchController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 0723ea5ea..fbd7dba59 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 @@ -41,11 +41,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityTypes types, World world) { @@ -68,6 +63,11 @@ public class WitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 c758c2802..2c16c719a 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 @@ -46,11 +46,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityTypes types, World world) { @@ -89,6 +84,11 @@ public class WolfController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 f79d3d66b..6d9f2c1cb 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 @@ -43,11 +43,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class ZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 6f354fbc9..30c750e3a 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 @@ -43,11 +43,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class ZombieHuskController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { 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 37f54e4f6..2b4104cf8 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 @@ -43,11 +43,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class ZombieVillagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void b(float f, float f1) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java index fe992cb3e..e724387e3 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java @@ -51,11 +51,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class AreaEffectCloudController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java index 29af915e6..40586896e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java @@ -51,11 +51,6 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBoatNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java index 2ce34808e..91d14abe6 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java @@ -51,11 +51,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class DragonFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java index e742ee64f..fb096fe42 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java @@ -62,11 +62,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java index 02c57033c..7234d1592 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java @@ -51,11 +51,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java index b4adbc8b7..3bc826a14 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java @@ -51,11 +51,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java index 52e2ed41d..7c4ee57d5 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java @@ -51,11 +51,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java index a6a20448a..0e3072dbb 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java @@ -42,11 +42,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityTypes types, World world) { @@ -73,6 +68,11 @@ public class EvokerFangsController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java index 154a16627..25b0e7df0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java @@ -37,11 +37,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java index ef4539251..b1a00cc5b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java @@ -54,11 +54,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityTypes types, World world) { @@ -80,6 +75,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java index 04eca6c79..a2e1dc607 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java @@ -37,11 +37,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java index 3665fdaf8..1aa2095ce 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java @@ -46,11 +46,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityTypes types, World world) { @@ -70,6 +65,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java index 3694d0ac9..228303ab9 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java @@ -49,11 +49,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java index ebf80797d..a53acab07 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java @@ -50,11 +50,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java index 4a6dabe80..4d8d06305 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java @@ -37,11 +37,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java index d21c12d75..7218c44d5 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java @@ -37,11 +37,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java index e1d9eb714..b11193288 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java @@ -51,11 +51,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class LlamaSpitController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java index 770b39ea8..6a9ce2507 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java @@ -37,11 +37,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java index 27ddac449..35ddeb2ee 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java @@ -37,11 +37,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java index 57609d9b1..651ec05eb 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java @@ -37,11 +37,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java index 1ecdeaae7..6f2e75b1d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java @@ -33,11 +33,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java index 8d5e0b48d..a84656a87 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java @@ -37,11 +37,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java index 5f1110c37..e3b1c1ccc 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java @@ -33,11 +33,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java index 864044059..7b4310ba2 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java @@ -33,11 +33,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java index 7b82f8916..1133acee6 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java @@ -37,11 +37,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java index 4d93a6aab..16acb65ac 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java @@ -37,11 +37,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class ShulkerBulletController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java index 302888e41..8b49c5aca 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java @@ -37,11 +37,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java index c0da3353c..c0f59694a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java @@ -37,11 +37,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java index c6d0c3fcc..8625d9656 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java @@ -37,11 +37,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class SpectralArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java index 654a5ce40..f0512e3d0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java @@ -37,11 +37,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java index 6bfed95f1..a09ae1e88 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java @@ -37,11 +37,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java index 35056c97f..f01002394 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java @@ -38,11 +38,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ThrownPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java index c41e5eb09..799f3bb65 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java @@ -37,11 +37,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends EntityThrownTrident implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class ThrownTridentController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java index 1fbddaa39..e68917e71 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java @@ -37,11 +37,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class TippedArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java index 9ae7b6c06..eb11d0640 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java @@ -37,11 +37,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityTypes types, World world) { @@ -58,6 +53,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index 237ecc582..775a28d9d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -565,12 +565,6 @@ public class NMSImpl implements NMSBridge { return handle.bd; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java index e8986b619..759201b4b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java @@ -48,11 +48,6 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArmorStandNPC(EntityTypes types, World world) { @@ -79,6 +74,11 @@ public class ArmorStandController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 b96c46419..215f67fa0 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 @@ -48,11 +48,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class BatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 34956e7bc..a6431d5f0 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 @@ -48,11 +48,6 @@ public class BeeController extends MobEntityController { } public static class EntityBeeNPC extends EntityBee implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBeeNPC(EntityTypes types, World world) { @@ -75,6 +70,11 @@ public class BeeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 0f3440400..03bef8440 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 @@ -48,11 +48,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityTypes types, World world) { @@ -75,6 +70,11 @@ public class BlazeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 dee276578..629d69bac 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 @@ -51,11 +51,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends EntityCat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityTypes types, World world) { @@ -94,6 +89,11 @@ public class CatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 e5626e0b7..8dcbc9add 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 @@ -50,11 +50,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityTypes types, World world) { @@ -84,6 +79,11 @@ public class CaveSpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 c295a97d0..2ef7c22d0 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 @@ -51,11 +51,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityTypes types, World world) { @@ -94,6 +89,11 @@ public class ChickenController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 bda3faf1c..59683bf8f 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 @@ -56,11 +56,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends EntityCod implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -106,6 +101,11 @@ public class CodController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 f434aa134..3514c5752 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 @@ -55,11 +55,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityTypes types, World world) { @@ -108,6 +103,11 @@ public class CowController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 997d4fde7..cbc0bd3f1 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 @@ -51,11 +51,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -87,6 +82,11 @@ public class CreeperController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 d20682e3e..53b72bc52 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 @@ -53,11 +53,6 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends EntityDolphin implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean inProtectedTick; private final CitizensNPC npc; @@ -97,6 +92,11 @@ public class DolphinController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean ay() { return inProtectedTick ? true : super.ay(); 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 d010ddb4c..9f3cdb334 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 @@ -50,11 +50,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends EntityDrowned implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityTypes types, World world) { @@ -84,6 +79,11 @@ public class DrownedController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 3b436adc1..91f15095a 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 @@ -54,11 +54,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(EntityTypes types, World world) { @@ -81,6 +76,11 @@ public class EnderDragonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 bc376a220..fa581b009 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 @@ -50,11 +50,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityTypes types, World world) { @@ -91,6 +86,11 @@ public class EndermanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 02a1c64a9..1bf5beadd 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 @@ -50,11 +50,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityTypes types, World world) { @@ -84,6 +79,11 @@ public class EndermiteController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 daf0f0805..e09896b24 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 @@ -44,11 +44,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class EvokerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 a2edd479a..c951da9db 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 @@ -48,11 +48,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends EntityFox implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityTypes types, World world) { @@ -91,6 +86,11 @@ public class FoxController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 e39174445..263c754ee 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 @@ -42,11 +42,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityTypes types, World world) { @@ -69,6 +64,11 @@ public class GhastController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 122e21084..1f6da4842 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 @@ -44,11 +44,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class GiantController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 01a6b930a..6ff721306 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 @@ -44,11 +44,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class GuardianController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 7dc9459af..a5c04e886 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 @@ -44,11 +44,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class GuardianElderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 e40a99491..5f35943bf 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 @@ -55,11 +55,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -107,6 +102,11 @@ public class HorseController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 8dddc870c..935250379 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 @@ -55,11 +55,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -106,6 +101,11 @@ public class HorseDonkeyController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 0a4f6858e..2579d9400 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 @@ -55,11 +55,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -106,6 +101,11 @@ public class HorseMuleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 ca6fe3f78..1b32e8182 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 @@ -55,11 +55,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -107,6 +102,11 @@ public class HorseSkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 244117ae7..e89201127 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 @@ -55,11 +55,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -107,6 +102,11 @@ public class HorseZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 b6e452a64..cd625535a 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 @@ -44,11 +44,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends EntityIllagerIllusioner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class IllusionerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 07f03d64f..9812db166 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 @@ -44,11 +44,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class IronGolemController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 8054f5dca..3b2b76ad4 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 @@ -55,11 +55,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends EntityLlama implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -106,6 +101,11 @@ public class LlamaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 8d869af1f..73522f8f6 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 @@ -47,11 +47,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -88,6 +83,11 @@ public class MagmaCubeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 efca0f5e8..595f522cd 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 @@ -47,11 +47,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityTypes types, World world) { @@ -97,6 +92,11 @@ public class MushroomCowController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 84bee357a..ec1d91aff 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 @@ -46,11 +46,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityTypes types, World world) { @@ -89,6 +84,11 @@ public class OcelotController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 175618f25..8cd557621 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 @@ -45,11 +45,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends EntityPanda implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class PandaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 ae4b4690d..8e9b4fbf1 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 @@ -44,11 +44,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends EntityParrot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityTypes types, World world) { @@ -79,6 +74,11 @@ public class ParrotController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 d300c3bae..04e67a40b 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 @@ -47,11 +47,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends EntityPhantom implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerLook oldLookController; @@ -92,6 +87,11 @@ public class PhantomController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 ac97e8163..610825700 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 @@ -46,11 +46,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityTypes types, World world) { @@ -89,6 +84,11 @@ public class PigController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 a5f1b1bb2..1a8496c4d 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 @@ -44,11 +44,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class PigZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 f6e81c7e9..935b10d68 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 @@ -45,11 +45,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends EntityPillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class PillagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 c23a7c7ac..dca85d4ec 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 @@ -43,11 +43,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityTypes types, World world) { @@ -79,6 +74,11 @@ public class PolarBearController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 cf6bb9539..bd80babe4 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 @@ -53,11 +53,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends EntityPufferFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -103,6 +98,11 @@ public class PufferFishController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public EntitySize a(EntityPose entitypose) { if (npc == null) 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 fe000c7ba..e546aeedd 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 @@ -46,11 +46,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityTypes types, World world) { @@ -89,6 +84,11 @@ public class RabbitController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 10028d979..cfe8ac602 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 @@ -45,11 +45,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends EntityRavager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class RavagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 885011bf5..926195f07 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 @@ -50,11 +50,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends EntitySalmon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -100,6 +95,11 @@ public class SalmonController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 6b9e80eb8..1f024ede9 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 @@ -45,11 +45,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class SheepController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 be3ee2f53..b0904b559 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 @@ -45,11 +45,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityTypes types, World world) { @@ -79,6 +74,11 @@ public class ShulkerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 3b6be448c..a4559c82c 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 @@ -44,11 +44,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class SilverfishController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 798973a3f..216789682 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 @@ -44,11 +44,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class SkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 fe67911e4..78fd3e8ed 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 @@ -44,11 +44,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class SkeletonStrayController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 6a558bc44..3b4a4f9b0 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 @@ -44,11 +44,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class SkeletonWitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 7e48b7923..f7bc46b88 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 @@ -47,11 +47,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -88,6 +83,11 @@ public class SlimeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 182b24ad3..3f0a7d72d 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 @@ -44,11 +44,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class SnowmanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 d30bbec96..1949b09fc 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 @@ -44,11 +44,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class SpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 7e4dcb2fb..3bd1f18cd 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 @@ -44,11 +44,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class SquidController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 39d560f32..b081b05cb 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 @@ -55,11 +55,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends EntityLlamaTrader implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityTypes types, World world) { @@ -102,6 +97,11 @@ public class TraderLlamaController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 013868730..f2ae222b6 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 @@ -50,11 +50,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends EntityTropicalFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -100,6 +95,11 @@ public class TropicalFishController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 8d6d897a5..6acedca86 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 @@ -48,11 +48,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends EntityTurtle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerJump oldJumpController; @@ -92,6 +87,11 @@ public class TurtleController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 22ea6ddaa..7f304df24 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 @@ -42,11 +42,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends EntityVex implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class VexController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 14fef6441..79bf3da1b 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 @@ -52,11 +52,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -112,6 +107,11 @@ public class VillagerController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 d337d6973..c201cdd29 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 @@ -45,11 +45,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class VindicatorController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 1ebeb55da..c28c109ce 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 @@ -52,11 +52,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends EntityVillagerTrader implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private boolean blockTrades = true; @@ -111,6 +106,11 @@ public class WanderingTraderController extends MobEntityController { return super.a(entityhuman, enumhand); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 39b64eb3e..07f9a8a24 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 @@ -43,11 +43,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class WitchController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 e7c2f4bee..d3a50bdff 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 @@ -42,11 +42,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityTypes types, World world) { @@ -69,6 +64,11 @@ public class WitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) 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 26dab48d0..248be8753 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 @@ -47,11 +47,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityTypes types, World world) { @@ -90,6 +85,11 @@ public class WolfController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 78075ae9e..350b38929 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 @@ -44,11 +44,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class ZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 ec549887a..42667d7e3 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 @@ -44,11 +44,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class ZombieHuskController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) 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 077a0902f..4d4734e8c 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 @@ -44,11 +44,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class ZombieVillagerController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(float f, float f1) { if (npc == null || !npc.isFlyable()) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java index 49bc66a05..95fa704bc 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java @@ -44,11 +44,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class AreaEffectCloudController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java index 4d32cb8b5..536d13016 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java @@ -50,20 +50,15 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double aD; private float aE; + private EnumStatus aF; private EnumStatus aG; private float aq; private float as; private final CitizensNPC npc; - public EntityBoatNPC(EntityTypes types, World world) { this(types, world, null); } @@ -78,6 +73,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java index 9d06c9555..d90bf7bdf 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java @@ -44,11 +44,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class DragonFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java index b74fe66a7..5fc1b4b73 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java @@ -55,11 +55,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityTypes types, World world) { @@ -81,6 +76,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java index 77c4eae4a..4eebf130e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java @@ -44,11 +44,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java index ca64284f3..985ce7ea4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java @@ -44,11 +44,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java index f95b4462e..6959983cd 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java @@ -44,11 +44,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java index facb9067b..f62419d50 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java @@ -43,11 +43,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityTypes types, World world) { @@ -74,6 +69,11 @@ public class EvokerFangsController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java index 2f77d1874..eefe0883d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java @@ -38,11 +38,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java index f293b46b5..77d8d6c59 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java @@ -54,11 +54,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityTypes types, World world) { @@ -80,6 +75,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java index 0b7454b7f..70c53a2a2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java @@ -38,11 +38,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java index e45e1bb0c..2bf09bd4d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java @@ -47,11 +47,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java index 303c6dd10..7aa677121 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java @@ -49,11 +49,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java index eac5a5235..db2d404e3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java @@ -50,11 +50,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java index 863aadf42..ff28e139b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java @@ -38,11 +38,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java index 0826ff279..784355e42 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java @@ -38,11 +38,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java index 1875291a2..6417f7c97 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java @@ -52,11 +52,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class LlamaSpitController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java index 21a51feaa..b3b1de28c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java @@ -38,11 +38,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java index ab067c90f..da70dd60b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java @@ -38,11 +38,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java index e2e4ef922..8436d6160 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java @@ -38,11 +38,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java index 2d674e08e..b8136fc03 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java @@ -33,11 +33,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java index e6819154e..899b1b0a3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java @@ -38,11 +38,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java index 77ff42f2b..ba808d114 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java @@ -33,11 +33,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java index aa88587bf..f29411e4c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java @@ -33,11 +33,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java index 49834cd63..5ac2a51de 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java @@ -38,11 +38,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java index 27f48ccf0..9d786ac27 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java @@ -38,11 +38,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ShulkerBulletController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java index 96b589c68..56a1aa557 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java @@ -38,11 +38,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java index 9f78604a4..ed279cd4e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java @@ -38,11 +38,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java index 7373a2423..618b8bfe4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java @@ -38,11 +38,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class SpectralArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java index 5a162a377..f42b2a6e1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java @@ -38,11 +38,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java index 9aea12bdb..64c280119 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java @@ -38,11 +38,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java index a679c2101..fb2e24f5a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java @@ -39,11 +39,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityTypes types, World world) { @@ -60,6 +55,11 @@ public class ThrownPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java index 8a91b234b..2607fddac 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java @@ -38,11 +38,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends EntityThrownTrident implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ThrownTridentController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java index 4fe9f443f..df04365b8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java @@ -38,11 +38,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class TippedArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java index a7ef2b1a4..155a3c65e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java @@ -38,11 +38,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean b(Tag tag) { if (npc == null) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index e3ba20ae3..7741a33f6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -580,12 +580,6 @@ public class NMSImpl implements NMSBridge { return handle.bb; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java index 20a303cf6..33b50b22b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java @@ -49,14 +49,9 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder, ForwardingMobAI { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private MobAI ai; - private final CitizensNPC npc; + private final CitizensNPC npc; public EntityArmorStandNPC(EntityTypes types, World world) { this(types, world, null); } @@ -84,6 +79,11 @@ public class ArmorStandController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) 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 693f3f1ca..c226e861e 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 @@ -48,11 +48,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class BatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 842006df8..26121901d 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 @@ -48,11 +48,6 @@ public class BeeController extends MobEntityController { } public static class EntityBeeNPC extends EntityBee implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBeeNPC(EntityTypes types, World world) { @@ -69,6 +64,11 @@ public class BeeController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 9c13aa7ce..e29300f18 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 @@ -48,11 +48,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityTypes types, World world) { @@ -69,6 +64,11 @@ public class BlazeController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 e867252e5..f0563ea43 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 @@ -51,11 +51,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends EntityCat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class CatController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 979ea5dbf..135b6e5f6 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 @@ -50,11 +50,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class CaveSpiderController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 66fd541b1..3bcd23ef1 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 @@ -51,11 +51,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityTypes types, World world) { @@ -88,6 +83,11 @@ public class ChickenController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 d391d2498..6e1dbc753 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 @@ -57,11 +57,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends EntityCod implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -91,6 +86,11 @@ public class CodController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 d19300f44..c42cf3ff0 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 @@ -56,11 +56,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityTypes types, World world) { @@ -93,6 +88,11 @@ public class CowController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 5bde24c38..779ec6c26 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 @@ -52,11 +52,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -82,6 +77,11 @@ public class CreeperController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 401a2ac89..fb8cb7550 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 @@ -53,11 +53,6 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends EntityDolphin implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean inProtectedTick; private final CitizensNPC npc; @@ -91,6 +86,11 @@ public class DolphinController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 599e17dbe..39c3e500b 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 @@ -50,11 +50,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends EntityDrowned implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class DrownedController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 adb380b49..31e3c4e3e 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 @@ -54,11 +54,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(EntityTypes types, World world) { @@ -75,6 +70,11 @@ public class EnderDragonController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 f19e2c1ea..76b718efa 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 @@ -50,11 +50,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityTypes types, World world) { @@ -85,6 +80,11 @@ public class EndermanController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 e18c356a7..0227bb9c5 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 @@ -50,11 +50,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class EndermiteController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 0d46ae711..17b8b7514 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 @@ -44,11 +44,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class EvokerController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 b075dbff6..2be99f304 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 @@ -48,11 +48,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends EntityFox implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityTypes types, World world) { @@ -85,6 +80,11 @@ public class FoxController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 4e3d91d7b..997081cbc 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 @@ -42,11 +42,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityTypes types, World world) { @@ -63,6 +58,11 @@ public class GhastController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 351b8b5ab..08dbff801 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 @@ -44,11 +44,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class GiantController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 a121a05b1..1df05b52d 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 @@ -44,11 +44,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 25d1155fa..8679f6345 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 @@ -44,11 +44,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 3d05b336e..4f8590134 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 @@ -44,11 +44,6 @@ public class HoglinController extends MobEntityController { } public static class EntityHoglinNPC extends EntityHoglin implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityHoglinNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class HoglinController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 fbc545417..5603f5cf8 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 @@ -55,11 +55,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -101,6 +96,11 @@ public class HorseController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 92b0b95eb..6523b05db 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 @@ -55,11 +55,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -100,6 +95,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 ddadb649c..a34db645a 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 @@ -55,11 +55,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -100,6 +95,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 1fbd5dd81..be1a46b31 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 @@ -55,11 +55,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -101,6 +96,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 27871631b..a1ef68956 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 @@ -55,11 +55,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -101,6 +96,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 77e4c981f..8c50e713e 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 @@ -44,11 +44,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends EntityIllagerIllusioner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class IllusionerController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 9648814f9..bd7cc3eec 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 @@ -44,11 +44,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class IronGolemController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 793766ddd..94f3241b2 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 @@ -55,11 +55,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends EntityLlama implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -100,6 +95,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 a7feb56f7..549921d01 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 @@ -47,11 +47,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -82,6 +77,11 @@ public class MagmaCubeController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 e52a289f9..60b9259af 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 @@ -48,11 +48,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityTypes types, World world) { @@ -85,6 +80,11 @@ public class MushroomCowController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 cfe9fecde..e3d67ea3e 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 @@ -46,11 +46,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityTypes types, World world) { @@ -83,6 +78,11 @@ public class OcelotController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 f370a1922..237816695 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 @@ -45,11 +45,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends EntityPanda implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityTypes types, World world) { @@ -82,6 +77,11 @@ public class PandaController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 20fe03101..4ed835e4f 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 @@ -45,11 +45,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends EntityParrot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityTypes types, World world) { @@ -66,6 +61,11 @@ public class ParrotController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 ef9aa0d83..ed3ca6ab7 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 @@ -48,11 +48,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends EntityPhantom implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerLook oldLookController; @@ -96,6 +91,11 @@ public class PhantomController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 e3786d956..4e5aacb38 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 @@ -47,11 +47,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityTypes types, World world) { @@ -84,6 +79,11 @@ public class PigController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 710737aa7..7ebe2c7d5 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 @@ -44,11 +44,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class PigZombieController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 37c993bc5..896edab75 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 @@ -44,11 +44,6 @@ public class PiglinBruteController extends MobEntityController { } public static class EntityPiglinBruteNPC extends EntityPiglinBrute implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class PiglinBruteController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 87aa75d9c..a012c697d 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 @@ -49,11 +49,6 @@ public class PiglinController extends MobEntityController { } public static class EntityPiglinNPC extends EntityPiglin implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPiglinNPC(EntityTypes types, World world) { @@ -77,6 +72,11 @@ public class PiglinController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 f79364bca..eb6ad445f 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 @@ -45,11 +45,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends EntityPillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityTypes types, World world) { @@ -82,6 +77,11 @@ public class PillagerController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 6063a12fd..096b5d85d 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 @@ -43,11 +43,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityTypes types, World world) { @@ -73,6 +68,11 @@ public class PolarBearController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 5daf24176..1dd38076f 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 @@ -54,11 +54,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends EntityPufferFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -88,6 +83,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public EntitySize a(EntityPose entitypose) { if (npc == null) 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 31eb88893..c28ed4e2f 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 @@ -46,11 +46,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityTypes types, World world) { @@ -83,6 +78,11 @@ public class RabbitController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 35c34020f..c7201636e 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 @@ -45,11 +45,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends EntityRavager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityTypes types, World world) { @@ -82,6 +77,11 @@ public class RavagerController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 18b950dfc..4227b1c98 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 @@ -51,11 +51,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends EntitySalmon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -85,6 +80,11 @@ public class SalmonController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 b38865411..81ce3e070 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 @@ -45,11 +45,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityTypes types, World world) { @@ -82,6 +77,11 @@ public class SheepController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 25623140c..0d66808ea 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 @@ -45,11 +45,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityTypes types, World world) { @@ -73,6 +68,11 @@ public class ShulkerController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 a65ca3c4d..cb8ab2144 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 @@ -44,11 +44,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class SilverfishController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 d3b007fb3..b3f5f478f 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 @@ -44,11 +44,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class SkeletonController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 e0684f14a..3b6320e6f 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 @@ -44,11 +44,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class SkeletonStrayController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 b84674a53..43e36f1ba 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 @@ -44,11 +44,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class SkeletonWitherController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 73c5b41c6..6e17dbd04 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 @@ -47,11 +47,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -82,6 +77,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 d821a2fb4..d75d92298 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 @@ -44,11 +44,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class SnowmanController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 a24dcba1a..41b582dbe 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 @@ -44,11 +44,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class SpiderController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 d996a29fe..179ec13f2 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 @@ -44,11 +44,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class SquidController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 dc8663c91..2a501536b 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 @@ -44,11 +44,6 @@ public class StriderController extends MobEntityController { } public static class EntityStriderNPC extends EntityStrider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityStriderNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class StriderController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 81276e750..361444114 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 @@ -55,11 +55,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends EntityLlamaTrader implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityTypes types, World world) { @@ -96,6 +91,11 @@ public class TraderLlamaController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 8f9d230df..cc8e6942c 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 @@ -51,11 +51,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends EntityTropicalFish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerMove oldMoveController; @@ -85,6 +80,11 @@ public class TropicalFishController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 ef286ccf4..22a5f5fd0 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 @@ -48,11 +48,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends EntityTurtle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; private ControllerJump oldJumpController; @@ -86,6 +81,11 @@ public class TurtleController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 a5b20ea3e..c9cf2d637 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 @@ -42,11 +42,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends EntityVex implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityTypes types, World world) { @@ -66,6 +61,11 @@ public class VexController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 b79f8c47d..24b59b434 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 @@ -54,11 +54,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -96,6 +91,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 71e42b77d..27cd9f8a4 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 @@ -45,11 +45,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityTypes types, World world) { @@ -82,6 +77,11 @@ public class VindicatorController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 c94bb541d..200451f83 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 @@ -54,11 +54,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends EntityVillagerTrader implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private boolean blockTrades = true; @@ -95,6 +90,11 @@ public class WanderingTraderController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 72c1d24a4..861f604c5 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 @@ -44,11 +44,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class WitchController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 6fd1f18d8..e9c3c0e86 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 @@ -42,11 +42,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityTypes types, World world) { @@ -63,6 +58,11 @@ public class WitherController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 1a7dc0bee..ca8cff819 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 @@ -47,11 +47,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityTypes types, World world) { @@ -84,6 +79,11 @@ public class WolfController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 c3c2b5988..1ba8a806a 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 @@ -44,11 +44,6 @@ public class ZoglinController extends MobEntityController { } public static class EntityZoglinNPC extends EntityZoglin implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZoglinNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class ZoglinController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 307780f52..2ceb07d77 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 @@ -44,11 +44,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class ZombieController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 e76b69490..e9d43fef1 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 @@ -44,11 +44,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class ZombieHuskController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), 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 bc5fee0d9..093109e93 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 @@ -44,11 +44,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityTypes types, World world) { @@ -72,6 +67,11 @@ public class ZombieVillagerController extends MobEntityController { } } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public void a(float strength, double dx, double dz) { NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(), diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java index 476515d45..f028dac9e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java @@ -44,11 +44,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class AreaEffectCloudController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java index 8c551903c..3a0e1aeae 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java @@ -50,20 +50,15 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double aC; private float aD; + private EnumStatus aE; private EnumStatus aF; private double ap; private double ar; private final CitizensNPC npc; - public EntityBoatNPC(EntityTypes types, World world) { this(types, world, null); } @@ -78,6 +73,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java index bd1b88df7..e1dfc2b00 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java @@ -44,11 +44,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class DragonFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java index 6e0effcc8..8073de70c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java @@ -55,11 +55,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityTypes types, World world) { @@ -81,6 +76,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java index b621fcb03..1c1b3bf6a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java @@ -44,11 +44,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java index 492cf0fa3..0f0c5f75a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java @@ -44,11 +44,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java index 435c67424..9d01784f1 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java @@ -44,11 +44,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityTypes types, World world) { @@ -65,6 +60,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java index 681c1eb6a..054f8b445 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java @@ -43,11 +43,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityTypes types, World world) { @@ -74,6 +69,11 @@ public class EvokerFangsController extends MobEntityController { return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java index 1e8994482..52593be1c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java @@ -38,11 +38,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java index 542ecb95c..0f06b752f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java @@ -54,11 +54,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityTypes types, World world) { @@ -80,6 +75,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java index 2990fb335..8b99e5164 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java @@ -38,11 +38,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java index f9e79057a..7ed4c0f11 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java @@ -49,11 +49,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityTypes types, World world) { @@ -73,6 +68,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java index cf91dcc41..ca516bfa6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java @@ -49,11 +49,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java index d25124edd..2aaf10c27 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java @@ -50,11 +50,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityTypes types, World world) { @@ -71,6 +66,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java index 726b1a27e..a6ee41c08 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java @@ -38,11 +38,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java index d371ec405..fe53a44d6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java @@ -38,11 +38,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java index 1f03ac320..738fb2e26 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java @@ -52,11 +52,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityTypes types, World world) { @@ -78,6 +73,11 @@ public class LlamaSpitController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java index 5221653c3..46438ced3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java @@ -38,11 +38,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java index 7d85b2a96..91f5f0fcc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java @@ -38,11 +38,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java index 1d6de9994..6a8043db4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java @@ -38,11 +38,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java index 680102ea8..c1676d784 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java @@ -33,11 +33,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java index d0791d0ee..5eb50c6cc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java @@ -38,11 +38,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java index 709cfe731..c5864c054 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java @@ -33,11 +33,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java index 28218282e..bedd012ee 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java @@ -33,11 +33,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityTypes types, World world) { @@ -54,6 +49,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java index 0c9f9f9e4..2f94e92d5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java @@ -38,11 +38,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java index 2230f1278..4acdcd3ce 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java @@ -38,11 +38,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ShulkerBulletController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java index 279cac4bb..8d908ca6e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java @@ -38,11 +38,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java index ac776db1d..c60a425b6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java @@ -38,11 +38,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java index 947b7e18b..50a2f4257 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java @@ -38,11 +38,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class SpectralArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java index 6d2fb34f1..bd295dcf9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java @@ -38,11 +38,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java index 22d1c0893..7d7c7029f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java @@ -38,11 +38,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java index 090d1fbde..cdd23f21b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java @@ -39,11 +39,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityTypes types, World world) { @@ -60,6 +55,11 @@ public class ThrownPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java index 0e4640cd1..3c1fb676e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java @@ -38,11 +38,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends EntityThrownTrident implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class ThrownTridentController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java index b2bf9e022..147cfd06f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java @@ -38,11 +38,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class TippedArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java index 1fca90548..de11f1dc2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java @@ -38,11 +38,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityTypes types, World world) { @@ -59,6 +54,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean a(Tag tag, double d0) { if (npc == null) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index b1d11ac00..f7c9bc412 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -595,12 +595,6 @@ public class NMSImpl implements NMSBridge { return handle.aT; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java index 0d751dee1..8dc619322 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java @@ -48,14 +48,9 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private MobAI ai; - private final CitizensNPC npc; + private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { this(types, level, null); } @@ -68,6 +63,11 @@ public class ArmorStandController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public MobAI getAI() { return ai; 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 d565338fc..698f5c934 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 @@ -56,11 +56,6 @@ public class AxolotlController extends MobEntityController { } public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -80,6 +75,11 @@ public class AxolotlController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 df857f926..939417530 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 @@ -47,11 +47,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends Bat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class BatController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1b6c9e26d..cfa07ddca 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 @@ -47,11 +47,6 @@ public class BeeController extends MobEntityController { } public static class EntityBeeNPC extends Bee implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class BeeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b229aba64..c35bcdcae 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 @@ -47,11 +47,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends Blaze implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class BlazeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 5f3a7fc5e..779c9663c 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 @@ -50,11 +50,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends Cat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class CatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 3a8f0b2dc..34720c0a6 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 @@ -49,11 +49,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class CaveSpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 9de613f9b..9d597838e 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 @@ -50,11 +50,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends Chicken implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class ChickenController extends MobEntityController { super.aiStep(); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1246ff9c5..f8811b53f 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 @@ -56,11 +56,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends Cod implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -90,6 +85,11 @@ public class CodController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 88ec55381..8229c16ed 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 @@ -55,11 +55,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends Cow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityType types, Level level) { @@ -71,6 +66,11 @@ public class CowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 eca81c836..317e297eb 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 @@ -51,11 +51,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends Creeper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -69,6 +64,11 @@ public class CreeperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 42bab116a..cd6e4ad8c 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 @@ -51,15 +51,10 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends Dolphin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean inProtectedTick; + private final CitizensNPC npc; private MoveControl oldMoveController; - public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -75,6 +70,11 @@ public class DolphinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1eb94c11a..44fa07049 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 @@ -49,11 +49,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends Drowned implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class DrownedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 bb0026814..f837650e1 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 @@ -53,11 +53,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(EntityType types, Level level) { @@ -149,6 +144,11 @@ public class EnderDragonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 14e5405e9..1f4219ded 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 @@ -52,11 +52,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EnderMan implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -68,6 +63,11 @@ public class EndermanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 dba25e70e..7896722f6 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 @@ -49,11 +49,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends Endermite implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class EndermiteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1c85cca77..bd41f5e01 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 @@ -43,11 +43,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends Evoker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class EvokerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 043184e38..1323d6aaa 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 @@ -47,11 +47,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends Fox implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class FoxController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 22786ceaa..d888eea32 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 @@ -41,11 +41,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends Ghast implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class GhastController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 eaac00570..f899039cf 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 @@ -43,11 +43,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends Giant implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GiantController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 f52da8b61..9a1e820de 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 @@ -43,11 +43,6 @@ public class GlowSquidController extends MobEntityController { } public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GlowSquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 fbad51f3c..5244e41c6 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 @@ -44,11 +44,6 @@ public class GoatController extends MobEntityController { } public static class EntityGoatNPC extends Goat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGoatNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class GoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b41b3a456..4d760c998 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 @@ -43,11 +43,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends Guardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1b2d5081c..e9cad7eaa 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 @@ -43,11 +43,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 50302b5f2..d9ddcecdd 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 @@ -43,11 +43,6 @@ public class HoglinController extends MobEntityController { } public static class EntityHoglinNPC extends Hoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class HoglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 4d5b9d618..b7b83a614 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 @@ -54,11 +54,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends Horse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 3a16b01d7..2a962f75a 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 @@ -54,11 +54,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 ff9dc6fbe..245ee0c16 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 @@ -54,11 +54,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends Mule implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 26379e885..5bb278bde 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 @@ -54,11 +54,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 f361050f1..7096f561c 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 @@ -54,11 +54,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 5dcad6606..9dfb4f5fa 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 @@ -43,11 +43,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class IllusionerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 684c8e977..4f151c310 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 @@ -43,11 +43,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class IronGolemController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 54d5e2152..e64122049 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 @@ -54,11 +54,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends Llama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1a6583f5a..22b30f8c3 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 @@ -46,11 +46,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -69,6 +64,11 @@ public class MagmaCubeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 84cde62ce..7d4ad902e 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 @@ -47,11 +47,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class MushroomCowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1559231ec..6d52c0a9c 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 @@ -45,11 +45,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends Ocelot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class OcelotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 af543353c..3a33bc3e2 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 @@ -44,11 +44,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends Panda implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PandaController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b317f56ac..e9b69fce1 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 @@ -44,11 +44,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends Parrot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class ParrotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 50ce8a95a..d6b605994 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 @@ -47,11 +47,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends Phantom implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private LookControl oldLookController; @@ -94,6 +89,11 @@ public class PhantomController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 440010211..ceee7dc29 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 @@ -46,11 +46,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends Pig implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class PigController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { // block carrot-on-a-stick behaviour 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 4053bd4a6..a71c36130 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 @@ -43,11 +43,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class PigZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 9d247354f..c9f5b304e 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 @@ -43,11 +43,6 @@ public class PiglinBruteController extends MobEntityController { } public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class PiglinBruteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 6f5405385..687f6f3f9 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 @@ -48,11 +48,6 @@ public class PiglinController extends MobEntityController { } public static class EntityPiglinNPC extends Piglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class PiglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 4e04d1856..c6a0256a4 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 @@ -44,11 +44,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends Pillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 839df08fa..ebeee4fdc 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 @@ -42,11 +42,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityType types, Level level) { @@ -58,6 +53,11 @@ public class PolarBearController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 d33985f79..27f07fdc3 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 @@ -53,11 +53,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -90,6 +85,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 47cd7113d..18222231f 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 @@ -45,11 +45,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends Rabbit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class RabbitController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b873d0539..0886a6ba6 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 @@ -44,11 +44,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends Ravager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class RavagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 852744f3a..8fbb36167 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 @@ -50,11 +50,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends Salmon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -84,6 +79,11 @@ public class SalmonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 38f5a2d63..98343a513 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 @@ -44,11 +44,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends Sheep implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SheepController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 bdf73415f..711123223 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 @@ -44,11 +44,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends Shulker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ShulkerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 2864e6094..1db1f622c 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 @@ -43,11 +43,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SilverfishController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a8194414e..750dfffa7 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 @@ -43,11 +43,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a93f10435..5bf48d9f9 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 @@ -43,11 +43,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends Stray implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonStrayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 9d757edf4..0e392e4c1 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 @@ -43,11 +43,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonWitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a603b6d73..f31c79faf 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 @@ -46,11 +46,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends Slime implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -69,6 +64,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 22dea3c6d..659e5b8e3 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 @@ -43,11 +43,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SnowmanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a67dbca2b..be7de024a 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 @@ -43,11 +43,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends Spider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 4fba2043f..1440917ec 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 @@ -43,11 +43,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends Squid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 0d2379376..34c6f03a1 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 @@ -43,11 +43,6 @@ public class StriderController extends MobEntityController { } public static class EntityStriderNPC extends Strider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class StriderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 7be84ebd6..dafce0697 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 @@ -52,11 +52,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityType types, Level level) { @@ -72,6 +67,11 @@ public class TraderLlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 0b7520390..c7e9cc55f 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 @@ -50,11 +50,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -84,6 +79,11 @@ public class TropicalFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 bbc8c7852..b63c87fd7 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 @@ -47,11 +47,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends Turtle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private JumpControl oldJumpController; @@ -73,6 +68,11 @@ public class TurtleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 834c98782..44aedfe4f 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 @@ -41,11 +41,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends Vex implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class VexController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a0c49663a..5dd55e91e 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 @@ -51,11 +51,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends Villager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -72,6 +67,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 4b69e64fc..186fb6192 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 @@ -44,11 +44,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class VindicatorController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 251477eba..7841c74b6 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 @@ -50,11 +50,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private boolean blockTrades = true; @@ -70,6 +65,11 @@ public class WanderingTraderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 32622457c..0ac8ffcea 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 @@ -43,11 +43,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends Witch implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class WitchController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 19ca9c18a..457b1069c 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 @@ -41,11 +41,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends WitherBoss implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class WitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 91e98b45d..9db07620c 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 @@ -46,11 +46,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends Wolf implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class WolfController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 d2f3fa371..dce2a1ac8 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 @@ -43,11 +43,6 @@ public class ZoglinController extends MobEntityController { } public static class EntityZoglinNPC extends Zoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZoglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 64ef33ad2..8374c6755 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 @@ -43,11 +43,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends Zombie implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 e4698c503..34341bcd0 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 @@ -43,11 +43,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends Husk implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieHuskController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b9fb1d459..c4806fc58 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 @@ -43,11 +43,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieVillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b877eee04..33c6ffc2e 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 @@ -44,11 +44,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class AreaEffectCloudController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 2e667f928..77f8a601d 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 @@ -49,18 +49,13 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends Boat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double aC; + private float aD; private Status aE; private Status aF; private double ap; private final CitizensNPC npc; - public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -70,6 +65,11 @@ public class BoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 2a68d23b4..d7f0ddb7f 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 @@ -44,11 +44,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class DragonFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 aa99439c7..daa0d6207 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 @@ -54,11 +54,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends ThrownEgg implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { @@ -75,6 +70,11 @@ public class EggController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 e6167b1fb..9158289cc 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 @@ -44,11 +44,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class EnderCrystalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 e1b91ccb4..8a348e5db 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 @@ -45,11 +45,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class EnderPearlController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 17cd00a3a..1d4931231 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 @@ -45,11 +45,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class EnderSignalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 847acbec0..35177784a 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 @@ -42,11 +42,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { @@ -58,6 +53,11 @@ public class EvokerFangsController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 707976ef4..9b95a7f37 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 @@ -38,11 +38,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class ExperienceOrbController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 dab36f541..b2dbef6a5 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 @@ -54,11 +54,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { @@ -75,6 +70,11 @@ public class FallingBlockController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 212b9e96e..be04ad66c 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 @@ -39,11 +39,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class FireworkController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 6dba36c41..21ac10655 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 @@ -47,11 +47,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class FishingHookController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public double distanceToSqr(Entity entity) { if (entity == getPlayerOwner()) 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 bbe20ab17..7174728c5 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 @@ -49,11 +49,6 @@ public class GlowItemFrameController extends MobEntityController { } public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class GlowItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 6a7717244..0de7f2424 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 @@ -50,11 +50,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends ItemEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ItemController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 e048ea0b5..536f9cb70 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 @@ -49,11 +49,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class ItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 71651e665..2f507373f 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 @@ -38,11 +38,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class LargeFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 fe9db7a86..3b791818c 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 @@ -39,11 +39,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class LeashController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 e41a83d23..cf414174c 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 @@ -51,11 +51,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { @@ -72,6 +67,11 @@ public class LlamaSpitController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 0858ee041..9be7bda4c 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 @@ -38,11 +38,6 @@ public class MarkerController extends MobEntityController { } public static class EntityMarkerNPC extends Marker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class MarkerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 f125a76fa..64d55ae3a 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 @@ -39,11 +39,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartChestController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 b585b7837..ac4c72e0d 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 @@ -39,11 +39,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartCommandController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 a0051a3c8..3534ad4f7 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 @@ -39,11 +39,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartFurnaceController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 218c37e8a..c607a0628 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 @@ -34,11 +34,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartHopperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; 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 2a6dcf673..33beb87fe 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 @@ -38,11 +38,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class MinecartRideableController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 92a07dcdc..60f025b03 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 @@ -34,11 +34,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; 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 ecb61b058..9ea03159b 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 @@ -34,11 +34,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartTNTController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; 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 378046718..84f42a1ed 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 @@ -38,11 +38,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends Painting implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class PaintingController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 bd301f3be..142fa9e93 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 @@ -38,11 +38,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class ShulkerBulletController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 e06ff1413..b86f5b0ac 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 @@ -38,11 +38,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class SmallFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 8a850c226..0fa6a4910 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 @@ -38,11 +38,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends Snowball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class SnowballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 434666ba8..d8e8cba80 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 @@ -39,11 +39,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class SpectralArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 98984911e..b73c42793 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 @@ -39,11 +39,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class TNTPrimedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 a8d5e7d77..bea29e3ad 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 @@ -39,11 +39,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownExpBottleController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 541faba40..b99400bab 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 @@ -39,11 +39,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownPotionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 9890c73b5..6c30189c5 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 @@ -39,11 +39,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownTridentController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 5795d4739..2fa1d2631 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 @@ -38,11 +38,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class TippedArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 b21043b51..5dd6974ce 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 @@ -38,11 +38,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class WitherSkullController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index aa210c825..631738d21 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -606,12 +606,6 @@ public class NMSImpl implements NMSBridge { return handle.zza; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { ServerLevel server = (ServerLevel) getHandle(entity).level; diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java index 32ae9224a..503b7ff27 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java @@ -50,14 +50,9 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private MobAI ai; - private final CitizensNPC npc; + private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { this(types, level, null); } @@ -70,6 +65,11 @@ public class ArmorStandController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public MobAI getAI() { return ai; 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 ebfde58f1..70f3ddaea 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,14 +57,9 @@ public class AxolotlController extends MobEntityController { } public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; - private MoveControl oldMoveController; + private MoveControl oldMoveController; public EntityAxolotlNPC(EntityType types, Level level) { this(types, level, null); } @@ -80,6 +75,11 @@ public class AxolotlController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 cab691579..ea3f7ea36 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 @@ -49,11 +49,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends Bat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -68,6 +63,11 @@ public class BatController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 7bb8029db..478384e03 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 @@ -49,11 +49,6 @@ public class BeeController extends MobEntityController { } public static class EntityBeeNPC extends Bee implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class BeeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 5cc0f5b02..4877f5935 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 @@ -49,11 +49,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends Blaze implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class BlazeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 6856fa1ea..1efebcb2a 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 @@ -51,11 +51,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends Cat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class CatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b8cedf66a..41b291da4 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 @@ -50,11 +50,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class CaveSpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 dcfe94d43..478bb872c 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 @@ -51,11 +51,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends Chicken implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityType types, Level level) { @@ -75,6 +70,11 @@ public class ChickenController extends MobEntityController { super.aiStep(); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1888dffc1..9925e0286 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 @@ -57,11 +57,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends Cod implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -91,6 +86,11 @@ public class CodController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 136ecf5da..817763f29 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 @@ -56,11 +56,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends Cow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityType types, Level level) { @@ -72,6 +67,11 @@ public class CowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a1a21903d..18bbcd428 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 @@ -51,11 +51,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends Creeper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -69,6 +64,11 @@ public class CreeperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 011ff5e67..2c4f32fec 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 @@ -52,15 +52,10 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends Dolphin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean inProtectedTick; + private final CitizensNPC npc; private MoveControl oldMoveController; - public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -76,6 +71,11 @@ public class DolphinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 ea457c25c..b41834f89 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 @@ -50,11 +50,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends Drowned implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class DrownedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 87dc36127..231fefb4f 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 @@ -55,11 +55,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(EntityType types, Level level) { @@ -151,6 +146,11 @@ public class EnderDragonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 4e4f3ac41..287b878a2 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 @@ -53,11 +53,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EnderMan implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -69,6 +64,11 @@ public class EndermanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 dd87450d5..d43d44615 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 @@ -50,11 +50,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends Endermite implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class EndermiteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 c77296e4d..ce232cbf0 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 @@ -44,11 +44,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends Evoker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class EvokerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 5317fa133..875d7a0bb 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 @@ -48,11 +48,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends Fox implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class FoxController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a75935d54..dff198db7 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 @@ -43,11 +43,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends Ghast implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GhastController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 fd1d5234d..850f110be 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 @@ -44,11 +44,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends Giant implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class GiantController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 283f5c115..5c6bf8a5a 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 @@ -44,11 +44,6 @@ public class GlowSquidController extends MobEntityController { } public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class GlowSquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a4c2580a5..b1001196c 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 @@ -45,11 +45,6 @@ public class GoatController extends MobEntityController { } public static class EntityGoatNPC extends Goat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGoatNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class GoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 614c28da9..49d9fe677 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 @@ -44,11 +44,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends Guardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -75,6 +70,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 2ea0e3e7f..f1eb2477f 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 @@ -44,11 +44,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -75,6 +70,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 2e670628c..f0d590515 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 @@ -44,11 +44,6 @@ public class HoglinController extends MobEntityController { } public static class EntityHoglinNPC extends Hoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class HoglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 8e9c82581..1cf9cc031 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 @@ -55,11 +55,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends Horse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -80,6 +75,11 @@ public class HorseController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 4798f291d..07264621a 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 @@ -55,11 +55,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -80,6 +75,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 a1ac66247..83dda433d 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 @@ -55,11 +55,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends Mule implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -80,6 +75,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 1e98ef33c..49fcc5bc0 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 @@ -55,11 +55,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -80,6 +75,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 7d3641955..d7ac7f591 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 @@ -55,11 +55,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -80,6 +75,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc != null && npc.getNavigator().isNavigating() ? false : super.canBeControlledByRider(); 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 d932f93e5..4e9400195 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 @@ -44,11 +44,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class IllusionerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 e11b7ca17..ee96b2b5b 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 @@ -44,11 +44,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class IronGolemController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 830491929..0e04596d9 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 @@ -55,11 +55,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends Llama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -80,6 +75,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 c9083c8c6..92f3fa20a 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 @@ -47,11 +47,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -70,6 +65,11 @@ public class MagmaCubeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 51d3fcb29..884f56cde 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 @@ -48,11 +48,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class MushroomCowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 d24b73582..73e6e5502 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 @@ -46,11 +46,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends Ocelot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class OcelotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 2d224393b..335b2c564 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 @@ -45,11 +45,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends Panda implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class PandaController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 f47a40323..a2141899c 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 @@ -46,11 +46,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends Parrot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class ParrotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 73fa61d59..69fdc47d0 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 @@ -48,11 +48,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends Phantom implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private LookControl oldLookController; @@ -95,6 +90,11 @@ public class PhantomController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b9c2f14d3..b038d8847 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 @@ -46,11 +46,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends Pig implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class PigController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { // block carrot-on-a-stick behaviour 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 7dfd549a5..994c3c802 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 @@ -44,11 +44,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PigZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 740b5da62..1ef66f712 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 @@ -44,11 +44,6 @@ public class PiglinBruteController extends MobEntityController { } public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PiglinBruteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 5d6187515..08c30ae87 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 @@ -49,11 +49,6 @@ public class PiglinController extends MobEntityController { } public static class EntityPiglinNPC extends Piglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class PiglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 6599f5b0e..6d2f8d510 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 @@ -45,11 +45,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends Pillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class PillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 ee3c92ef6..3ad550794 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 @@ -44,11 +44,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PolarBearController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 bf772ce6d..a21cb92c6 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 @@ -54,11 +54,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -91,6 +86,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 9a907754c..865b5580e 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 @@ -46,11 +46,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends Rabbit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class RabbitController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 24408f3fc..80ee3a43c 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 @@ -45,11 +45,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends Ravager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class RavagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public boolean canBeControlledByRider() { return npc == null || npc.useMinecraftAI() ? super.canBeControlledByRider() : false; 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 2347bd20e..ecf3f2baa 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 @@ -51,11 +51,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends Salmon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -85,6 +80,11 @@ public class SalmonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 28e9b8005..163af1f9b 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 @@ -45,11 +45,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends Sheep implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SheepController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 8f0c22197..c637af34a 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 @@ -45,11 +45,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends Shulker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -68,6 +63,11 @@ public class ShulkerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 096c6ddd5..3f138380e 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 @@ -44,11 +44,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SilverfishController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 456a0c48d..cb802860f 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 @@ -44,11 +44,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SkeletonController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 5adf7988c..3ae44d563 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 @@ -44,11 +44,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends Stray implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SkeletonStrayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 1214b8967..0030a7d3f 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 @@ -44,11 +44,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SkeletonWitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 e01ccd49e..aed078f34 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 @@ -47,11 +47,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends Slime implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -70,6 +65,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 2cce66413..95617f3f0 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 @@ -44,11 +44,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SnowmanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a8b04d040..b040cfe6e 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 @@ -44,11 +44,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends Spider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 54ba79373..83acb6265 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 @@ -44,11 +44,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends Squid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 0b377c4f2..e94d69081 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 @@ -44,11 +44,6 @@ public class StriderController extends MobEntityController { } public static class EntityStriderNPC extends Strider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class StriderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 b40233b89..dcb237e4d 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 @@ -53,11 +53,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityType types, Level level) { @@ -73,6 +68,11 @@ public class TraderLlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 05a0f5493..ddef584e1 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 @@ -51,11 +51,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -85,6 +80,11 @@ public class TropicalFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 6d54b28dd..35a19afaf 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 @@ -48,11 +48,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends Turtle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private JumpControl oldJumpController; @@ -74,6 +69,11 @@ public class TurtleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 669d622b7..6dfc3d81a 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 @@ -43,11 +43,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends Vex implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class VexController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 a0ae41707..f06ee92b4 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 @@ -51,11 +51,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends Villager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -72,6 +67,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 9a78e69c9..7b7d03114 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 @@ -45,11 +45,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class VindicatorController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 214cbbb5a..97f3ed016 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 @@ -50,11 +50,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private boolean blockTrades = true; @@ -70,6 +65,11 @@ public class WanderingTraderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 ed29e174a..ad3b71cc9 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 @@ -44,11 +44,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends Witch implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class WitchController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 26685c607..3e30c7fb0 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 @@ -43,11 +43,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends WitherBoss implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class WitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 788d7217a..a5483ba6d 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 @@ -47,11 +47,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends Wolf implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class WolfController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 825fb9f2c..57af30830 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 @@ -44,11 +44,6 @@ public class ZoglinController extends MobEntityController { } public static class EntityZoglinNPC extends Zoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class ZoglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 edb6c8de2..5b30dee8b 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 @@ -44,11 +44,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends Zombie implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class ZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 8c69b73bd..bea373673 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 @@ -44,11 +44,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends Husk implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class ZombieHuskController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 68747b4e2..3b06e3ef8 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 @@ -44,11 +44,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class ZombieVillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) 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 477d5251d..c871c88a9 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 @@ -46,11 +46,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class AreaEffectCloudController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 c4ea276ff..9b417a00e 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 @@ -50,18 +50,13 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends Boat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double aC; + private float aD; private Status aE; private Status aF; private double ap; private final CitizensNPC npc; - public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -71,6 +66,11 @@ public class BoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 062349a2d..3b7d4be63 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 @@ -46,11 +46,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class DragonFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 e7430cabb..da192e26e 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 @@ -55,11 +55,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends ThrownEgg implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { @@ -76,6 +71,11 @@ public class EggController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 d156bff7e..f3d5a440a 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 @@ -46,11 +46,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class EnderCrystalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 a12cbba12..244a17ce7 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 @@ -47,11 +47,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class EnderPearlController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 bb5743153..41e89c6c5 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 @@ -47,11 +47,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class EnderSignalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 06d99eddf..23e07300f 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 @@ -44,11 +44,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class EvokerFangsController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 71d509b6a..49c3aad3c 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 @@ -40,11 +40,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class ExperienceOrbController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 cba5f819d..25b75cc7b 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 @@ -57,11 +57,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { @@ -73,6 +68,11 @@ public class FallingBlockController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 be3242bd3..a3fd1464e 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 @@ -41,11 +41,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class FireworkController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 7b91598cb..291394a55 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 @@ -48,11 +48,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class FishingHookController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public double distanceToSqr(Entity entity) { if (entity == getPlayerOwner()) 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 31a73048f..a55550bfc 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 @@ -51,11 +51,6 @@ public class GlowItemFrameController extends MobEntityController { } public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class GlowItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 b714b9fa4..dd765b8fa 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 @@ -52,11 +52,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends ItemEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { @@ -69,6 +64,11 @@ public class ItemController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 ff8715473..263f4b2a1 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 @@ -51,11 +51,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 d92ea2ac8..dbf61baa4 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 @@ -40,11 +40,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class LargeFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 fcda77532..b30f811a0 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 @@ -41,11 +41,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class LeashController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 ac5901ef4..463c54d95 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 @@ -52,11 +52,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { @@ -73,6 +68,11 @@ public class LlamaSpitController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 441e941b4..c30770e52 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 @@ -40,11 +40,6 @@ public class MarkerController extends MobEntityController { } public static class EntityMarkerNPC extends Marker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class MarkerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 7b33afdd9..72c2bf156 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 @@ -41,11 +41,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class MinecartChestController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 e7d86425e..071444594 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 @@ -41,11 +41,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class MinecartCommandController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 7f8181aa2..c55b63968 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 @@ -41,11 +41,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class MinecartFurnaceController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 12fe3215b..be4d3ae00 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 @@ -36,11 +36,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { @@ -52,6 +47,11 @@ public class MinecartHopperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; 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 1d1bfd5c9..d778908bc 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 @@ -40,11 +40,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class MinecartRideableController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 381bd777b..9474ee1b6 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 @@ -36,11 +36,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { @@ -52,6 +47,11 @@ public class MinecartSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; 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 41cdc2768..676bec2ca 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 @@ -36,11 +36,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { @@ -52,6 +47,11 @@ public class MinecartTNTController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; 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 94baa9e2d..82e2432dd 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 @@ -40,11 +40,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends Painting implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class PaintingController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 4f08dc4bb..b55db5d5e 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 @@ -40,11 +40,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class ShulkerBulletController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 45f33b9b4..232db8f15 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 @@ -40,11 +40,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class SmallFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 fbc512206..a2c029442 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 @@ -40,11 +40,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends Snowball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class SnowballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 f5a4f998b..e4f497872 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 @@ -41,11 +41,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class SpectralArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 1d3278c8e..1e5ad0af3 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 @@ -41,11 +41,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class TNTPrimedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 a8b38b957..58643a2e8 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 @@ -41,11 +41,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class ThrownExpBottleController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 11c1f1432..3a765ba9e 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 @@ -41,11 +41,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class ThrownPotionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 1164db379..2008b02fe 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 @@ -41,11 +41,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class ThrownTridentController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 7b13d5a3a..7d6d7f7d7 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 @@ -40,11 +40,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class TippedArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { 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 946907580..8df56eff1 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 @@ -40,11 +40,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class WitherSkullController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index 7e3ae9f2b..611a943f5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -612,12 +612,6 @@ public class NMSImpl implements NMSBridge { return handle.zza; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { ServerLevel server = (ServerLevel) getHandle(entity).level; diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java index 255b5d0df..a1ad096bb 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java @@ -60,11 +60,6 @@ public class AllayController extends MobEntityController { } public static class EntityAllayNPC extends Allay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private int taskId = -1; @@ -78,6 +73,11 @@ public class AllayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java index 20f33dd22..39fbbeba5 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java @@ -50,14 +50,9 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private MobAI ai; - private final CitizensNPC npc; + private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { this(types, level, null); } @@ -70,6 +65,11 @@ public class ArmorStandController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public MobAI getAI() { return ai; diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java index 3f406fb18..500746702 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java @@ -58,11 +58,6 @@ public class AxolotlController extends MobEntityController { } public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -82,6 +77,11 @@ public class AxolotlController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java index 5fb891d29..209d34f02 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java @@ -49,11 +49,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends Bat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -68,6 +63,11 @@ public class BatController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java index 3142874a5..feda1a2f0 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java @@ -49,11 +49,6 @@ public class BeeController extends MobEntityController { } public static class EntityBeeNPC extends Bee implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class BeeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java index fd4762586..0f9379753 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java @@ -49,11 +49,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends Blaze implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class BlazeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java index 82541fddc..956889fd7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java @@ -62,11 +62,6 @@ public class CamelController extends MobEntityController { } public static class EntityCamelNPC extends Camel implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -87,6 +82,11 @@ public class CamelController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java index 4b0462aea..15f2779ce 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java @@ -52,11 +52,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends Cat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityType types, Level level) { @@ -68,6 +63,11 @@ public class CatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java index b0367d8dc..1e050dfa2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java @@ -51,11 +51,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class CaveSpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java index 449946aeb..ce71c9713 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java @@ -52,11 +52,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends Chicken implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityType types, Level level) { @@ -76,6 +71,11 @@ public class ChickenController extends MobEntityController { super.aiStep(); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java index d92e62757..5f3eff941 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java @@ -58,11 +58,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends Cod implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -92,6 +87,11 @@ public class CodController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java index b002fe2d2..5c20fcf5f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java @@ -57,11 +57,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends Cow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityType types, Level level) { @@ -73,6 +68,11 @@ public class CowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java index 7fa5e85ab..b0ab4f77d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java @@ -52,11 +52,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends Creeper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -70,6 +65,11 @@ public class CreeperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java index dff5fae6f..468892eb7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java @@ -53,11 +53,6 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends Dolphin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean inProtectedTick; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class DolphinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java index e710c76c0..25918a10c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java @@ -51,11 +51,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends Drowned implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class DrownedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java index 05ba0b13d..5bee649df 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java @@ -287,7 +287,6 @@ public class EnderDragonController extends MobEntityController { } private static final MethodHandle HURT = NMS.getMethodHandle(EnderDragon.class, "c", true, List.class); - private static final MethodHandle KNOCKBACK = NMS.getMethodHandle(EnderDragon.class, "b", true, List.class); } } diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java index 7632d7417..bdbc9ce5b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java @@ -54,11 +54,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EnderMan implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -70,6 +65,11 @@ public class EndermanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java index e15ccd6d7..21bb9f339 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java @@ -51,11 +51,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends Endermite implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class EndermiteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java index dc01b35f9..7948808eb 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java @@ -45,11 +45,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends Evoker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class EvokerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java index bd2fb6acf..59d3984e7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java @@ -49,11 +49,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends Fox implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class FoxController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java index eaba52ed2..21c6fe495 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java @@ -46,11 +46,6 @@ public class FrogController extends MobEntityController { } public static class EntityFrogNPC extends Frog implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFrogNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class FrogController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java index e77d8fc01..e7571ed1c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java @@ -43,11 +43,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends Ghast implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GhastController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java index c9a8e60dd..9d4f0870f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java @@ -45,11 +45,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends Giant implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class GiantController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java index af1dbd6ff..42ff983c9 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java @@ -45,11 +45,6 @@ public class GlowSquidController extends MobEntityController { } public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class GlowSquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java index 01c329657..8add0a412 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java @@ -46,11 +46,6 @@ public class GoatController extends MobEntityController { } public static class EntityGoatNPC extends Goat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGoatNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class GoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java index 0a6f45178..4648da244 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java @@ -45,11 +45,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends Guardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -76,6 +71,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java index 6b068ff6b..f28e3d8fd 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java @@ -45,11 +45,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -76,6 +71,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java index bfbdbe9b2..30d4c990d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java @@ -45,11 +45,6 @@ public class HoglinController extends MobEntityController { } public static class EntityHoglinNPC extends Hoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class HoglinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java index 20eb075f6..6ae7eee82 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java @@ -56,11 +56,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends Horse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -81,6 +76,11 @@ public class HorseController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java index 86f27fd68..c87c2815a 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java @@ -56,11 +56,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -81,6 +76,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java index 41d938a44..c7a48981c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java @@ -56,11 +56,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends Mule implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -81,6 +76,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java index d887bcef3..6a13f1ada 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java @@ -56,11 +56,6 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -81,6 +76,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java index 5f1fff479..add84b2b5 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java @@ -56,11 +56,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -81,6 +76,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java index 2c7dfa8c0..5aa115466 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java @@ -45,11 +45,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class IllusionerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java index 449bb1647..a349df98e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java @@ -45,11 +45,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class IronGolemController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java index 598ae18e5..8a63b126b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java @@ -56,11 +56,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends Llama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -81,6 +76,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java index 79e18ed8d..49b494128 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java @@ -48,11 +48,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -71,6 +66,11 @@ public class MagmaCubeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java index 2b97cfd9f..a435015b7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java @@ -49,11 +49,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class MushroomCowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java index 2ebe1bd08..8b2dc160d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java @@ -47,11 +47,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends Ocelot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class OcelotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java index a7adcac5d..e16278f42 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java @@ -46,11 +46,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends Panda implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class PandaController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java index 193a570ac..56556d618 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java @@ -46,11 +46,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends Parrot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class ParrotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java index 1cb426cd4..b7929dffc 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java @@ -49,11 +49,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends Phantom implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private LookControl oldLookController; @@ -96,6 +91,11 @@ public class PhantomController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java index e0ec0f690..99233d0ff 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java @@ -47,11 +47,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends Pig implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class PigController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java index b18dcec94..9f6548368 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java @@ -45,11 +45,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class PigZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java index 15c2effe0..9cd54050c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java @@ -45,11 +45,6 @@ public class PiglinBruteController extends MobEntityController { } public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class PiglinBruteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java index 8dfff8c8a..8620eba3e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java @@ -50,11 +50,6 @@ public class PiglinController extends MobEntityController { } public static class EntityPiglinNPC extends Piglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class PiglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java index 1211ecfc5..f49e3937b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java @@ -46,11 +46,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends Pillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class PillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java index fca4189d3..07cecea73 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java @@ -44,11 +44,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PolarBearController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java index 2eef71317..d678cbbab 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java @@ -55,11 +55,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -92,6 +87,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java index 4529ca217..9aa677562 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java @@ -47,11 +47,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends Rabbit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class RabbitController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java index edf10f67b..4b5d59037 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java @@ -46,11 +46,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends Ravager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class RavagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java index a44db6f80..332e9c31b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java @@ -52,11 +52,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends Salmon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -86,6 +81,11 @@ public class SalmonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java index 4ff074fbb..fa3647183 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java @@ -46,11 +46,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends Sheep implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class SheepController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java index 124127e49..d53317ae5 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java @@ -46,11 +46,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends Shulker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -69,6 +64,11 @@ public class ShulkerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java index db33822f8..3eea2c59d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java @@ -45,11 +45,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SilverfishController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java index b0b71b445..3773843d4 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java @@ -45,11 +45,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SkeletonController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java index 90bdd4154..e5974c971 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java @@ -45,11 +45,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends Stray implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SkeletonStrayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java index 6b5bf9f92..d36e2845d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java @@ -45,11 +45,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SkeletonWitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java index b9f6adb40..3c79071e0 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java @@ -48,11 +48,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends Slime implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -71,6 +66,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java index d3e35ac07..f19a1d8a3 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java @@ -51,11 +51,6 @@ public class SnifferController extends MobEntityController { } public static class EntitySnifferNPC extends Sniffer implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnifferNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class SnifferController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java index 2adcaadf9..a324a26fa 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java @@ -45,11 +45,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SnowmanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java index 11c060bdf..c08e8073e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java @@ -45,11 +45,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends Spider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java index 0ffc179aa..ce93ca9d1 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java @@ -45,11 +45,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends Squid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class SquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java index aa33cc507..db650211f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java @@ -45,11 +45,6 @@ public class StriderController extends MobEntityController { } public static class EntityStriderNPC extends Strider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class StriderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java index d5a39ac07..99f9e3257 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java @@ -53,11 +53,6 @@ public class TadpoleController extends MobEntityController { } public static class EntityTadpoleNPC extends Tadpole implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -87,6 +82,11 @@ public class TadpoleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java index bf7ca7940..507610bd2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java @@ -54,11 +54,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class TraderLlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java index b382c3f3c..ba1a5f1f8 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java @@ -52,11 +52,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -86,6 +81,11 @@ public class TropicalFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java index 4f1508de5..15e991200 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java @@ -49,11 +49,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends Turtle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private JumpControl oldJumpController; @@ -75,6 +70,11 @@ public class TurtleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java index bd22ecb4e..9a4dacb78 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java @@ -43,11 +43,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends Vex implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class VexController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java index 4b6821e85..9993beb3a 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java @@ -52,11 +52,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends Villager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -73,6 +68,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java index 8a7b44fad..af8c103cc 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java @@ -46,11 +46,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class VindicatorController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java index 9daeebe89..dbeb6e84d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java @@ -51,11 +51,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private boolean blockTrades = true; @@ -71,6 +66,11 @@ public class WanderingTraderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java index cefa1f1c7..25715b340 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java @@ -47,11 +47,6 @@ public class WardenController extends MobEntityController { } public static class EntityWardenNPC extends Warden implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWardenNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class WardenController extends MobEntityController { this.getBrain().setMemoryWithExpiry(MemoryModuleType.DIG_COOLDOWN, Unit.INSTANCE, 1200L); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java index 9dd4d6a09..adea71500 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java @@ -45,11 +45,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends Witch implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class WitchController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java index b272ed346..1b1ba1c4e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java @@ -43,11 +43,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends WitherBoss implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class WitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java index 945c29438..4f8214d84 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java @@ -48,11 +48,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends Wolf implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class WolfController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java index 44a2f085d..07eeacde1 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java @@ -45,11 +45,6 @@ public class ZoglinController extends MobEntityController { } public static class EntityZoglinNPC extends Zoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class ZoglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java index b0cf29158..a60ddc562 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java @@ -45,11 +45,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends Zombie implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class ZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java index 20a8d18b5..3926264f6 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java @@ -45,11 +45,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends Husk implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class ZombieHuskController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java index b15d3cd1c..abf247ca2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java @@ -45,11 +45,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class ZombieVillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java index ddf17d8c7..62cd032b4 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java @@ -46,11 +46,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class AreaEffectCloudController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java index f9328b30e..83612e66f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java @@ -59,11 +59,6 @@ public class BlockDisplayController extends MobEntityController { } public static class EntityBlockDisplayNPC extends BlockDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlockDisplayNPC(EntityType types, Level level) { @@ -75,6 +70,11 @@ public class BlockDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java index 144368a97..7ec94a193 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java @@ -51,18 +51,13 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends Boat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double aC; + private float aD; private Status aE; private Status aF; private double ap; private final CitizensNPC npc; - public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -72,6 +67,11 @@ public class BoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java index 66eb87a84..16351f5e5 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java @@ -52,20 +52,15 @@ public class ChestBoatController extends MobEntityController { } public static class EntityChestBoatNPC extends ChestBoat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double aC; private float aD; + private Status aE; private Status aF; private double ap; private double ar; private final CitizensNPC npc; - public EntityChestBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -75,6 +70,11 @@ public class ChestBoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java index 604c14dca..313cbcb8f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java @@ -46,11 +46,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class DragonFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java index f1267458f..211808072 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java @@ -55,11 +55,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends ThrownEgg implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { @@ -76,6 +71,11 @@ public class EggController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java index b2034131a..f827cf2e8 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java @@ -46,11 +46,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class EnderCrystalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java index 7b106e4cc..aeb8a20fa 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java @@ -47,11 +47,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class EnderPearlController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java index 06064ac50..07dc9e4e5 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java @@ -47,11 +47,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class EnderSignalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java index 21f74800f..fe4f20cb8 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java @@ -44,11 +44,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class EvokerFangsController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java index b01e57e96..a255699e7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java @@ -40,11 +40,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class ExperienceOrbController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java index 6e20da8b2..18eb9d3ca 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java @@ -56,11 +56,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { @@ -72,6 +67,11 @@ public class FallingBlockController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java index d16995c49..ffa29612a 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java @@ -41,11 +41,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class FireworkController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java index f953f004b..cb3ae6bde 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java @@ -64,11 +64,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { @@ -80,6 +75,11 @@ public class FishingHookController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public double distanceToSqr(Entity entity) { if (entity == getPlayerOwner()) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java index f503bbb55..133286619 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java @@ -51,11 +51,6 @@ public class GlowItemFrameController extends MobEntityController { } public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class GlowItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java index ff8f5b0de..919003724 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java @@ -40,11 +40,6 @@ public class InteractionController extends MobEntityController { } public static class EntityInteractionNPC extends Interaction implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityInteractionNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class InteractionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java index 2ca000bf7..ccf6f407f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java @@ -52,11 +52,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends ItemEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { @@ -69,6 +64,11 @@ public class ItemController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java index 4721f3228..00417fcc1 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java @@ -53,11 +53,6 @@ public class ItemDisplayController extends MobEntityController { } public static class EntityItemDisplayNPC extends ItemDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemDisplayNPC(EntityType types, Level level) { @@ -69,6 +64,11 @@ public class ItemDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java index cfb08352a..d7415451e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java @@ -51,11 +51,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java index f9f3ba88c..80b2d8883 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java @@ -40,11 +40,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class LargeFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java index 5e7a91580..31ee56e96 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java @@ -41,11 +41,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class LeashController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java index 9a6c25143..8f23682b0 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java @@ -52,11 +52,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { @@ -73,6 +68,11 @@ public class LlamaSpitController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java index 76eb562ff..be4ba1253 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java @@ -40,11 +40,6 @@ public class MarkerController extends MobEntityController { } public static class EntityMarkerNPC extends Marker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class MarkerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java index f275265f9..e43affbbb 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java @@ -41,11 +41,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class MinecartChestController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java index 11bb87f3e..478e0f926 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java @@ -41,11 +41,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class MinecartCommandController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java index a213a3de0..21cbecb60 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java @@ -41,11 +41,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class MinecartFurnaceController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java index 85f4fb70f..ae10fedd3 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java @@ -36,11 +36,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { @@ -52,6 +47,11 @@ public class MinecartHopperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java index 29b218e2e..cac96af2b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java @@ -40,11 +40,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class MinecartRideableController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java index 37984e86a..6a70b7ae2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java @@ -36,11 +36,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { @@ -52,6 +47,11 @@ public class MinecartSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java index abece15e1..2db54fa76 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java @@ -36,11 +36,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { @@ -52,6 +47,11 @@ public class MinecartTNTController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java index f02a8494f..68127f9f3 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java @@ -40,11 +40,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends Painting implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class PaintingController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java index 9e088c494..ea6a874f0 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java @@ -40,11 +40,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class ShulkerBulletController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java index a8111015c..f3bd39998 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java @@ -40,11 +40,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class SmallFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java index f42415c17..84ebb9f2a 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java @@ -40,11 +40,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends Snowball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class SnowballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java index 7547c71b7..6ba9eebfa 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java @@ -41,11 +41,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class SpectralArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java index d5bfe7ead..41f2e8def 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java @@ -41,11 +41,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class TNTPrimedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java index 253c0631d..f60c961ce 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java @@ -40,11 +40,6 @@ public class TextDisplayController extends MobEntityController { } public static class EntityTextDisplayNPC extends TextDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTextDisplayNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class TextDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java index 97463538f..a62e899a2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java @@ -41,11 +41,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class ThrownExpBottleController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java index 329071aa6..5121c341e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java @@ -41,11 +41,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class ThrownPotionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java index 7a8a1b900..1b8d6713f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java @@ -41,11 +41,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class ThrownTridentController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java index 30dab8e04..626199552 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java @@ -40,11 +40,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class TippedArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java index 8dc27c6e3..b01088f98 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java @@ -40,11 +40,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { @@ -56,6 +51,11 @@ public class WitherSkullController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java index 81a4f453f..ca4739123 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java @@ -655,12 +655,6 @@ public class NMSImpl implements NMSBridge { return handle.zza; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { ServerLevel server = (ServerLevel) getHandle(entity).level; diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AllayController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AllayController.java index a33e42167..ac115c332 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AllayController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AllayController.java @@ -58,11 +58,6 @@ public class AllayController extends MobEntityController { } public static class EntityAllayNPC extends Allay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private int taskId = -1; @@ -76,6 +71,11 @@ public class AllayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmadilloController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmadilloController.java index 1613f9ed5..ad0ab977f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmadilloController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmadilloController.java @@ -55,11 +55,6 @@ public class ArmadilloController extends MobEntityController { } public static class EntityArmadilloNPC extends Armadillo implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityArmadilloNPC(EntityType types, Level level) { @@ -71,6 +66,11 @@ public class ArmadilloController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java index 780e6a555..094489e9d 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java @@ -48,14 +48,9 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private MobAI ai; - private final CitizensNPC npc; + private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { this(types, level, null); } @@ -68,6 +63,11 @@ public class ArmorStandController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public MobAI getAI() { return ai; diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AxolotlController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AxolotlController.java index 0d4955839..61f46c260 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AxolotlController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/AxolotlController.java @@ -56,11 +56,6 @@ public class AxolotlController extends MobEntityController { } public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -80,6 +75,11 @@ public class AxolotlController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BatController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BatController.java index 78dd8b957..0d06f0f0d 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BatController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BatController.java @@ -47,11 +47,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends Bat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class BatController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BeeController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BeeController.java index 65a808def..411dc833d 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BeeController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BeeController.java @@ -47,11 +47,6 @@ public class BeeController extends MobEntityController { } public static class EntityBeeNPC extends Bee implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class BeeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BlazeController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BlazeController.java index 57e6716d6..c34fcb984 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BlazeController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BlazeController.java @@ -47,11 +47,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends Blaze implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class BlazeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BoggedController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BoggedController.java index 56dfc63f3..bf41f1998 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BoggedController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BoggedController.java @@ -50,11 +50,6 @@ public class BoggedController extends MobEntityController { } public static class EntityBoggedNPC extends Bogged implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBoggedNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class BoggedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BreezeController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BreezeController.java index 28c64540d..5bcd325b2 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BreezeController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/BreezeController.java @@ -50,11 +50,6 @@ public class BreezeController extends MobEntityController { } public static class EntityBreezeNPC extends Breeze implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBreezeNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class BreezeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CamelController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CamelController.java index 7f1de3fda..fbe3cd34f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CamelController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CamelController.java @@ -60,15 +60,10 @@ public class CamelController extends MobEntityController { } public static class EntityCamelNPC extends Camel implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityCamelNPC(EntityType types, Level level) { this(types, level, null); } @@ -83,6 +78,11 @@ public class CamelController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CatController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CatController.java index 72d05a014..a40288c11 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CatController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CatController.java @@ -50,11 +50,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends Cat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class CatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CaveSpiderController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CaveSpiderController.java index befc70e85..74feaa4c6 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CaveSpiderController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CaveSpiderController.java @@ -49,11 +49,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class CaveSpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ChickenController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ChickenController.java index 904cd31e8..ec7f30ba2 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ChickenController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ChickenController.java @@ -50,11 +50,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends Chicken implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class ChickenController extends MobEntityController { super.aiStep(); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CodController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CodController.java index ec895251d..f7cfa906e 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CodController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CodController.java @@ -56,11 +56,6 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends Cod implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -90,6 +85,11 @@ public class CodController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CowController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CowController.java index 8a3a0a890..d0bdf4147 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CowController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CowController.java @@ -55,11 +55,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends Cow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityType types, Level level) { @@ -71,6 +66,11 @@ public class CowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CreeperController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CreeperController.java index 381548a4f..39d4706c1 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CreeperController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/CreeperController.java @@ -50,11 +50,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends Creeper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -68,6 +63,11 @@ public class CreeperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DolphinController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DolphinController.java index fb56241b8..0881a6671 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DolphinController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DolphinController.java @@ -51,15 +51,10 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends Dolphin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean inProtectedTick; + private final CitizensNPC npc; private MoveControl oldMoveController; - public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -75,6 +70,11 @@ public class DolphinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DrownedController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DrownedController.java index a9f01f898..ebb843445 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DrownedController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/DrownedController.java @@ -49,11 +49,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends Drowned implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class DrownedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java index 13862417f..f2cec01b4 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java @@ -50,11 +50,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(EntityType types, Level level) { @@ -147,6 +142,11 @@ public class EnderDragonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermanController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermanController.java index 5205d544b..52aed5b70 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermanController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermanController.java @@ -52,11 +52,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EnderMan implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -68,6 +63,11 @@ public class EndermanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermiteController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermiteController.java index 020b72f58..f6671bffe 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermiteController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EndermiteController.java @@ -49,11 +49,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends Endermite implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class EndermiteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EvokerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EvokerController.java index 12f457498..927583236 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EvokerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EvokerController.java @@ -43,11 +43,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends Evoker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class EvokerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FoxController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FoxController.java index 9f41c35c8..69c007f07 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FoxController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FoxController.java @@ -1,7 +1,5 @@ package net.citizensnpcs.nms.v1_20_R4.entity; -import java.lang.invoke.MethodHandle; - import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R4.CraftServer; import org.bukkit.craftbukkit.v1_20_R4.entity.CraftEntity; @@ -47,11 +45,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends Fox implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityType types, Level level) { @@ -63,6 +56,11 @@ public class FoxController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) @@ -100,7 +98,7 @@ public class FoxController extends MobEntityController { FoxTrait ft = npc.getTraitNullable(FoxTrait.class); if (ft != null) { try { - SET_FACEPLANTED.invoke(this, ft.isFaceplanted()); + NMSImpl.SET_FACEPLANTED.invoke(this, ft.isFaceplanted()); } catch (Throwable e) { e.printStackTrace(); } @@ -234,8 +232,6 @@ public class FoxController extends MobEntityController { } return res; } - - private static final MethodHandle SET_FACEPLANTED = NMS.getMethodHandle(Fox.class, "A", true, boolean.class); } public static class FoxNPC extends CraftFox implements ForwardingNPCHolder { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FrogController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FrogController.java index e53611cd0..2e36b485c 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FrogController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/FrogController.java @@ -44,11 +44,6 @@ public class FrogController extends MobEntityController { } public static class EntityFrogNPC extends Frog implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFrogNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class FrogController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GhastController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GhastController.java index fcc5dcab7..7effdee92 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GhastController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GhastController.java @@ -41,11 +41,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends Ghast implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class GhastController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GiantController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GiantController.java index 1ae4791ed..e683d5fce 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GiantController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GiantController.java @@ -43,11 +43,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends Giant implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GiantController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GlowSquidController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GlowSquidController.java index e394aaaaf..4bb2bcb3b 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GlowSquidController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GlowSquidController.java @@ -43,11 +43,6 @@ public class GlowSquidController extends MobEntityController { } public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GlowSquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GoatController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GoatController.java index 766233210..8b992ce75 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GoatController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GoatController.java @@ -44,11 +44,6 @@ public class GoatController extends MobEntityController { } public static class EntityGoatNPC extends Goat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGoatNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class GoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianController.java index 37efc4833..93ab96526 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianController.java @@ -43,11 +43,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends Guardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianElderController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianElderController.java index 8315607ff..4f6f6bb77 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianElderController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/GuardianElderController.java @@ -43,11 +43,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HoglinController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HoglinController.java index 24c680c0e..16c809d7f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HoglinController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HoglinController.java @@ -43,11 +43,6 @@ public class HoglinController extends MobEntityController { } public static class EntityHoglinNPC extends Hoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class HoglinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseController.java index 20ef3016d..df17e55a8 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseController.java @@ -54,15 +54,10 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends Horse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseNPC(EntityType types, Level level) { this(types, level, null); } @@ -77,6 +72,11 @@ public class HorseController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseDonkeyController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseDonkeyController.java index a4c9d687e..91172e9ba 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseDonkeyController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseDonkeyController.java @@ -54,11 +54,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseMuleController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseMuleController.java index 47baa8526..7a3ae05d7 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseMuleController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseMuleController.java @@ -54,11 +54,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends Mule implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseSkeletonController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseSkeletonController.java index 124b0c57e..c3ffba465 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseSkeletonController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseSkeletonController.java @@ -54,16 +54,11 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; - private boolean riding; + private boolean riding; public EntityHorseSkeletonNPC(EntityType types, Level level) { this(types, level, null); } @@ -78,6 +73,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseZombieController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseZombieController.java index f93986592..3751cccae 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseZombieController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/HorseZombieController.java @@ -54,11 +54,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IllusionerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IllusionerController.java index 8052cefea..3dc2476a0 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IllusionerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IllusionerController.java @@ -43,11 +43,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class IllusionerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IronGolemController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IronGolemController.java index dbacf77f5..ba6eece2c 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IronGolemController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/IronGolemController.java @@ -43,11 +43,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class IronGolemController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/LlamaController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/LlamaController.java index 974349d17..dbe4d1c56 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/LlamaController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/LlamaController.java @@ -54,11 +54,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends Llama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MagmaCubeController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MagmaCubeController.java index 369df3755..c1b9a7752 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MagmaCubeController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MagmaCubeController.java @@ -46,11 +46,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -69,6 +64,11 @@ public class MagmaCubeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MushroomCowController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MushroomCowController.java index 642b57bd9..858b0f121 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MushroomCowController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/MushroomCowController.java @@ -47,11 +47,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class MushroomCowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/OcelotController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/OcelotController.java index 43760f8dd..565fe2f28 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/OcelotController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/OcelotController.java @@ -45,11 +45,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends Ocelot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class OcelotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PandaController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PandaController.java index 72fc8e736..57531942e 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PandaController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PandaController.java @@ -44,11 +44,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends Panda implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PandaController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ParrotController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ParrotController.java index c82949a4d..ac23f0bc5 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ParrotController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ParrotController.java @@ -44,11 +44,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends Parrot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class ParrotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PhantomController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PhantomController.java index a69d67cb8..521aaae45 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PhantomController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PhantomController.java @@ -47,11 +47,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends Phantom implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private LookControl oldLookController; @@ -94,6 +89,11 @@ public class PhantomController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigController.java index daf5f65bd..137818baf 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigController.java @@ -45,11 +45,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends Pig implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class PigController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigZombieController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigZombieController.java index cb99f85f7..907c0d281 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigZombieController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PigZombieController.java @@ -43,11 +43,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class PigZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinBruteController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinBruteController.java index 8cbef040c..ee86c975f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinBruteController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinBruteController.java @@ -43,11 +43,6 @@ public class PiglinBruteController extends MobEntityController { } public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class PiglinBruteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinController.java index 71041601d..2e0b22df7 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PiglinController.java @@ -48,11 +48,6 @@ public class PiglinController extends MobEntityController { } public static class EntityPiglinNPC extends Piglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class PiglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PillagerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PillagerController.java index 445809fde..f67a03b5a 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PillagerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PillagerController.java @@ -44,11 +44,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends Pillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PolarBearController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PolarBearController.java index 69a5ae9e0..f77da0f21 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PolarBearController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PolarBearController.java @@ -42,11 +42,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityType types, Level level) { @@ -58,6 +53,11 @@ public class PolarBearController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PufferFishController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PufferFishController.java index 8a0e49a0f..92e9dfa4d 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PufferFishController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/PufferFishController.java @@ -53,11 +53,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -90,6 +85,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RabbitController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RabbitController.java index 33f700995..888ee6f33 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RabbitController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RabbitController.java @@ -45,11 +45,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends Rabbit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class RabbitController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RavagerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RavagerController.java index 263fa9630..4421318eb 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RavagerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/RavagerController.java @@ -44,11 +44,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends Ravager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class RavagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SalmonController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SalmonController.java index 20b7a9de2..efa97b33f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SalmonController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SalmonController.java @@ -50,11 +50,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends Salmon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -84,6 +79,11 @@ public class SalmonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SheepController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SheepController.java index 86ab7fce9..4234cd217 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SheepController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SheepController.java @@ -44,11 +44,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends Sheep implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SheepController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ShulkerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ShulkerController.java index a7216ad1f..0dde6b909 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ShulkerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ShulkerController.java @@ -44,11 +44,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends Shulker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ShulkerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SilverfishController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SilverfishController.java index 3cd06ff12..84f5fb755 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SilverfishController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SilverfishController.java @@ -43,11 +43,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SilverfishController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonController.java index fc99edf08..19c810929 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonController.java @@ -43,11 +43,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonStrayController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonStrayController.java index 8d4c7f333..409789e1c 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonStrayController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonStrayController.java @@ -43,11 +43,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends Stray implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonStrayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonWitherController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonWitherController.java index a4ac5f316..f773d129a 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonWitherController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SkeletonWitherController.java @@ -43,11 +43,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonWitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SlimeController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SlimeController.java index 9b2147746..5fabe2a1a 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SlimeController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SlimeController.java @@ -46,11 +46,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends Slime implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -69,6 +64,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnifferController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnifferController.java index 878dc32de..cefe8bbca 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnifferController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnifferController.java @@ -49,11 +49,6 @@ public class SnifferController extends MobEntityController { } public static class EntitySnifferNPC extends Sniffer implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnifferNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class SnifferController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnowmanController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnowmanController.java index 4c56341db..d03e8ba83 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnowmanController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SnowmanController.java @@ -43,11 +43,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SnowmanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SpiderController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SpiderController.java index a93e6e7a6..0cb6ac2de 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SpiderController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SpiderController.java @@ -43,11 +43,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends Spider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SquidController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SquidController.java index bf200d847..7427756f5 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SquidController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/SquidController.java @@ -43,11 +43,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends Squid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/StriderController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/StriderController.java index 2790da424..03eb92e2c 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/StriderController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/StriderController.java @@ -43,11 +43,6 @@ public class StriderController extends MobEntityController { } public static class EntityStriderNPC extends Strider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class StriderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TadpoleController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TadpoleController.java index c84f91b2e..2922b5566 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TadpoleController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TadpoleController.java @@ -51,11 +51,6 @@ public class TadpoleController extends MobEntityController { } public static class EntityTadpoleNPC extends Tadpole implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -85,6 +80,11 @@ public class TadpoleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TraderLlamaController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TraderLlamaController.java index 52ff5cffb..fb1248c14 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TraderLlamaController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TraderLlamaController.java @@ -52,11 +52,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityType types, Level level) { @@ -72,6 +67,11 @@ public class TraderLlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TropicalFishController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TropicalFishController.java index 4c6fee6cb..f60ae4d2f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TropicalFishController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TropicalFishController.java @@ -50,11 +50,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -84,6 +79,11 @@ public class TropicalFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TurtleController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TurtleController.java index f145bae2a..15da1ea27 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TurtleController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/TurtleController.java @@ -47,11 +47,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends Turtle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private JumpControl oldJumpController; @@ -73,6 +68,11 @@ public class TurtleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VexController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VexController.java index a8dd2eab4..8a3ac6cfe 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VexController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VexController.java @@ -41,11 +41,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends Vex implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class VexController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VillagerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VillagerController.java index def691596..4d7c3ab00 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VillagerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VillagerController.java @@ -50,11 +50,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends Villager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -71,6 +66,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VindicatorController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VindicatorController.java index 8e6f0feab..0b4fcf374 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VindicatorController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/VindicatorController.java @@ -44,11 +44,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class VindicatorController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WanderingTraderController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WanderingTraderController.java index 0fe4fb27a..965fe3634 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WanderingTraderController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WanderingTraderController.java @@ -49,11 +49,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private boolean blockTrades = true; @@ -69,6 +64,11 @@ public class WanderingTraderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WardenController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WardenController.java index c6b2fddb1..9a6499065 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WardenController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WardenController.java @@ -45,11 +45,6 @@ public class WardenController extends MobEntityController { } public static class EntityWardenNPC extends Warden implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWardenNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class WardenController extends MobEntityController { this.getBrain().setMemoryWithExpiry(MemoryModuleType.DIG_COOLDOWN, Unit.INSTANCE, 1200L); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitchController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitchController.java index 364e12853..ffdf13de2 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitchController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitchController.java @@ -43,11 +43,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends Witch implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class WitchController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitherController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitherController.java index 6ed30fe14..263376da6 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitherController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WitherController.java @@ -41,11 +41,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends WitherBoss implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class WitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WolfController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WolfController.java index 579fc95a5..83b897f5e 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WolfController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/WolfController.java @@ -46,11 +46,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends Wolf implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class WolfController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZoglinController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZoglinController.java index 1f4e39b83..88f4f8401 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZoglinController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZoglinController.java @@ -43,11 +43,6 @@ public class ZoglinController extends MobEntityController { } public static class EntityZoglinNPC extends Zoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZoglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieController.java index 65ee251de..ba812b5d4 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieController.java @@ -43,11 +43,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends Zombie implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieHuskController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieHuskController.java index d1cf010c2..b492b9073 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieHuskController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieHuskController.java @@ -43,11 +43,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends Husk implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieHuskController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieVillagerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieVillagerController.java index 53e9c91c8..6511e60db 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieVillagerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ZombieVillagerController.java @@ -43,11 +43,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieVillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/AreaEffectCloudController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/AreaEffectCloudController.java index 961648f71..a888843f6 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/AreaEffectCloudController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/AreaEffectCloudController.java @@ -44,11 +44,6 @@ public class AreaEffectCloudController extends MobEntityController { } public static class EntityAreaEffectCloudNPC extends AreaEffectCloud implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityAreaEffectCloudNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class AreaEffectCloudController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BlockDisplayController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BlockDisplayController.java index 37d52063d..be6163eb5 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BlockDisplayController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BlockDisplayController.java @@ -57,11 +57,6 @@ public class BlockDisplayController extends MobEntityController { } public static class EntityBlockDisplayNPC extends BlockDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlockDisplayNPC(EntityType types, Level level) { @@ -73,6 +68,11 @@ public class BlockDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BoatController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BoatController.java index 6d7857f9a..3c09efced 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BoatController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BoatController.java @@ -49,18 +49,13 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends Boat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double aC; + private float aD; private Status aE; private Status aF; private double ap; private final CitizensNPC npc; - public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -70,6 +65,11 @@ public class BoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BreezeWindChargeController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BreezeWindChargeController.java index 31ec8e056..e2e2fdd7b 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BreezeWindChargeController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BreezeWindChargeController.java @@ -44,11 +44,6 @@ public class BreezeWindChargeController extends MobEntityController { } public static class EntityBreezeWindChargeNPC extends BreezeWindCharge implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBreezeWindChargeNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class BreezeWindChargeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ChestBoatController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ChestBoatController.java index df1be2945..a7a61a154 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ChestBoatController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ChestBoatController.java @@ -50,20 +50,15 @@ public class ChestBoatController extends MobEntityController { } public static class EntityChestBoatNPC extends ChestBoat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double aC; private float aD; + private Status aE; private Status aF; private double ap; private double ar; private final CitizensNPC npc; - public EntityChestBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -73,6 +68,11 @@ public class ChestBoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/DragonFireballController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/DragonFireballController.java index 4036ee3b6..e72fc0a12 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/DragonFireballController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/DragonFireballController.java @@ -44,11 +44,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class DragonFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EggController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EggController.java index 71ddd1f30..fe5f4e4e6 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EggController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EggController.java @@ -53,11 +53,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends ThrownEgg implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class EggController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderCrystalController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderCrystalController.java index f2642cfc5..997a4c0be 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderCrystalController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderCrystalController.java @@ -44,11 +44,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class EnderCrystalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderPearlController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderPearlController.java index 999541b3d..e99a1a1e5 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderPearlController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EnderPearlController.java @@ -45,11 +45,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class EnderPearlController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EvokerFangsController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EvokerFangsController.java index 7b768093f..2aa9b1b61 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EvokerFangsController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EvokerFangsController.java @@ -42,11 +42,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { @@ -58,6 +53,11 @@ public class EvokerFangsController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ExperienceOrbController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ExperienceOrbController.java index b229f606d..70702cb5c 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ExperienceOrbController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ExperienceOrbController.java @@ -38,11 +38,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class ExperienceOrbController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EyeOfEnderController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EyeOfEnderController.java index 88298a6f7..ab71420cb 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EyeOfEnderController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/EyeOfEnderController.java @@ -45,11 +45,6 @@ public class EyeOfEnderController extends MobEntityController { } public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class EyeOfEnderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FallingBlockController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FallingBlockController.java index 6371bf444..37b28e770 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FallingBlockController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FallingBlockController.java @@ -54,11 +54,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { @@ -70,6 +65,11 @@ public class FallingBlockController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FireworkController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FireworkController.java index c747ff913..26e4594c8 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FireworkController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FireworkController.java @@ -39,11 +39,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class FireworkController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FishingHookController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FishingHookController.java index 23d384d82..74c8e596f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FishingHookController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/FishingHookController.java @@ -63,11 +63,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { @@ -79,6 +74,11 @@ public class FishingHookController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public double distanceToSqr(Entity entity) { if (entity == getPlayerOwner()) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/GlowItemFrameController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/GlowItemFrameController.java index 1a36056bf..e97f23d63 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/GlowItemFrameController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/GlowItemFrameController.java @@ -49,11 +49,6 @@ public class GlowItemFrameController extends MobEntityController { } public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class GlowItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/InteractionController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/InteractionController.java index 0a7b8bb26..65309152d 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/InteractionController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/InteractionController.java @@ -38,11 +38,6 @@ public class InteractionController extends MobEntityController { } public static class EntityInteractionNPC extends Interaction implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityInteractionNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class InteractionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemController.java index 99c176dc5..77fa91e61 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemController.java @@ -50,11 +50,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends ItemEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ItemController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemDisplayController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemDisplayController.java index 11484fa7d..4a25bc528 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemDisplayController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemDisplayController.java @@ -51,11 +51,6 @@ public class ItemDisplayController extends MobEntityController { } public static class EntityItemDisplayNPC extends ItemDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemDisplayNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ItemDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemFrameController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemFrameController.java index 796f2ab15..22c8ef3b0 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemFrameController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ItemFrameController.java @@ -49,11 +49,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class ItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LargeFireballController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LargeFireballController.java index 4691d717e..a2ffdda93 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LargeFireballController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LargeFireballController.java @@ -38,11 +38,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class LargeFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LeashController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LeashController.java index 07f290560..6431d1471 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LeashController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LeashController.java @@ -39,11 +39,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class LeashController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LlamaSpitController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LlamaSpitController.java index b7cd2b9d8..15eaf9faa 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LlamaSpitController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/LlamaSpitController.java @@ -50,11 +50,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { @@ -71,6 +66,11 @@ public class LlamaSpitController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MarkerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MarkerController.java index 4c733b48e..c61e8df2b 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MarkerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MarkerController.java @@ -38,11 +38,6 @@ public class MarkerController extends MobEntityController { } public static class EntityMarkerNPC extends Marker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class MarkerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartChestController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartChestController.java index 69889410a..63a6b83ba 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartChestController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartChestController.java @@ -39,11 +39,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartChestController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartCommandController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartCommandController.java index 6f7c399ae..d6b7c1e2a 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartCommandController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartCommandController.java @@ -39,11 +39,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartCommandController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartFurnaceController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartFurnaceController.java index 24bcf9e5b..64b94ea5c 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartFurnaceController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartFurnaceController.java @@ -39,11 +39,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartFurnaceController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartHopperController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartHopperController.java index bf5c1c918..cf2e8e962 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartHopperController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartHopperController.java @@ -34,11 +34,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartHopperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartRideableController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartRideableController.java index d7801dbf9..09d607918 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartRideableController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartRideableController.java @@ -38,11 +38,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class MinecartRideableController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartSpawnerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartSpawnerController.java index e6affd451..3f23f41cb 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartSpawnerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartSpawnerController.java @@ -34,11 +34,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartTNTController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartTNTController.java index f7b43c7ff..bca5ebda8 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartTNTController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/MinecartTNTController.java @@ -34,11 +34,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartTNTController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public NPC getNPC() { return npc; diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/OminousItemSpawnerController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/OminousItemSpawnerController.java index 6c9f39dd5..c18316cc2 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/OminousItemSpawnerController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/OminousItemSpawnerController.java @@ -50,11 +50,6 @@ public class OminousItemSpawnerController extends MobEntityController { } public static class EntityOminousItemSpawnerNPC extends OminousItemSpawner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityOminousItemSpawnerNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class OminousItemSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/PaintingController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/PaintingController.java index 4028c6bea..f6303e55f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/PaintingController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/PaintingController.java @@ -38,11 +38,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends Painting implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class PaintingController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ShulkerBulletController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ShulkerBulletController.java index ff773de89..1b8112cb6 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ShulkerBulletController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ShulkerBulletController.java @@ -38,11 +38,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class ShulkerBulletController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SmallFireballController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SmallFireballController.java index ae6ab6376..afab257c1 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SmallFireballController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SmallFireballController.java @@ -38,11 +38,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class SmallFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SnowballController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SnowballController.java index f2f235587..4ac967fb3 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SnowballController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SnowballController.java @@ -38,11 +38,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends Snowball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class SnowballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SpectralArrowController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SpectralArrowController.java index 7c42fc9b7..fc70e5d8f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SpectralArrowController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/SpectralArrowController.java @@ -39,11 +39,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class SpectralArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TNTPrimedController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TNTPrimedController.java index 44a75aa8e..2a993e183 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TNTPrimedController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TNTPrimedController.java @@ -39,11 +39,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class TNTPrimedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TextDisplayController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TextDisplayController.java index b0379fc91..4c1b2dd7d 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TextDisplayController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TextDisplayController.java @@ -38,11 +38,6 @@ public class TextDisplayController extends MobEntityController { } public static class EntityTextDisplayNPC extends TextDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTextDisplayNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class TextDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownExpBottleController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownExpBottleController.java index e12f38732..1e9ae163f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownExpBottleController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownExpBottleController.java @@ -39,11 +39,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownExpBottleController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownPotionController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownPotionController.java index ed4bc12a2..a8c8087b7 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownPotionController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownPotionController.java @@ -39,11 +39,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownPotionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownTridentController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownTridentController.java index d950464d2..35921d929 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownTridentController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/ThrownTridentController.java @@ -39,11 +39,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownTridentController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TippedArrowController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TippedArrowController.java index 8e2ab2dcd..bea82f730 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TippedArrowController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/TippedArrowController.java @@ -38,11 +38,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class TippedArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WindChargeController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WindChargeController.java index 9e2c01a89..f4f716e52 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WindChargeController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WindChargeController.java @@ -38,11 +38,6 @@ public class WindChargeController extends MobEntityController { } public static class EntityWindChargeNPC extends WindCharge implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWindChargeNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class WindChargeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WitherSkullController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WitherSkullController.java index 9b622d6d2..c724d46f1 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WitherSkullController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/WitherSkullController.java @@ -38,11 +38,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class WitherSkullController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java index e7fbf92a0..55fe7b8a4 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java @@ -321,6 +321,7 @@ import net.minecraft.world.entity.animal.AbstractFish; import net.minecraft.world.entity.animal.AbstractSchoolingFish; import net.minecraft.world.entity.animal.Cat; import net.minecraft.world.entity.animal.Dolphin; +import net.minecraft.world.entity.animal.Fox; import net.minecraft.world.entity.animal.Panda; import net.minecraft.world.entity.animal.PolarBear; import net.minecraft.world.entity.animal.Pufferfish; @@ -651,12 +652,6 @@ public class NMSImpl implements NMSBridge { return handle.zza; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { ServerLevel server = (ServerLevel) getHandle(entity).level(); @@ -2566,6 +2561,7 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle ARMADILLO_SCUTE_TIME = NMS.getSetter(Armadillo.class, "cj"); private static final MethodHandle ATTRIBUTE_PROVIDER_MAP = NMS.getFirstGetter(AttributeSupplier.class, Map.class); + private static final MethodHandle ATTRIBUTE_PROVIDER_MAP_SETTER = NMS.getFirstFinalSetter(AttributeSupplier.class, Map.class); private static final MethodHandle ATTRIBUTE_SUPPLIER = NMS.getFirstGetter(AttributeMap.class, @@ -2623,9 +2619,9 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle NAVIGATION_PATHFINDER = NMS.getFirstFinalSetter(PathNavigation.class, PathFinder.class); private static final MethodHandle NAVIGATION_WORLD_FIELD = NMS.getFirstSetter(PathNavigation.class, Level.class); - private static final MethodHandle PLAYER_INFO_ENTRIES_LIST = NMS .getFirstFinalSetter(ClientboundPlayerInfoUpdatePacket.class, List.class); + private static final MethodHandle PLAYERINFO_ENTRIES = PLAYER_INFO_ENTRIES_LIST; private static final MethodHandle PORTAL_ENTRANCE_POS_GETTER = NMS.getGetter(Entity.class, "ay"); private static final MethodHandle PORTAL_ENTRANCE_POS_SETTER = NMS.getSetter(Entity.class, "ay"); @@ -2637,6 +2633,7 @@ public class NMSImpl implements NMSBridge { private static final Random RANDOM = Util.getFastRandom(); private static final MethodHandle SERVER_ENTITY_GETTER = NMS.getFirstGetter(TrackedEntity.class, ServerEntity.class); + public static final MethodHandle SET_FACEPLANTED = NMS.getMethodHandle(Fox.class, "A", true, boolean.class); private static MethodHandle SET_PROFILE_METHOD; private static final MethodHandle SIZE_FIELD_GETTER = NMS.getFirstGetter(Entity.class, EntityDimensions.class); private static final MethodHandle SIZE_FIELD_SETTER = NMS.getFirstSetter(Entity.class, EntityDimensions.class); diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AllayController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AllayController.java index 2193d85bc..3a89037cd 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AllayController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AllayController.java @@ -58,14 +58,9 @@ public class AllayController extends MobEntityController { } public static class EntityAllayNPC extends Allay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; - private int taskId = -1; + private int taskId = -1; public EntityAllayNPC(EntityType types, Level level) { this(types, level, null); } @@ -75,6 +70,11 @@ public class AllayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmadilloController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmadilloController.java index 5e3b84104..2bb10e161 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmadilloController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmadilloController.java @@ -55,11 +55,6 @@ public class ArmadilloController extends MobEntityController { } public static class EntityArmadilloNPC extends Armadillo implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityArmadilloNPC(EntityType types, Level level) { @@ -71,6 +66,11 @@ public class ArmadilloController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java index 301e2c270..bbefbbe9e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java @@ -48,14 +48,9 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private MobAI ai; - private final CitizensNPC npc; + private final CitizensNPC npc; public EntityArmorStandNPC(EntityType types, Level level) { this(types, level, null); } @@ -68,6 +63,11 @@ public class ArmorStandController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AxolotlController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AxolotlController.java index ff81e8ee1..31a95438d 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AxolotlController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/AxolotlController.java @@ -56,14 +56,9 @@ public class AxolotlController extends MobEntityController { } public static class EntityAxolotlNPC extends Axolotl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; - private MoveControl oldMoveController; + private MoveControl oldMoveController; public EntityAxolotlNPC(EntityType types, Level level) { this(types, level, null); } @@ -79,6 +74,11 @@ public class AxolotlController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BatController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BatController.java index 7df7081c1..043a87ed8 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BatController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BatController.java @@ -47,11 +47,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends Bat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBatNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class BatController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BeeController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BeeController.java index 69dbb527f..ae3d27c26 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BeeController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BeeController.java @@ -47,11 +47,6 @@ public class BeeController extends MobEntityController { } public static class EntityBeeNPC extends Bee implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBeeNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class BeeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BlazeController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BlazeController.java index cb1e44909..4d44bc7ef 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BlazeController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BlazeController.java @@ -47,11 +47,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends Blaze implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class BlazeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BoggedController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BoggedController.java index 4e210f15b..dab7679d9 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BoggedController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BoggedController.java @@ -50,11 +50,6 @@ public class BoggedController extends MobEntityController { } public static class EntityBoggedNPC extends Bogged implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBoggedNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class BoggedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BreezeController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BreezeController.java index 59e1cc5dc..804687a4e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BreezeController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/BreezeController.java @@ -50,11 +50,6 @@ public class BreezeController extends MobEntityController { } public static class EntityBreezeNPC extends Breeze implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBreezeNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class BreezeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CamelController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CamelController.java index 5e1737b19..4e7b7d492 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CamelController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CamelController.java @@ -60,15 +60,10 @@ public class CamelController extends MobEntityController { } public static class EntityCamelNPC extends Camel implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityCamelNPC(EntityType types, Level level) { this(types, level, null); } @@ -83,6 +78,11 @@ public class CamelController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CatController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CatController.java index 7f8be554a..21ce73bb5 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CatController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CatController.java @@ -50,11 +50,6 @@ public class CatController extends MobEntityController { } public static class EntityCatNPC extends Cat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCatNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class CatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CaveSpiderController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CaveSpiderController.java index 5ccc64858..ccf45c4e1 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CaveSpiderController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CaveSpiderController.java @@ -49,11 +49,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends CaveSpider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class CaveSpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ChickenController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ChickenController.java index e22038789..8d0d66d24 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ChickenController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ChickenController.java @@ -50,11 +50,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends Chicken implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class ChickenController extends MobEntityController { super.aiStep(); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java index 37206700a..f8e5b7f50 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java @@ -55,14 +55,9 @@ public class CodController extends MobEntityController { } public static class EntityCodNPC extends Cod implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; - private MoveControl oldMoveController; + private MoveControl oldMoveController; public EntityCodNPC(EntityType types, Level level) { this(types, level, null); } @@ -88,6 +83,11 @@ public class CodController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CowController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CowController.java index 511007853..e8be1ccdb 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CowController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CowController.java @@ -55,11 +55,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends Cow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityCowNPC(EntityType types, Level level) { @@ -71,6 +66,11 @@ public class CowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CreeperController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CreeperController.java index 7c55fb46a..57bd19706 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CreeperController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CreeperController.java @@ -51,11 +51,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends Creeper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -69,6 +64,11 @@ public class CreeperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DolphinController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DolphinController.java index 3439cc7e1..33b98a730 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DolphinController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DolphinController.java @@ -51,15 +51,10 @@ public class DolphinController extends MobEntityController { } public static class EntityDolphinNPC extends Dolphin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean inProtectedTick; + private final CitizensNPC npc; private MoveControl oldMoveController; - public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -75,6 +70,11 @@ public class DolphinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DrownedController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DrownedController.java index ec79f966d..731a47aba 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DrownedController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/DrownedController.java @@ -49,11 +49,6 @@ public class DrownedController extends MobEntityController { } public static class EntityDrownedNPC extends Drowned implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDrownedNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class DrownedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java index 146522c9c..ea1cfec10 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java @@ -50,11 +50,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EnderDragon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(EntityType types, Level level) { @@ -147,6 +142,11 @@ public class EnderDragonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermanController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermanController.java index 3391dca9d..0392e415b 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermanController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermanController.java @@ -52,11 +52,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EnderMan implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(EntityType types, Level level) { @@ -68,6 +63,11 @@ public class EndermanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermiteController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermiteController.java index c4396546c..9e962b5fa 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermiteController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EndermiteController.java @@ -49,11 +49,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends Endermite implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class EndermiteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EvokerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EvokerController.java index 631bf34b3..2c5f7a86b 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EvokerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EvokerController.java @@ -43,11 +43,6 @@ public class EvokerController extends MobEntityController { } public static class EntityEvokerNPC extends Evoker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class EvokerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FoxController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FoxController.java index 9f31afe6c..2a77035ff 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FoxController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FoxController.java @@ -47,11 +47,6 @@ public class FoxController extends MobEntityController { } public static class EntityFoxNPC extends Fox implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFoxNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class FoxController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) @@ -235,7 +235,7 @@ public class FoxController extends MobEntityController { return res; } - private static final MethodHandle SET_FACEPLANTED = NMS.getMethodHandle(Fox.class, "A", true, boolean.class); + private static final MethodHandle SET_FACEPLANTED = NMSImpl.FOX_SET_FACEPLANTED; } public static class FoxNPC extends CraftFox implements ForwardingNPCHolder { diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FrogController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FrogController.java index 05a6e50eb..c4aa71f8f 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FrogController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/FrogController.java @@ -44,11 +44,6 @@ public class FrogController extends MobEntityController { } public static class EntityFrogNPC extends Frog implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFrogNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class FrogController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GhastController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GhastController.java index fded6648e..ba2e4cb18 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GhastController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GhastController.java @@ -41,11 +41,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends Ghast implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class GhastController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GiantController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GiantController.java index 6961d9249..40f81d466 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GiantController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GiantController.java @@ -43,11 +43,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends Giant implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GiantController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GlowSquidController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GlowSquidController.java index 74ddf604a..814146615 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GlowSquidController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GlowSquidController.java @@ -43,11 +43,6 @@ public class GlowSquidController extends MobEntityController { } public static class EntityGlowSquidNPC extends GlowSquid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowSquidNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class GlowSquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GoatController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GoatController.java index 32f0848d4..6453d0a5e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GoatController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GoatController.java @@ -44,11 +44,6 @@ public class GoatController extends MobEntityController { } public static class EntityGoatNPC extends Goat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGoatNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class GoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianController.java index 34462bf8d..118610e0e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianController.java @@ -43,11 +43,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends Guardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianElderController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianElderController.java index 923a461ac..0bb27be5e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianElderController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/GuardianElderController.java @@ -43,11 +43,6 @@ public class GuardianElderController extends MobEntityController { } public static class EntityGuardianElderNPC extends ElderGuardian implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGuardianElderNPC(EntityType types, Level level) { @@ -74,6 +69,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HoglinController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HoglinController.java index 587f94ead..fa5310b55 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HoglinController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HoglinController.java @@ -43,11 +43,6 @@ public class HoglinController extends MobEntityController { } public static class EntityHoglinNPC extends Hoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityHoglinNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class HoglinController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseController.java index 3d7ed5523..d4dbaf88e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseController.java @@ -54,15 +54,10 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends Horse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseNPC(EntityType types, Level level) { this(types, level, null); } @@ -77,6 +72,11 @@ public class HorseController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseDonkeyController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseDonkeyController.java index 380f23c2f..ae74e60ee 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseDonkeyController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseDonkeyController.java @@ -54,11 +54,6 @@ public class HorseDonkeyController extends MobEntityController { } public static class EntityHorseDonkeyNPC extends Donkey implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseMuleController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseMuleController.java index 8ab96e840..ee784591b 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseMuleController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseMuleController.java @@ -54,11 +54,6 @@ public class HorseMuleController extends MobEntityController { } public static class EntityHorseMuleNPC extends Mule implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseSkeletonController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseSkeletonController.java index cf6c57c89..596606c9e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseSkeletonController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseSkeletonController.java @@ -54,16 +54,11 @@ public class HorseSkeletonController extends MobEntityController { } public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; - private boolean riding; + private boolean riding; public EntityHorseSkeletonNPC(EntityType types, Level level) { this(types, level, null); } @@ -78,6 +73,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseZombieController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseZombieController.java index 87f652660..6ed0553e6 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseZombieController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/HorseZombieController.java @@ -54,11 +54,6 @@ public class HorseZombieController extends MobEntityController { } public static class EntityHorseZombieNPC extends ZombieHorse implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IllusionerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IllusionerController.java index d7342a12d..c29d7dea7 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IllusionerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IllusionerController.java @@ -43,11 +43,6 @@ public class IllusionerController extends MobEntityController { } public static class EntityIllusionerNPC extends Illusioner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIllusionerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class IllusionerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IronGolemController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IronGolemController.java index bf762aa77..fa1f92d26 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IronGolemController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/IronGolemController.java @@ -43,11 +43,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends IronGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class IronGolemController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/LlamaController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/LlamaController.java index 03ac47015..c46a17348 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/LlamaController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/LlamaController.java @@ -54,11 +54,6 @@ public class LlamaController extends MobEntityController { } public static class EntityLlamaNPC extends Llama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -79,6 +74,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MagmaCubeController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MagmaCubeController.java index 5871b92cd..6cc3fca58 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MagmaCubeController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MagmaCubeController.java @@ -46,11 +46,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends MagmaCube implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -69,6 +64,11 @@ public class MagmaCubeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MushroomCowController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MushroomCowController.java index ef7a4f376..7e4770bdd 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MushroomCowController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/MushroomCowController.java @@ -47,11 +47,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends MushroomCow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(EntityType types, Level level) { @@ -63,6 +58,11 @@ public class MushroomCowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/OcelotController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/OcelotController.java index edd63d704..b3c244ccc 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/OcelotController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/OcelotController.java @@ -45,11 +45,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends Ocelot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class OcelotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PandaController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PandaController.java index af822d953..1cf921a94 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PandaController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PandaController.java @@ -44,11 +44,6 @@ public class PandaController extends MobEntityController { } public static class EntityPandaNPC extends Panda implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPandaNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PandaController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ParrotController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ParrotController.java index 3aa844263..e3949c010 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ParrotController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ParrotController.java @@ -44,11 +44,6 @@ public class ParrotController extends MobEntityController { } public static class EntityParrotNPC extends Parrot implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityParrotNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class ParrotController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PhantomController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PhantomController.java index 49fe5e747..16e8828f5 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PhantomController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PhantomController.java @@ -47,11 +47,6 @@ public class PhantomController extends MobEntityController { } public static class EntityPhantomNPC extends Phantom implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private LookControl oldLookController; @@ -94,6 +89,11 @@ public class PhantomController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigController.java index bd6cad669..7d0e39b97 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigController.java @@ -46,11 +46,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends Pig implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class PigController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigZombieController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigZombieController.java index 485f073fd..674de211c 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigZombieController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PigZombieController.java @@ -43,11 +43,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends ZombifiedPiglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class PigZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinBruteController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinBruteController.java index 8b598f651..9afb79c1b 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinBruteController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinBruteController.java @@ -43,11 +43,6 @@ public class PiglinBruteController extends MobEntityController { } public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class PiglinBruteController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinController.java index 12c0942d0..e98773268 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PiglinController.java @@ -48,11 +48,6 @@ public class PiglinController extends MobEntityController { } public static class EntityPiglinNPC extends Piglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPiglinNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class PiglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PillagerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PillagerController.java index a6ad41187..f5332f030 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PillagerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PillagerController.java @@ -44,11 +44,6 @@ public class PillagerController extends MobEntityController { } public static class EntityPillagerNPC extends Pillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPillagerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class PillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PolarBearController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PolarBearController.java index 03f9b6c69..694d34205 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PolarBearController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PolarBearController.java @@ -42,11 +42,6 @@ public class PolarBearController extends MobEntityController { } public static class EntityPolarBearNPC extends PolarBear implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPolarBearNPC(EntityType types, Level level) { @@ -58,6 +53,11 @@ public class PolarBearController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PufferFishController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PufferFishController.java index 8af9f247d..ace913da7 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PufferFishController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/PufferFishController.java @@ -53,11 +53,6 @@ public class PufferFishController extends MobEntityController { } public static class EntityPufferFishNPC extends Pufferfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -90,6 +85,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RabbitController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RabbitController.java index 4ee29c607..9b90bd956 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RabbitController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RabbitController.java @@ -45,11 +45,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends Rabbit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class RabbitController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RavagerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RavagerController.java index b9464d21a..81c1923e0 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RavagerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/RavagerController.java @@ -44,11 +44,6 @@ public class RavagerController extends MobEntityController { } public static class EntityRavagerNPC extends Ravager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityRavagerNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class RavagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SalmonController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SalmonController.java index ca44686de..56cb2d962 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SalmonController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SalmonController.java @@ -50,11 +50,6 @@ public class SalmonController extends MobEntityController { } public static class EntitySalmonNPC extends Salmon implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -84,6 +79,11 @@ public class SalmonController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SheepController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SheepController.java index 804f1dda7..3764a42aa 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SheepController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SheepController.java @@ -44,11 +44,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends Sheep implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class SheepController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ShulkerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ShulkerController.java index 5465cdde2..4865aab25 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ShulkerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ShulkerController.java @@ -44,11 +44,6 @@ public class ShulkerController extends MobEntityController { } public static class EntityShulkerNPC extends Shulker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ShulkerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SilverfishController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SilverfishController.java index 25622550b..b4ac6b7f7 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SilverfishController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SilverfishController.java @@ -43,11 +43,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends Silverfish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SilverfishController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonController.java index 036378447..b53277cf9 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonController.java @@ -43,11 +43,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends Skeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonStrayController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonStrayController.java index 99b69ebf5..d77f5fd4a 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonStrayController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonStrayController.java @@ -43,11 +43,6 @@ public class SkeletonStrayController extends MobEntityController { } public static class EntityStrayNPC extends Stray implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStrayNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonStrayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonWitherController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonWitherController.java index 7a8b3541d..9a940f474 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonWitherController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SkeletonWitherController.java @@ -43,11 +43,6 @@ public class SkeletonWitherController extends MobEntityController { } public static class EntitySkeletonWitherNPC extends WitherSkeleton implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySkeletonWitherNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SkeletonWitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SlimeController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SlimeController.java index 6c1f7b7ba..4b3210b73 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SlimeController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SlimeController.java @@ -46,11 +46,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends Slime implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -69,6 +64,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnifferController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnifferController.java index a34b52739..d4686c0fd 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnifferController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnifferController.java @@ -49,11 +49,6 @@ public class SnifferController extends MobEntityController { } public static class EntitySnifferNPC extends Sniffer implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnifferNPC(EntityType types, Level level) { @@ -65,6 +60,11 @@ public class SnifferController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnowmanController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnowmanController.java index e4553329d..06f849aad 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnowmanController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SnowmanController.java @@ -43,11 +43,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends SnowGolem implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SnowmanController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SpiderController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SpiderController.java index f120a643d..b74ca9b69 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SpiderController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SpiderController.java @@ -43,11 +43,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends Spider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SpiderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SquidController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SquidController.java index c2ff4315e..9c68d4945 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SquidController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/SquidController.java @@ -43,11 +43,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends Squid implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class SquidController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/StriderController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/StriderController.java index 6976c5bac..f52df5f01 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/StriderController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/StriderController.java @@ -43,11 +43,6 @@ public class StriderController extends MobEntityController { } public static class EntityStriderNPC extends Strider implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityStriderNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class StriderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TadpoleController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TadpoleController.java index 2a9fdc196..03ed8fcbe 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TadpoleController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TadpoleController.java @@ -51,11 +51,6 @@ public class TadpoleController extends MobEntityController { } public static class EntityTadpoleNPC extends Tadpole implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -85,6 +80,11 @@ public class TadpoleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TraderLlamaController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TraderLlamaController.java index cc5d463ec..8d2925616 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TraderLlamaController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TraderLlamaController.java @@ -52,11 +52,6 @@ public class TraderLlamaController extends MobEntityController { } public static class EntityTraderLlamaNPC extends TraderLlama implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTraderLlamaNPC(EntityType types, Level level) { @@ -72,6 +67,11 @@ public class TraderLlamaController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TropicalFishController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TropicalFishController.java index b3519a1bb..9009da7b9 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TropicalFishController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TropicalFishController.java @@ -50,11 +50,6 @@ public class TropicalFishController extends MobEntityController { } public static class EntityTropicalFishNPC extends TropicalFish implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private MoveControl oldMoveController; @@ -84,6 +79,11 @@ public class TropicalFishController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TurtleController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TurtleController.java index 5da204a34..de395a6b9 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TurtleController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/TurtleController.java @@ -47,11 +47,6 @@ public class TurtleController extends MobEntityController { } public static class EntityTurtleNPC extends Turtle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; private JumpControl oldJumpController; @@ -73,6 +68,11 @@ public class TurtleController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VexController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VexController.java index 15c6907a0..9f7888076 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VexController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VexController.java @@ -41,11 +41,6 @@ public class VexController extends MobEntityController { } public static class EntityVexNPC extends Vex implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVexNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class VexController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VillagerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VillagerController.java index 5d481f45e..e35121814 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VillagerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VillagerController.java @@ -51,11 +51,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends Villager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -72,6 +67,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VindicatorController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VindicatorController.java index cb4c474d7..706ceba80 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VindicatorController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/VindicatorController.java @@ -44,11 +44,6 @@ public class VindicatorController extends MobEntityController { } public static class EntityVindicatorNPC extends Vindicator implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityVindicatorNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class VindicatorController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WanderingTraderController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WanderingTraderController.java index 125c4d094..cdcacf95e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WanderingTraderController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WanderingTraderController.java @@ -50,11 +50,6 @@ public class WanderingTraderController extends MobEntityController { } public static class EntityWanderingTraderNPC extends WanderingTrader implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private boolean blockingATrade; private boolean blockTrades = true; @@ -70,6 +65,11 @@ public class WanderingTraderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WardenController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WardenController.java index ad12799a2..80083f961 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WardenController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WardenController.java @@ -45,11 +45,6 @@ public class WardenController extends MobEntityController { } public static class EntityWardenNPC extends Warden implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWardenNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class WardenController extends MobEntityController { this.getBrain().setMemoryWithExpiry(MemoryModuleType.DIG_COOLDOWN, Unit.INSTANCE, 1200L); } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitchController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitchController.java index a1a3d20c0..3ed19e8c6 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitchController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitchController.java @@ -43,11 +43,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends Witch implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class WitchController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitherController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitherController.java index 613af9237..a46704842 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitherController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WitherController.java @@ -41,11 +41,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends WitherBoss implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(EntityType types, Level level) { @@ -57,6 +52,11 @@ public class WitherController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WolfController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WolfController.java index f72a9950b..83cef68a1 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WolfController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/WolfController.java @@ -46,11 +46,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends Wolf implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(EntityType types, Level level) { @@ -62,6 +57,11 @@ public class WolfController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZoglinController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZoglinController.java index 907597355..e8fe0103d 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZoglinController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZoglinController.java @@ -43,11 +43,6 @@ public class ZoglinController extends MobEntityController { } public static class EntityZoglinNPC extends Zoglin implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZoglinNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZoglinController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieController.java index f3b170a0f..fd0392de0 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieController.java @@ -43,11 +43,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends Zombie implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieHuskController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieHuskController.java index 29e97171b..2072ea664 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieHuskController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieHuskController.java @@ -43,11 +43,6 @@ public class ZombieHuskController extends MobEntityController { } public static class EntityZombieHuskNPC extends Husk implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieHuskNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieHuskController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieVillagerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieVillagerController.java index 9532a6f11..5d2cce3d7 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieVillagerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ZombieVillagerController.java @@ -43,11 +43,6 @@ public class ZombieVillagerController extends MobEntityController { } public static class EntityZombieVillagerNPC extends ZombieVillager implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityZombieVillagerNPC(EntityType types, Level level) { @@ -59,6 +54,11 @@ public class ZombieVillagerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override protected boolean canRide(Entity entity) { if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BlockDisplayController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BlockDisplayController.java index 039c9897d..824a99812 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BlockDisplayController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BlockDisplayController.java @@ -57,11 +57,6 @@ public class BlockDisplayController extends MobEntityController { } public static class EntityBlockDisplayNPC extends BlockDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBlockDisplayNPC(EntityType types, Level level) { @@ -73,6 +68,11 @@ public class BlockDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BoatController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BoatController.java index 5e947d1be..b5250b251 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BoatController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BoatController.java @@ -50,18 +50,13 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends Boat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private float invFriction; + private float landFriction; private Status lastStatus; private final CitizensNPC npc; private Status status; private double waterLevel; - public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -71,6 +66,11 @@ public class BoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BreezeWindChargeController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BreezeWindChargeController.java index c04a3f662..fa9f9a72b 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BreezeWindChargeController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BreezeWindChargeController.java @@ -44,11 +44,6 @@ public class BreezeWindChargeController extends MobEntityController { } public static class EntityBreezeWindChargeNPC extends BreezeWindCharge implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityBreezeWindChargeNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class BreezeWindChargeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ChestBoatController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ChestBoatController.java index 1feb01bdb..1230844a1 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ChestBoatController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ChestBoatController.java @@ -50,20 +50,15 @@ public class ChestBoatController extends MobEntityController { } public static class EntityChestBoatNPC extends ChestBoat implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private double aC; private float aD; + private Status aE; private Status aF; private double ap; private double ar; private final CitizensNPC npc; - public EntityChestBoatNPC(EntityType types, Level level) { this(types, level, null); } @@ -73,6 +68,11 @@ public class ChestBoatController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/DragonFireballController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/DragonFireballController.java index 99dde6dcf..bee398339 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/DragonFireballController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/DragonFireballController.java @@ -44,11 +44,6 @@ public class DragonFireballController extends MobEntityController { } public static class EntityDragonFireballNPC extends DragonFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityDragonFireballNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class DragonFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EggController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EggController.java index daecac643..6bf62b5bd 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EggController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EggController.java @@ -54,11 +54,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends ThrownEgg implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEggNPC(EntityType types, Level level) { @@ -75,6 +70,11 @@ public class EggController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderCrystalController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderCrystalController.java index 3243ae137..340e58262 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderCrystalController.java @@ -44,11 +44,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EndCrystal implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(EntityType types, Level level) { @@ -60,6 +55,11 @@ public class EnderCrystalController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderPearlController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderPearlController.java index a6f24d496..5e88a5dff 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderPearlController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EnderPearlController.java @@ -45,11 +45,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends ThrownEnderpearl implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class EnderPearlController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EvokerFangsController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EvokerFangsController.java index cadf51c6c..1944c57ee 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EvokerFangsController.java @@ -42,11 +42,6 @@ public class EvokerFangsController extends MobEntityController { } public static class EntityEvokerFangsNPC extends EvokerFangs implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEvokerFangsNPC(EntityType types, Level level) { @@ -58,6 +53,11 @@ public class EvokerFangsController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ExperienceOrbController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ExperienceOrbController.java index c5d7a0291..197141b0d 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ExperienceOrbController.java @@ -38,11 +38,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends ExperienceOrb implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class ExperienceOrbController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EyeOfEnderController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EyeOfEnderController.java index 5b87db1fb..50eb8b341 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EyeOfEnderController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/EyeOfEnderController.java @@ -45,11 +45,6 @@ public class EyeOfEnderController extends MobEntityController { } public static class EntityEnderSignalNPC extends EyeOfEnder implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(EntityType types, Level level) { @@ -61,6 +56,11 @@ public class EyeOfEnderController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FallingBlockController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FallingBlockController.java index 511ec8a9d..5e3fc91b9 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FallingBlockController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FallingBlockController.java @@ -55,11 +55,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends FallingBlockEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(EntityType types, Level level) { @@ -71,6 +66,11 @@ public class FallingBlockController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FireworkController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FireworkController.java index 9ce844aee..db69b7db4 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FireworkController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FireworkController.java @@ -39,11 +39,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends FireworkRocketEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class FireworkController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FishingHookController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FishingHookController.java index 6698932a5..bf6167542 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FishingHookController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/FishingHookController.java @@ -64,11 +64,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends FishingHook implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(EntityType types, Level level) { @@ -80,6 +75,11 @@ public class FishingHookController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/GlowItemFrameController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/GlowItemFrameController.java index 18df3fd18..3d9a4f688 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/GlowItemFrameController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/GlowItemFrameController.java @@ -48,11 +48,6 @@ public class GlowItemFrameController extends MobEntityController { } public static class EntityGlowItemFrameNPC extends GlowItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityGlowItemFrameNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class GlowItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/InteractionController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/InteractionController.java index 9d24a7e68..4b7ceabe9 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/InteractionController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/InteractionController.java @@ -38,11 +38,6 @@ public class InteractionController extends MobEntityController { } public static class EntityInteractionNPC extends Interaction implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityInteractionNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class InteractionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemController.java index 281f8add0..857e875ec 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemController.java @@ -50,11 +50,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends ItemEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ItemController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemDisplayController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemDisplayController.java index 4a464fdbb..4fc19b2e5 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemDisplayController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemDisplayController.java @@ -51,11 +51,6 @@ public class ItemDisplayController extends MobEntityController { } public static class EntityItemDisplayNPC extends ItemDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemDisplayNPC(EntityType types, Level level) { @@ -67,6 +62,11 @@ public class ItemDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemFrameController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemFrameController.java index d7fdb8382..4b9777e57 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemFrameController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ItemFrameController.java @@ -48,11 +48,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends ItemFrame implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(EntityType types, Level level) { @@ -64,6 +59,11 @@ public class ItemFrameController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LargeFireballController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LargeFireballController.java index c8dab8187..b7e90a118 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LargeFireballController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LargeFireballController.java @@ -38,11 +38,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends LargeFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class LargeFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LeashController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LeashController.java index 84379cb48..3b5f1c57b 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LeashController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LeashController.java @@ -39,11 +39,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends LeashFenceKnotEntity implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class LeashController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LlamaSpitController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LlamaSpitController.java index 23d624022..e7df8e39a 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/LlamaSpitController.java @@ -51,11 +51,6 @@ public class LlamaSpitController extends AbstractEntityController { } public static class EntityLlamaSpitNPC extends LlamaSpit implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityLlamaSpitNPC(EntityType types, Level level) { @@ -72,6 +67,11 @@ public class LlamaSpitController extends AbstractEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MarkerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MarkerController.java index 57c9402ae..8d7d41f58 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MarkerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MarkerController.java @@ -38,11 +38,6 @@ public class MarkerController extends MobEntityController { } public static class EntityMarkerNPC extends Marker implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMarkerNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class MarkerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartChestController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartChestController.java index 77faf7ee9..c7eaa9a2a 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartChestController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartChestController.java @@ -39,11 +39,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends MinecartChest implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartChestController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartCommandController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartCommandController.java index 8f40796a9..d96de8c08 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartCommandController.java @@ -39,11 +39,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends MinecartCommandBlock implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartCommandController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartFurnaceController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartFurnaceController.java index 517524c12..dc2aa13c1 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartFurnaceController.java @@ -39,11 +39,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends MinecartFurnace implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class MinecartFurnaceController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartHopperController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartHopperController.java index fcf9a4f8b..51dc537f1 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartHopperController.java @@ -34,11 +34,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends MinecartHopper implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartHopperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartRideableController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartRideableController.java index d67a0deae..397f236a1 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartRideableController.java @@ -38,11 +38,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends Minecart implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class MinecartRideableController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartSpawnerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartSpawnerController.java index 1a3ee7786..8f4bb73d0 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartSpawnerController.java @@ -34,11 +34,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends MinecartSpawner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartTNTController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartTNTController.java index 4bf3176c7..5833b1594 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/MinecartTNTController.java @@ -34,11 +34,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends MinecartTNT implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(EntityType types, Level level) { @@ -50,6 +45,11 @@ public class MinecartTNTController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/OminousItemSpawnerController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/OminousItemSpawnerController.java index 030ffd6d1..6aeb4f1d1 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/OminousItemSpawnerController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/OminousItemSpawnerController.java @@ -50,11 +50,6 @@ public class OminousItemSpawnerController extends MobEntityController { } public static class EntityOminousItemSpawnerNPC extends OminousItemSpawner implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityOminousItemSpawnerNPC(EntityType types, Level level) { @@ -66,6 +61,11 @@ public class OminousItemSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/PaintingController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/PaintingController.java index 072a9c86a..772b7bf28 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/PaintingController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/PaintingController.java @@ -38,11 +38,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends Painting implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class PaintingController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ShulkerBulletController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ShulkerBulletController.java index 11b9472d9..87c833a88 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ShulkerBulletController.java @@ -38,11 +38,6 @@ public class ShulkerBulletController extends MobEntityController { } public static class EntityShulkerBulletNPC extends ShulkerBullet implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityShulkerBulletNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class ShulkerBulletController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SmallFireballController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SmallFireballController.java index c4e51fc57..83f278fe3 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SmallFireballController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SmallFireballController.java @@ -38,11 +38,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends SmallFireball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class SmallFireballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SnowballController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SnowballController.java index 3ff26f083..a9a11851e 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SnowballController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SnowballController.java @@ -38,11 +38,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends Snowball implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class SnowballController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SpectralArrowController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SpectralArrowController.java index 0d7729214..73cd320be 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/SpectralArrowController.java @@ -39,11 +39,6 @@ public class SpectralArrowController extends MobEntityController { } public static class EntitySpectralArrowNPC extends SpectralArrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntitySpectralArrowNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class SpectralArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TNTPrimedController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TNTPrimedController.java index ff801d273..3a9efb2e8 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TNTPrimedController.java @@ -39,11 +39,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends PrimedTnt implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class TNTPrimedController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TextDisplayController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TextDisplayController.java index c0d2c8ef3..4715d77ea 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TextDisplayController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TextDisplayController.java @@ -38,11 +38,6 @@ public class TextDisplayController extends MobEntityController { } public static class EntityTextDisplayNPC extends TextDisplay implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTextDisplayNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class TextDisplayController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownExpBottleController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownExpBottleController.java index a4f0d0560..f9d931acf 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownExpBottleController.java @@ -39,11 +39,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends ThrownExperienceBottle implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownExpBottleController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownPotionController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownPotionController.java index aaff525e9..64a3305d3 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownPotionController.java @@ -39,11 +39,6 @@ public class ThrownPotionController extends MobEntityController { } public static class EntityThrownPotionNPC extends ThrownPotion implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownPotionNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownPotionController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownTridentController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownTridentController.java index a3b732728..923657868 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/ThrownTridentController.java @@ -39,11 +39,6 @@ public class ThrownTridentController extends MobEntityController { } public static class EntityThrownTridentNPC extends ThrownTrident implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityThrownTridentNPC(EntityType types, Level level) { @@ -55,6 +50,11 @@ public class ThrownTridentController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TippedArrowController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TippedArrowController.java index 4bc387385..2b9348558 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TippedArrowController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/TippedArrowController.java @@ -38,11 +38,6 @@ public class TippedArrowController extends MobEntityController { } public static class EntityTippedArrowNPC extends Arrow implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityTippedArrowNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class TippedArrowController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WindChargeController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WindChargeController.java index 18fd3d987..a3a6dc7df 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WindChargeController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WindChargeController.java @@ -38,11 +38,6 @@ public class WindChargeController extends MobEntityController { } public static class EntityWindChargeNPC extends WindCharge implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWindChargeNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class WindChargeController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WitherSkullController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WitherSkullController.java index b67e5b32d..17a26cb31 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WitherSkullController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/WitherSkullController.java @@ -38,11 +38,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends WitherSkull implements NPCHolder { - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(EntityType types, Level level) { @@ -54,6 +49,11 @@ public class WitherSkullController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public boolean broadcastToPlayer(ServerPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); + } + @Override public Entity changeDimension(DimensionTransition transition) { if (npc == null) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java index 6dfb9129e..af88ba9dd 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java @@ -322,6 +322,7 @@ import net.minecraft.world.entity.animal.AbstractFish; import net.minecraft.world.entity.animal.AbstractSchoolingFish; import net.minecraft.world.entity.animal.Cat; import net.minecraft.world.entity.animal.Dolphin; +import net.minecraft.world.entity.animal.Fox; import net.minecraft.world.entity.animal.Panda; import net.minecraft.world.entity.animal.PolarBear; import net.minecraft.world.entity.animal.Pufferfish; @@ -631,12 +632,6 @@ public class NMSImpl implements NMSBridge { return handle.zza; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { ServerLevel server = (ServerLevel) getHandle(entity).level(); @@ -2588,6 +2583,7 @@ public class NMSImpl implements NMSBridge { boolean.class); private static final MethodHandle FLYING_MOVECONTROL_FLOAT_SETTER = NMS.getFirstSetter(FlyingMoveControl.class, boolean.class); + public static final MethodHandle FOX_SET_FACEPLANTED = NMS.getMethodHandle(Fox.class, "B", true, boolean.class); private static final Location FROM_LOCATION = new Location(null, 0, 0, 0); private static EntityDataAccessor INTERACTION_HEIGHT = null; private static EntityDataAccessor INTERACTION_WIDTH = null; diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java index 12b9f09e9..8281657f9 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java @@ -49,11 +49,6 @@ public class ArmorStandController extends MobEntityController { } public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArmorStandNPC(World world) { @@ -80,6 +75,11 @@ public class ArmorStandController extends MobEntityController { return !event.isCancelled(); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); 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 c42e9312a..d1cfb17ff 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 @@ -46,11 +46,6 @@ public class BatController extends MobEntityController { } public static class EntityBatNPC extends EntityBat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBatNPC(World world) { @@ -76,6 +71,11 @@ public class BatController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 c89f35fec..7620201fc 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 @@ -46,11 +46,6 @@ public class BlazeController extends MobEntityController { } public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityBlazeNPC(World world) { @@ -73,6 +68,11 @@ public class BlazeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 5fb18a6a7..1187a6985 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 @@ -48,11 +48,6 @@ public class CaveSpiderController extends MobEntityController { } public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCaveSpiderNPC(World world) { @@ -82,6 +77,11 @@ public class CaveSpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 df9d8df1f..fc08a4b54 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 @@ -48,11 +48,6 @@ public class ChickenController extends MobEntityController { } public static class EntityChickenNPC extends EntityChicken implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityChickenNPC(World world) { @@ -91,6 +86,11 @@ public class ChickenController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 76ac2c973..36c793bea 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 @@ -51,11 +51,6 @@ public class CowController extends MobEntityController { } public static class EntityCowNPC extends EntityCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityCowNPC(World world) { @@ -105,6 +100,11 @@ public class CowController extends MobEntityController { return super.a(entityhuman); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 09234a262..96cdd8a46 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 @@ -50,11 +50,6 @@ public class CreeperController extends MobEntityController { } public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean allowPowered; private final CitizensNPC npc; @@ -91,6 +86,11 @@ public class CreeperController extends MobEntityController { return npc == null || !npc.isProtected() ? super.a(entityhuman) : false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 c702c50b8..91f162293 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 @@ -51,11 +51,6 @@ public class EnderDragonController extends MobEntityController { } public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderDragonNPC(World world) { @@ -78,6 +73,11 @@ public class EnderDragonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 c287c1a40..8edc929a6 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 @@ -48,11 +48,6 @@ public class EndermanController extends MobEntityController { } public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermanNPC(World world) { @@ -82,6 +77,11 @@ public class EndermanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 716bfd5d8..a235e3168 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 @@ -48,11 +48,6 @@ public class EndermiteController extends MobEntityController { } public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEndermiteNPC(World world) { @@ -82,6 +77,11 @@ public class EndermiteController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 53413dd72..3e580c523 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 @@ -32,11 +32,6 @@ public class GhastController extends MobEntityController { } public static class EntityGhastNPC extends EntityGhast implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGhastNPC(World world) { @@ -59,6 +54,11 @@ public class GhastController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 5dd55db36..6144bbd8b 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 @@ -34,11 +34,6 @@ public class GiantController extends MobEntityController { } public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGiantNPC(World world) { @@ -68,6 +63,11 @@ public class GiantController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 c20a4ac13..60ed7422c 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 @@ -34,11 +34,6 @@ public class GuardianController extends MobEntityController { } public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityGuardianNPC(World world) { @@ -68,6 +63,11 @@ public class GuardianController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 20cd9daa7..7b9790495 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 @@ -46,11 +46,6 @@ public class HorseController extends MobEntityController { } public static class EntityHorseNPC extends EntityHorse implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double baseMovementSpeed; private final CitizensNPC npc; @@ -97,6 +92,11 @@ public class HorseController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 659731d42..c7b5861e0 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 @@ -34,11 +34,6 @@ public class IronGolemController extends MobEntityController { } public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityIronGolemNPC(World world) { @@ -68,6 +63,11 @@ public class IronGolemController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 501d09768..2cac336af 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 @@ -36,11 +36,6 @@ public class MagmaCubeController extends MobEntityController { } public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMagmaCubeNPC(World world) { @@ -74,6 +69,11 @@ public class MagmaCubeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 be057ff23..9eb18ed89 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 @@ -35,11 +35,6 @@ public class MushroomCowController extends MobEntityController { } public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMushroomCowNPC(World world) { @@ -85,6 +80,11 @@ public class MushroomCowController extends MobEntityController { return false; } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 603defca7..26dccd30d 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 @@ -34,11 +34,6 @@ public class OcelotController extends MobEntityController { } public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityOcelotNPC(World world) { @@ -77,6 +72,11 @@ public class OcelotController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 4e9462edc..2eaf80069 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 @@ -35,11 +35,6 @@ public class PigController extends MobEntityController { } public static class EntityPigNPC extends EntityPig implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigNPC(World world) { @@ -78,6 +73,11 @@ public class PigController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 50ba0f7e4..ba1402a02 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 @@ -34,11 +34,6 @@ public class PigZombieController extends MobEntityController { } public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPigZombieNPC(World world) { @@ -68,6 +63,11 @@ public class PigZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 6c57d2be9..4ac5fd137 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 @@ -35,11 +35,6 @@ public class RabbitController extends MobEntityController { } public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityRabbitNPC(World world) { @@ -78,6 +73,11 @@ public class RabbitController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 f9bf7b0d9..eb2679b43 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 @@ -34,11 +34,6 @@ public class SheepController extends MobEntityController { } public static class EntitySheepNPC extends EntitySheep implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySheepNPC(World world) { @@ -77,6 +72,11 @@ public class SheepController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 3c023cb3e..9a13c8dd0 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 @@ -34,11 +34,6 @@ public class SilverfishController extends MobEntityController { } public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySilverfishNPC(World world) { @@ -68,6 +63,11 @@ public class SilverfishController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 c7872b7aa..b6c7e06fd 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 @@ -34,11 +34,6 @@ public class SkeletonController extends MobEntityController { } public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySkeletonNPC(World world) { @@ -68,6 +63,11 @@ public class SkeletonController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 e4f51b504..503298867 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 @@ -36,11 +36,6 @@ public class SlimeController extends MobEntityController { } public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySlimeNPC(World world) { @@ -74,6 +69,11 @@ public class SlimeController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 27c2ddb5a..00bf1bc9e 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 @@ -34,11 +34,6 @@ public class SnowmanController extends MobEntityController { } public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowmanNPC(World world) { @@ -68,6 +63,11 @@ public class SnowmanController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 efb8999de..3c1ded811 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 @@ -34,11 +34,6 @@ public class SpiderController extends MobEntityController { } public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySpiderNPC(World world) { @@ -68,6 +63,11 @@ public class SpiderController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 96e7bedbf..37bb5b9da 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 @@ -34,11 +34,6 @@ public class SquidController extends MobEntityController { } public static class EntitySquidNPC extends EntitySquid implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySquidNPC(World world) { @@ -68,6 +63,11 @@ public class SquidController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 24641f2c5..0accb44f1 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 @@ -36,11 +36,6 @@ public class VillagerController extends MobEntityController { } public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private boolean blockingATrade; private final CitizensNPC npc; @@ -89,6 +84,11 @@ public class VillagerController extends MobEntityController { return super.a(entityhuman); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 bbf83de41..398027926 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 @@ -34,11 +34,6 @@ public class WitchController extends MobEntityController { } public static class EntityWitchNPC extends EntityWitch implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitchNPC(World world) { @@ -68,6 +63,11 @@ public class WitchController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 997a698df..5280b141d 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 @@ -32,11 +32,6 @@ public class WitherController extends MobEntityController { } public static class EntityWitherNPC extends EntityWither implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherNPC(World world) { @@ -59,6 +54,11 @@ public class WitherController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 dd112b223..fe5c19d04 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 @@ -36,11 +36,6 @@ public class WolfController extends MobEntityController { } public static class EntityWolfNPC extends EntityWolf implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWolfNPC(World world) { @@ -79,6 +74,11 @@ public class WolfController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); 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 bbba1a2f3..141080ee6 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 @@ -34,11 +34,6 @@ public class ZombieController extends MobEntityController { } public static class EntityZombieNPC extends EntityZombie implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityZombieNPC(World world) { @@ -68,6 +63,11 @@ public class ZombieController extends MobEntityController { evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public int aE() { return NMS.getFallDistance(npc, super.aE()); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java index 2f205d6ca..2e54a0f45 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java @@ -45,11 +45,6 @@ public class ArrowController extends MobEntityController { } public static class EntityArrowNPC extends EntityArrow implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityArrowNPC(World world) { @@ -66,6 +61,11 @@ public class ArrowController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java index 828b4974d..af421f94b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java @@ -54,11 +54,6 @@ public class BoatController extends MobEntityController { } public static class EntityBoatNPC extends EntityBoat implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private double b; private final CitizensNPC npc; @@ -77,6 +72,11 @@ public class BoatController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java index 4c3222e59..adc1676ec 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java @@ -56,11 +56,6 @@ public class EggController extends AbstractEntityController { } public static class EntityEggNPC extends EntityEgg implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEggNPC(World world) { @@ -82,6 +77,11 @@ public class EggController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java index e44088956..be572ba87 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java @@ -45,11 +45,6 @@ public class EnderCrystalController extends MobEntityController { } public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderCrystalNPC(World world) { @@ -66,6 +61,11 @@ public class EnderCrystalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java index 911da7955..812ab5833 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java @@ -45,11 +45,6 @@ public class EnderPearlController extends MobEntityController { } public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderPearlNPC(World world) { @@ -66,6 +61,11 @@ public class EnderPearlController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java index 9a82621d7..e2ee8e694 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java @@ -45,11 +45,6 @@ public class EnderSignalController extends MobEntityController { } public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityEnderSignalNPC(World world) { @@ -66,6 +61,11 @@ public class EnderSignalController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java index 3c70d30c6..90e62f4c6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java @@ -31,11 +31,6 @@ public class ExperienceOrbController extends MobEntityController { } public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityExperienceOrbNPC(World world) { @@ -52,6 +47,11 @@ public class ExperienceOrbController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java index 75672cc67..05ead4cdd 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java @@ -48,11 +48,6 @@ public class FallingBlockController extends AbstractEntityController { } public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFallingBlockNPC(World world) { @@ -74,6 +69,11 @@ public class FallingBlockController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java index 48a1f9c96..a9e4b04cf 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java @@ -31,11 +31,6 @@ public class FireworkController extends MobEntityController { } public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFireworkNPC(World world) { @@ -52,6 +47,11 @@ public class FireworkController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java index 91d7a384d..a1dcd1e2f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java @@ -31,11 +31,6 @@ public class FishingHookController extends MobEntityController { } public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityFishingHookNPC(World world) { @@ -52,6 +47,11 @@ public class FishingHookController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java index 694c8c996..ca10ae1e9 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java @@ -43,11 +43,6 @@ public class ItemController extends AbstractEntityController { } public static class EntityItemNPC extends EntityItem implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemNPC(World world) { @@ -65,6 +60,11 @@ public class ItemController extends AbstractEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java index b074b6c06..c005525c3 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java @@ -44,11 +44,6 @@ public class ItemFrameController extends MobEntityController { } public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityItemFrameNPC(World world) { @@ -65,6 +60,11 @@ public class ItemFrameController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java index 46e30c787..9146de30b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java @@ -32,11 +32,6 @@ public class LargeFireballController extends MobEntityController { } public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLargeFireballNPC(World world) { @@ -53,6 +48,11 @@ public class LargeFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java index 097eb0608..e1bb63984 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java @@ -31,11 +31,6 @@ public class LeashController extends MobEntityController { } public static class EntityLeashNPC extends EntityLeash implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityLeashNPC(World world) { @@ -52,6 +47,11 @@ public class LeashController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java index 1c67ca639..01f5cc9ff 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java @@ -32,11 +32,6 @@ public class MinecartChestController extends MobEntityController { } public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartChestNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartChestController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java index 58d8ed28b..acdd43fa7 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java @@ -32,11 +32,6 @@ public class MinecartCommandController extends MobEntityController { } public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartCommandNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartCommandController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java index 4a6189f3d..92f0a6581 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java @@ -32,11 +32,6 @@ public class MinecartFurnaceController extends MobEntityController { } public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartFurnaceNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartFurnaceController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java index 00fb5ab43..deebc2bd6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java @@ -28,11 +28,6 @@ public class MinecartHopperController extends MobEntityController { } public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartHopperNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartHopperController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java index b0d834a4f..54b48b973 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java @@ -32,11 +32,6 @@ public class MinecartRideableController extends MobEntityController { } public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartRideableNPC(World world) { @@ -53,6 +48,11 @@ public class MinecartRideableController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java index eb950320f..cdc308fb9 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java @@ -28,11 +28,6 @@ public class MinecartSpawnerController extends MobEntityController { } public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartSpawnerNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartSpawnerController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java index f29a4c518..16ed10395 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java @@ -28,11 +28,6 @@ public class MinecartTNTController extends MobEntityController { } public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityMinecartTNTNPC(World world) { @@ -49,6 +44,11 @@ public class MinecartTNTController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java index 1f1f3ad47..bb6e66d96 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java @@ -31,11 +31,6 @@ public class PaintingController extends MobEntityController { } public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPaintingNPC(World world) { @@ -52,6 +47,11 @@ public class PaintingController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java index 8ba95824c..808fabb4e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java @@ -31,11 +31,6 @@ public class SmallFireballController extends MobEntityController { } public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySmallFireballNPC(World world) { @@ -52,6 +47,11 @@ public class SmallFireballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java index fd75c2380..9fbc14ba5 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java @@ -31,11 +31,6 @@ public class SnowballController extends MobEntityController { } public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntitySnowballNPC(World world) { @@ -52,6 +47,11 @@ public class SnowballController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java index 9e8c54332..d79e0a372 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java @@ -31,11 +31,6 @@ public class SplashPotionController extends MobEntityController { } public static class EntityPotionNPC extends EntityPotion implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityPotionNPC(World world) { @@ -52,6 +47,11 @@ public class SplashPotionController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java index 89c4eb077..d08176013 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java @@ -31,11 +31,6 @@ public class TNTPrimedController extends MobEntityController { } public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityTNTPrimedNPC(World world) { @@ -52,6 +47,11 @@ public class TNTPrimedController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java index 6ea6f4e4b..f4fd7a9d9 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java @@ -31,11 +31,6 @@ public class ThrownExpBottleController extends MobEntityController { } public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityThrownExpBottleNPC(World world) { @@ -52,6 +47,11 @@ public class ThrownExpBottleController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java index d6a599fce..7723e2c82 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java @@ -31,11 +31,6 @@ public class WitherSkullController extends MobEntityController { } public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { - @Override - public boolean a(EntityPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); - } - private final CitizensNPC npc; public EntityWitherSkullNPC(World world) { @@ -52,6 +47,11 @@ public class WitherSkullController extends MobEntityController { super.a(NMSBoundingBox.makeBB(npc, bb)); } + @Override + public boolean a(EntityPlayer player) { + return NMS.shouldBroadcastToPlayer(npc, () -> super.a(player)); + } + @Override public boolean aL() { return npc == null ? super.aL() : npc.isPushableByFluids(); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java index b9c227b7d..314913dea 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java @@ -435,12 +435,6 @@ public class NMSImpl implements NMSBridge { return handle.ba; } - @Override - public NPC getNPC(org.bukkit.entity.Entity entity) { - Entity handle = getHandle(entity); - return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; - } - @Override public EntityPacketTracker getPacketTracker(org.bukkit.entity.Entity entity) { WorldServer server = (WorldServer) NMSImpl.getHandle(entity).getWorld(); @@ -659,7 +653,7 @@ public class NMSImpl implements NMSBridge { Block block; try { block = (Block) GET_NMS_BLOCK.invoke(in); - } catch (Exception e) { + } catch (Throwable e) { return in.getType().isSolid(); } return block.w(); @@ -1759,13 +1753,13 @@ public class NMSImpl implements NMSBridge { private static final float DEFAULT_SPEED = 1F; public static final MethodHandle ENDERDRAGON_CHECK_WALLS = NMS .getFirstMethodHandleWithReturnType(EntityEnderDragon.class, true, boolean.class, AxisAlignedBB.class); - private static final Method ENTITY_ATTACK_A = NMS.getMethod(Entity.class, "a", true, EntityLiving.class, + private static final MethodHandle ENTITY_ATTACK_A = NMS.getMethodHandle(Entity.class, "a", true, EntityLiving.class, Entity.class); private static Map, Integer> ENTITY_CLASS_TO_INT; private static Map, String> ENTITY_CLASS_TO_NAME; private static final MethodHandle ENTITY_NAVIGATION = NMS.getFirstSetter(EntityInsentient.class, Navigation.class); private static final Location FROM_LOCATION = new Location(null, 0, 0, 0); - private static final Method GET_NMS_BLOCK = NMS.getMethod(CraftBlock.class, "getNMSBlock", false); + private static final MethodHandle GET_NMS_BLOCK = NMS.getMethodHandle(CraftBlock.class, "getNMSBlock", false); private static final Field GOAL_FIELD = NMS.getField(PathfinderGoalSelector.class, "b"); private static final Field JUMP_FIELD = NMS.getField(EntityLiving.class, "aY"); private static final MethodHandle LOOK_CONTROL_SETTER = NMS.getFirstSetter(EntityInsentient.class,