diff --git a/main/pom.xml b/main/pom.xml index 67f7e720e..16d1e558a 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -143,7 +143,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package @@ -179,10 +179,11 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.4.0 - 8 + 11 false + false none https://hub.spigotmc.org/javadocs/spigot diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java index baa04a66d..727ec340a 100644 --- a/main/src/main/java/net/citizensnpcs/Citizens.java +++ b/main/src/main/java/net/citizensnpcs/Citizens.java @@ -312,8 +312,9 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { @Override public void onDisable() { - if (!enabled) + if (!enabled) { return; + } Bukkit.getPluginManager().callEvent(new CitizensDisableEvent()); Editor.leaveAll(); despawnNPCs(saveOnDisable); diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml index 422001690..eb746c79b 100644 --- a/v1_10_R1/pom.xml +++ b/v1_10_R1/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml index a6f1a2a1f..6ea09f694 100644 --- a/v1_11_R1/pom.xml +++ b/v1_11_R1/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml index 061a7f614..83e099f12 100644 --- a/v1_12_R1/pom.xml +++ b/v1_12_R1/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml index d3b0718aa..4bb982597 100644 --- a/v1_13_R2/pom.xml +++ b/v1_13_R2/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml index 7c1071ddd..31a15061a 100644 --- a/v1_14_R1/pom.xml +++ b/v1_14_R1/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package diff --git a/v1_15_R1/pom.xml b/v1_15_R1/pom.xml index 317592e79..fc6d774e5 100644 --- a/v1_15_R1/pom.xml +++ b/v1_15_R1/pom.xml @@ -45,7 +45,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -61,7 +61,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package diff --git a/v1_16_R3/pom.xml b/v1_16_R3/pom.xml index 4032800aa..19ba18d6f 100644 --- a/v1_16_R3/pom.xml +++ b/v1_16_R3/pom.xml @@ -45,7 +45,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -61,7 +61,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package diff --git a/v1_17_R1/pom.xml b/v1_17_R1/pom.xml index 9e88975c4..731a62eba 100644 --- a/v1_17_R1/pom.xml +++ b/v1_17_R1/pom.xml @@ -46,7 +46,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -96,7 +96,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package 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 8a7dbcc8f..c63b68ae5 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 @@ -65,7 +65,6 @@ public class AxolotlController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); this.getAttribute(Attributes.MOVEMENT_SPEED) 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 0819f8a15..38b6f7104 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 @@ -50,7 +50,6 @@ public class BatController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setFlying(false); } } 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 fa44f4438..283986aa1 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 @@ -49,9 +49,6 @@ public class BeeController extends MobEntityController { public EntityBeeNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java index 3d28c3cc1..bd8021284 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 @@ -49,9 +49,6 @@ public class BlazeController extends MobEntityController { public EntityBlazeNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java index 1895ac4c4..28d2d2ab3 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 @@ -54,9 +54,6 @@ public class CatController extends MobEntityController { public EntityCatNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java index 734810890..e63f96a86 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 @@ -52,9 +52,6 @@ public class CaveSpiderController extends MobEntityController { public EntityCaveSpiderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java index ab8198243..2351d8385 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 @@ -54,9 +54,6 @@ public class ChickenController extends MobEntityController { public EntityChickenNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java index 61c50b17f..68d9d89dd 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 @@ -61,7 +61,6 @@ public class CodController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 fb76663b4..c61365e2b 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 @@ -59,9 +59,6 @@ public class CowController extends MobEntityController { public EntityCowNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java index 11ce937de..a5d694837 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 @@ -55,9 +55,6 @@ public class CreeperController extends MobEntityController { public EntityCreeperNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java index d5d4c010e..e0880f27d 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 @@ -57,7 +57,6 @@ public class DolphinController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); this.getAttribute(Attributes.MOVEMENT_SPEED) 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 4da2d0382..9260fb985 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 @@ -52,9 +52,6 @@ public class DrownedController extends MobEntityController { public EntityDrownedNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java index fea1ef40f..424b108a9 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 @@ -50,9 +50,6 @@ public class EnderDragonController extends MobEntityController { public EntityEnderDragonNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java index a6378485b..b83641dc1 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 @@ -55,9 +55,6 @@ public class EndermanController extends MobEntityController { public EntityEndermanNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java index 940dc38a1..6cdb183d7 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 @@ -52,9 +52,6 @@ public class EndermiteController extends MobEntityController { public EntityEndermiteNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java index a8ef0b8a2..9eed81339 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 @@ -46,9 +46,6 @@ public class EvokerController extends MobEntityController { public EntityEvokerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java index fd2109065..d1fbc8437 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 @@ -48,9 +48,6 @@ public class FoxController extends MobEntityController { public EntityFoxNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java index 6b63b7892..c238eaf1a 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 @@ -43,9 +43,6 @@ public class GhastController extends MobEntityController { public EntityGhastNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java index ddd31d8c2..38bb0ed0b 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 @@ -46,9 +46,6 @@ public class GiantController extends MobEntityController { public EntityGiantNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java index 3aea55543..9670542d9 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 @@ -46,9 +46,6 @@ public class GlowSquidController extends MobEntityController { public EntityGlowSquidNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java index d618ad264..d1feb2f07 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 @@ -48,9 +48,6 @@ public class GoatController extends MobEntityController { public EntityGoatNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java index 320ec5070..4f71c1510 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 @@ -46,9 +46,6 @@ public class GuardianController extends MobEntityController { public EntityGuardianNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java index bb140d3c6..28355bc4e 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 @@ -46,9 +46,6 @@ public class GuardianElderController extends MobEntityController { public EntityGuardianElderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java index dcae5dcc1..b75d65823 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 @@ -46,9 +46,6 @@ public class HoglinController extends MobEntityController { public EntityHoglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java index 45767b7d7..f50b70fb4 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 @@ -62,7 +62,6 @@ public class HorseController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); org.bukkit.entity.Horse horse = (org.bukkit.entity.Horse) getBukkitEntity(); horse.setDomestication(horse.getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 2f2e8b012..310bddfd8 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 @@ -62,7 +62,6 @@ public class HorseDonkeyController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Donkey) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Donkey) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 d9c9849c9..2078a0d85 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 @@ -62,7 +62,6 @@ public class HorseMuleController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Mule) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Mule) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 1708e9187..61cd8d23d 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 @@ -62,7 +62,6 @@ public class HorseSkeletonController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.SkeletonHorse) getBukkitEntity()) .setDomestication(((org.bukkit.entity.SkeletonHorse) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 f56b77513..990918b80 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 @@ -62,7 +62,6 @@ public class HorseZombieController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.ZombieHorse) getBukkitEntity()) .setDomestication(((org.bukkit.entity.ZombieHorse) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 9e3131481..f1fc274a9 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 @@ -46,9 +46,6 @@ public class IllusionerController extends MobEntityController { public EntityIllusionerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java index 4e8fb04ac..51903188e 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 @@ -46,9 +46,6 @@ public class IronGolemController extends MobEntityController { public EntityIronGolemNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java index 34d11002f..7f9cab9e7 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 @@ -58,7 +58,6 @@ public class LlamaController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Llama) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Llama) getBukkitEntity()).getMaxDomestication()); } 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 14361db3b..a8b94c553 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 @@ -52,7 +52,6 @@ public class MagmaCubeController extends MobEntityController { this.npc = (CitizensNPC) npc; if (npc != null) { setSize(3, true); - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new PlayerMoveControl(this); } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java index 191b1aaab..39c51031a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java @@ -15,6 +15,7 @@ import net.citizensnpcs.nms.v1_17_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.Util; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.Mob; import net.minecraft.world.level.Level; public abstract class MobEntityController extends AbstractEntityController { @@ -31,7 +32,9 @@ public abstract class MobEntityController extends AbstractEntityController { net.minecraft.world.entity.Entity entity = createEntityFromClass(type, ((CraftWorld) at.getWorld()).getHandle(), npc); entity.absMoveTo(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); - + if (entity instanceof Mob) { + NMSImpl.clearGoals(npc, ((Mob) entity).goalSelector, ((Mob) entity).targetSelector); + } // entity.onGround isn't updated right away - we approximate here so // that things like pathfinding still work *immediately* after spawn. org.bukkit.Material beneath = at.getBlock().getRelative(BlockFace.DOWN).getType(); 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 fb5fd121c..cec6598da 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 @@ -51,9 +51,6 @@ public class MushroomCowController extends MobEntityController { public EntityMushroomCowNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java index e3be772bc..74c42b168 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 @@ -49,9 +49,6 @@ public class OcelotController extends MobEntityController { public EntityOcelotNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java index ea275d205..a5570b820 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 @@ -48,9 +48,6 @@ public class PandaController extends MobEntityController { public EntityPandaNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java index 68269cac0..7dd124968 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 @@ -46,9 +46,6 @@ public class ParrotController extends MobEntityController { public EntityParrotNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java index bebdba3a7..fdf6a85fa 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 @@ -56,7 +56,6 @@ public class PhantomController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setNoAi(true); this.oldMoveController = this.moveControl; this.oldLookController = this.lookControl; 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 af1cf0736..3fc62b0db 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 @@ -50,9 +50,6 @@ public class PigController extends MobEntityController { public EntityPigNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java index 2aa7e6e73..eb9ed36fc 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 @@ -47,9 +47,6 @@ public class PigZombieController extends MobEntityController { public EntityPigZombieNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java index edfa47a8e..7e8c1835c 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 @@ -1,7 +1,5 @@ package net.citizensnpcs.nms.v1_17_R1.entity; -import java.util.TreeMap; - import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_17_R1.CraftServer; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity; @@ -39,7 +37,6 @@ public class PiglinBruteController extends MobEntityController { } public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder { - private TreeMap behaviorMap; private final CitizensNPC npc; public EntityPiglinBruteNPC(EntityType types, Level level) { @@ -49,9 +46,6 @@ public class PiglinBruteController extends MobEntityController { public EntityPiglinBruteNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java index 891f4c288..5b55c336f 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 @@ -46,9 +46,6 @@ public class PiglinController extends MobEntityController { public EntityPiglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java index 274d91134..d7473995d 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 @@ -48,9 +48,6 @@ public class PillagerController extends MobEntityController { public EntityPillagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java index e43b58e1b..c50611559 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 @@ -45,9 +45,6 @@ public class PolarBearController extends MobEntityController { public EntityPolarBearNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java index f1d465c61..2fd9c6d45 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 @@ -24,7 +24,6 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MoverType; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.ai.control.MoveControl; import net.minecraft.world.entity.animal.Pufferfish; @@ -59,7 +58,6 @@ public class PufferFishController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 2dec50dc0..f39657b03 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 @@ -51,9 +51,6 @@ public class RabbitController extends MobEntityController { public EntityRabbitNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java index ebf80d185..3eee23e48 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 @@ -48,9 +48,6 @@ public class RavagerController extends MobEntityController { public EntityRavagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java index e180aebdb..21d262388 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 @@ -55,7 +55,6 @@ public class SalmonController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 883ba8685..55afcc557 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 @@ -49,9 +49,6 @@ public class SheepController extends MobEntityController { public EntitySheepNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java index 711b8bd3c..36936ab9a 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 @@ -47,9 +47,6 @@ public class ShulkerController extends MobEntityController { public EntityShulkerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java index a53376b43..1eac457d8 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 @@ -46,9 +46,6 @@ public class SilverfishController extends MobEntityController { public EntitySilverfishNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override 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 e7ad22a67..2cf089dd9 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 @@ -46,9 +46,6 @@ public class SkeletonController extends MobEntityController { public EntitySkeletonNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java index 154e2c8d2..faf343f17 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 @@ -46,9 +46,6 @@ public class SkeletonStrayController extends MobEntityController { public EntityStrayNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java index 1e938dcd8..d91c1cb7c 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 @@ -46,9 +46,6 @@ public class SkeletonWitherController extends MobEntityController { public EntitySkeletonWitherNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java index cee80a3dc..8dcec4ade 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 @@ -52,7 +52,6 @@ public class SlimeController extends MobEntityController { this.npc = (CitizensNPC) npc; if (npc != null) { setSize(3, true); - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new PlayerMoveControl(this); } 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 d39f4ef8d..f9bc42ce9 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 @@ -47,9 +47,6 @@ public class SnowmanController extends MobEntityController { public EntitySnowmanNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java index 0abb71b8b..13c88457d 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 @@ -46,9 +46,6 @@ public class SpiderController extends MobEntityController { public EntitySpiderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java index 1573db8ca..4a89e319e 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 @@ -46,9 +46,6 @@ public class SquidController extends MobEntityController { public EntitySquidNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java index 644d67e27..548f2fcfb 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 @@ -46,9 +46,6 @@ public class StriderController extends MobEntityController { public EntityStriderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java index 5f6e3ff64..ee6f7ae90 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 @@ -58,7 +58,6 @@ public class TraderLlamaController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.TraderLlama) getBukkitEntity()) .setDomestication(((org.bukkit.entity.TraderLlama) getBukkitEntity()).getMaxDomestication()); } 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 7aaaed56a..fff7b4b11 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 @@ -55,7 +55,6 @@ public class TropicalFishController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 abefbc083..cfe4876df 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 @@ -53,7 +53,6 @@ public class TurtleController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.oldJumpController = this.jumpControl; this.moveControl = new MoveControl(this); 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 261b21965..e4cb8072e 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 @@ -44,7 +44,6 @@ public class VexController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setNoGravity(true); } } 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 cd419a751..7d9a2dca8 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 @@ -57,7 +57,6 @@ public class VillagerController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.3); } } 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 3b2df2a7f..8dae8df16 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 @@ -49,9 +49,6 @@ public class VindicatorController extends MobEntityController { public EntityVindicatorNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java index b9f2f9199..af78046f2 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 @@ -56,9 +56,6 @@ public class WanderingTraderController extends MobEntityController { public EntityWanderingTraderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java index 0b5f93c1f..f600f74f1 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 @@ -46,9 +46,6 @@ public class WitchController extends MobEntityController { public EntityWitchNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java index 74d85b79e..21ca2878a 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 @@ -43,9 +43,6 @@ public class WitherController extends MobEntityController { public EntityWitherNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java index e903bea55..64c42e3b1 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 @@ -50,9 +50,6 @@ public class WolfController extends MobEntityController { public EntityWolfNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java index d20cb0552..b807684e0 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 @@ -46,9 +46,6 @@ public class ZoglinController extends MobEntityController { public EntityZoglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java index de0dd2ee1..6f0bc9144 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 @@ -46,9 +46,6 @@ public class ZombieController extends MobEntityController { public EntityZombieNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java index 4bfc7a752..c6be62b78 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 @@ -46,9 +46,6 @@ public class ZombieHuskController extends MobEntityController { public EntityZombieHuskNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java index 1e8a010c8..1c08ad5b2 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 @@ -46,9 +46,6 @@ public class ZombieVillagerController extends MobEntityController { public EntityZombieVillagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/pom.xml b/v1_18_R2/pom.xml index 82361a0b3..b200f6a52 100644 --- a/v1_18_R2/pom.xml +++ b/v1_18_R2/pom.xml @@ -46,7 +46,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -96,7 +96,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package 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 0aef44d8d..5555c9533 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 @@ -65,7 +65,6 @@ public class AxolotlController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); this.getAttribute(Attributes.MOVEMENT_SPEED) 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 52423a01e..222f06db1 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 @@ -52,7 +52,6 @@ public class BatController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setFlying(false); } } 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 20bc29012..2dc8a38a1 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 @@ -51,9 +51,6 @@ public class BeeController extends MobEntityController { public EntityBeeNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java index 2852e761a..cac714824 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 @@ -51,9 +51,6 @@ public class BlazeController extends MobEntityController { public EntityBlazeNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java index c3b217c92..e8857ccc8 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 @@ -55,9 +55,6 @@ public class CatController extends MobEntityController { public EntityCatNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java index 0fd10e8bd..efb1c786e 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 @@ -53,9 +53,6 @@ public class CaveSpiderController extends MobEntityController { public EntityCaveSpiderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java index 4040b2cd0..3ef6d5f4e 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 @@ -55,9 +55,6 @@ public class ChickenController extends MobEntityController { public EntityChickenNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java index 735ca4e78..b4909fdec 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 @@ -62,7 +62,6 @@ public class CodController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 9b3a0122d..48ec8d00c 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 @@ -60,9 +60,6 @@ public class CowController extends MobEntityController { public EntityCowNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java index 06108d634..7a8c13a3b 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 @@ -55,9 +55,6 @@ public class CreeperController extends MobEntityController { public EntityCreeperNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java index 15c030ef3..f74fa9ca9 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 @@ -57,7 +57,6 @@ public class DolphinController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); this.getAttribute(Attributes.MOVEMENT_SPEED) 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 69229d265..36a1e819d 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 @@ -53,9 +53,6 @@ public class DrownedController extends MobEntityController { public EntityDrownedNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java index 4d811e2b9..415b59b44 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 @@ -52,9 +52,6 @@ public class EnderDragonController extends MobEntityController { public EntityEnderDragonNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java index f4d90fa86..6408c2e54 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 @@ -56,9 +56,6 @@ public class EndermanController extends MobEntityController { public EntityEndermanNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java index aa225d494..6fc30003b 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 @@ -53,9 +53,6 @@ public class EndermiteController extends MobEntityController { public EntityEndermiteNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java index 880cec718..50078f024 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 @@ -47,9 +47,6 @@ public class EvokerController extends MobEntityController { public EntityEvokerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java index 440679ca7..3e5961fc7 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 @@ -49,9 +49,6 @@ public class FoxController extends MobEntityController { public EntityFoxNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java index 46746fc33..8caa0df00 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 @@ -45,9 +45,6 @@ public class GhastController extends MobEntityController { public EntityGhastNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java index b699b9d7a..dc5ec66bd 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 @@ -47,9 +47,6 @@ public class GiantController extends MobEntityController { public EntityGiantNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java index 159b8f665..0467283ed 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 @@ -47,9 +47,6 @@ public class GlowSquidController extends MobEntityController { public EntityGlowSquidNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java index 7f74087d8..d563cc9f5 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 @@ -49,9 +49,6 @@ public class GoatController extends MobEntityController { public EntityGoatNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java index 4ceace904..3e3d53de2 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 @@ -47,9 +47,6 @@ public class GuardianController extends MobEntityController { public EntityGuardianNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java index 979d37c23..512955f24 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 @@ -47,9 +47,6 @@ public class GuardianElderController extends MobEntityController { public EntityGuardianElderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java index 72485c431..5eec3828d 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 @@ -47,9 +47,6 @@ public class HoglinController extends MobEntityController { public EntityHoglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java index d427f7b1d..37abb47e9 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 @@ -63,7 +63,6 @@ public class HorseController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); org.bukkit.entity.Horse horse = (org.bukkit.entity.Horse) getBukkitEntity(); horse.setDomestication(horse.getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 eb8acf68e..bbdc5b04d 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 @@ -63,7 +63,6 @@ public class HorseDonkeyController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Donkey) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Donkey) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 fcfcdb682..041b57333 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 @@ -63,7 +63,6 @@ public class HorseMuleController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Mule) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Mule) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 e57798a53..5560154cd 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 @@ -63,7 +63,6 @@ public class HorseSkeletonController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.SkeletonHorse) getBukkitEntity()) .setDomestication(((org.bukkit.entity.SkeletonHorse) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 45a6773cc..02e40e058 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 @@ -63,7 +63,6 @@ public class HorseZombieController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.ZombieHorse) getBukkitEntity()) .setDomestication(((org.bukkit.entity.ZombieHorse) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); 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 ec1eed6df..e52d3a4b9 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 @@ -47,9 +47,6 @@ public class IllusionerController extends MobEntityController { public EntityIllusionerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java index 3df04212e..5032e82cd 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 @@ -47,9 +47,6 @@ public class IronGolemController extends MobEntityController { public EntityIronGolemNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java index 4290539f8..8517661bc 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 @@ -59,7 +59,6 @@ public class LlamaController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Llama) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Llama) getBukkitEntity()).getMaxDomestication()); } 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 7f327dfee..a0d0310e3 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 @@ -53,7 +53,6 @@ public class MagmaCubeController extends MobEntityController { this.npc = (CitizensNPC) npc; if (npc != null) { setSize(3, true); - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new PlayerMoveControl(this); } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java index e0e1d8e97..89a95956d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java @@ -15,6 +15,7 @@ import net.citizensnpcs.nms.v1_18_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.Util; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.Mob; import net.minecraft.world.level.Level; public abstract class MobEntityController extends AbstractEntityController { @@ -30,6 +31,9 @@ public abstract class MobEntityController extends AbstractEntityController { EntityType type = NMSImpl.getEntityType(clazz); net.minecraft.world.entity.Entity entity = createEntityFromClass(type, ((CraftWorld) at.getWorld()).getHandle(), npc); + if (entity instanceof Mob) { + NMSImpl.clearGoals(npc, ((Mob) entity).goalSelector, ((Mob) entity).targetSelector); + } entity.absMoveTo(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); // entity.onGround isn't updated right away - we approximate here so 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 9768f2432..c301345a9 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 @@ -52,9 +52,6 @@ public class MushroomCowController extends MobEntityController { public EntityMushroomCowNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java index 5616b7f69..44e39f7fa 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 @@ -50,9 +50,6 @@ public class OcelotController extends MobEntityController { public EntityOcelotNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java index dbbfc2620..3cf4913e8 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 @@ -49,9 +49,6 @@ public class PandaController extends MobEntityController { public EntityPandaNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java index 37aa48900..e8153b856 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 @@ -48,9 +48,6 @@ public class ParrotController extends MobEntityController { public EntityParrotNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java index 8a9f9f91f..2a15b1c70 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 @@ -57,7 +57,6 @@ public class PhantomController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setNoAi(true); this.oldMoveController = this.moveControl; this.oldLookController = this.lookControl; 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 9b920e2a9..5f60b93cf 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 @@ -50,9 +50,6 @@ public class PigController extends MobEntityController { public EntityPigNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java index 564891e64..6a202db7d 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 @@ -48,9 +48,6 @@ public class PigZombieController extends MobEntityController { public EntityPigZombieNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java index aaf6c1fee..3c2a3a0f7 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 @@ -47,9 +47,6 @@ public class PiglinBruteController extends MobEntityController { public EntityPiglinBruteNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java index c3d57d4f3..c510fb2ff 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 @@ -47,9 +47,6 @@ public class PiglinController extends MobEntityController { public EntityPiglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java index 2b9fca167..876ca7634 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 @@ -49,9 +49,6 @@ public class PillagerController extends MobEntityController { public EntityPillagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java index 55a8892a2..817849928 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 @@ -47,9 +47,6 @@ public class PolarBearController extends MobEntityController { public EntityPolarBearNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java index 30dcab892..6a376d3e9 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 @@ -59,7 +59,6 @@ public class PufferFishController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 8e83ce2c1..25ebc5a1e 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 @@ -51,9 +51,6 @@ public class RabbitController extends MobEntityController { public EntityRabbitNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java index 57e98fea0..b0274adf6 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 @@ -49,9 +49,6 @@ public class RavagerController extends MobEntityController { public EntityRavagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java index 8e50fe838..b8960f6a7 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 @@ -56,7 +56,6 @@ public class SalmonController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 fc4071c58..5e02c6365 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 @@ -49,9 +49,6 @@ public class SheepController extends MobEntityController { public EntitySheepNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java index 815e2a247..9a42f8d9c 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 @@ -48,9 +48,6 @@ public class ShulkerController extends MobEntityController { public EntityShulkerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java index 0ec51be20..3a5986021 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 @@ -47,9 +47,6 @@ public class SilverfishController extends MobEntityController { public EntitySilverfishNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override 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 ac9fe79cd..4376b5209 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 @@ -47,9 +47,6 @@ public class SkeletonController extends MobEntityController { public EntitySkeletonNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java index 2c00091c6..4ac9d8238 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 @@ -47,9 +47,6 @@ public class SkeletonStrayController extends MobEntityController { public EntityStrayNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java index 97253fbfb..e42345bf1 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 @@ -47,9 +47,6 @@ public class SkeletonWitherController extends MobEntityController { public EntitySkeletonWitherNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java index 02287c024..cfa63dc49 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 @@ -53,7 +53,6 @@ public class SlimeController extends MobEntityController { this.npc = (CitizensNPC) npc; if (npc != null) { setSize(3, true); - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new PlayerMoveControl(this); } 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 c52e13f8b..3cc79b4af 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 @@ -48,9 +48,6 @@ public class SnowmanController extends MobEntityController { public EntitySnowmanNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java index 0023c7fee..b0aa6de6b 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 @@ -47,9 +47,6 @@ public class SpiderController extends MobEntityController { public EntitySpiderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java index 39211b70a..fa88015d4 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 @@ -47,9 +47,6 @@ public class SquidController extends MobEntityController { public EntitySquidNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java index c70c092b8..ea9541e6b 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 @@ -47,9 +47,6 @@ public class StriderController extends MobEntityController { public EntityStriderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java index c7a99da84..47b68a096 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 @@ -59,7 +59,6 @@ public class TraderLlamaController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.TraderLlama) getBukkitEntity()) .setDomestication(((org.bukkit.entity.TraderLlama) getBukkitEntity()).getMaxDomestication()); } 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 bc77392b1..eae57269e 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 @@ -56,7 +56,6 @@ public class TropicalFishController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } 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 bef923dda..980344837 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 @@ -54,7 +54,6 @@ public class TurtleController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.oldJumpController = this.jumpControl; this.moveControl = new MoveControl(this); 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 80a640680..c4e31a2cc 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 @@ -46,7 +46,6 @@ public class VexController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setNoGravity(true); } } 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 468f46251..d2ca2e85a 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 @@ -57,7 +57,6 @@ public class VillagerController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.3); } } 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 fbd57fabd..1c422b544 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 @@ -49,9 +49,6 @@ public class VindicatorController extends MobEntityController { public EntityVindicatorNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java index 62fd66930..d599819be 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 @@ -56,9 +56,6 @@ public class WanderingTraderController extends MobEntityController { public EntityWanderingTraderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java index 2c4f62a35..7eac1b5ed 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 @@ -47,9 +47,6 @@ public class WitchController extends MobEntityController { public EntityWitchNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java index 1de842593..761d49d7e 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 @@ -45,9 +45,6 @@ public class WitherController extends MobEntityController { public EntityWitherNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java index 57d28f19b..0f765dd37 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 @@ -51,9 +51,6 @@ public class WolfController extends MobEntityController { public EntityWolfNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java index e77be5cac..181cdd85a 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 @@ -47,9 +47,6 @@ public class ZoglinController extends MobEntityController { public EntityZoglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java index f42409110..dc87f8f72 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 @@ -47,9 +47,6 @@ public class ZombieController extends MobEntityController { public EntityZombieNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java index 2fd45cbac..dd8c78e46 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 @@ -47,9 +47,6 @@ public class ZombieHuskController extends MobEntityController { public EntityZombieHuskNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java index 2c08cedf6..1144ee5f6 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 @@ -47,9 +47,6 @@ public class ZombieVillagerController extends MobEntityController { public EntityZombieVillagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java index 746b4da04..570a5ce2f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java @@ -86,6 +86,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable private final CitizensNPC npc; private final Location packetLocationCache = new Location(null, 0, 0, 0); private PlayerlistTracker playerlistTracker; + private boolean setBukkitEntity; private final SkinPacketTracker skinTracker; private EmptyServerStatsCounter statsCache; private int updateCounter = 0; @@ -213,8 +214,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public CraftPlayer getBukkitEntity() { - if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { + if (npc != null && !setBukkitEntity) { NMSImpl.setBukkitEntity(this, new PlayerNPC(this)); + setBukkitEntity = true; } return super.getBukkitEntity(); } @@ -520,13 +522,11 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable } public static class PlayerNPC extends CraftPlayer implements NPCHolder, SkinnableEntity { - private final CraftServer cserver; private final CitizensNPC npc; private PlayerNPC(EntityHumanNPC entity) { super((CraftServer) Bukkit.getServer(), entity); this.npc = entity.npc; - this.cserver = (CraftServer) Bukkit.getServer(); npc.getOrAddTrait(Inventory.class); } @@ -550,7 +550,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public List getMetadata(String metadataKey) { - return cserver.getEntityMetadata().getMetadata(this, metadataKey); + return ((CraftServer) Bukkit.getServer()).getEntityMetadata().getMetadata(this, metadataKey); } @Override @@ -570,17 +570,17 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public boolean hasMetadata(String metadataKey) { - return cserver.getEntityMetadata().hasMetadata(this, metadataKey); + return ((CraftServer) Bukkit.getServer()).getEntityMetadata().hasMetadata(this, metadataKey); } @Override public void removeMetadata(String metadataKey, Plugin owningPlugin) { - cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); + ((CraftServer) Bukkit.getServer()).getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { - cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); + ((CraftServer) Bukkit.getServer()).getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); } @Override diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index 24554042d..bf5541ef4 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.7 1.7 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.3.0 package