From 73689cf9c269493c8507e4953729a74e01ce442f Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 7 Nov 2022 23:30:39 +0800 Subject: [PATCH] Widen navigating definition --- .../citizensnpcs/trait/waypoint/WanderWaypointProvider.java | 3 +-- .../net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java | 2 +- .../net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java index 5732d529e..e4ba2e073 100644 --- a/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java +++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java @@ -306,9 +306,8 @@ public class WanderWaypointProvider public void onSpawn(NPC npc) { this.npc = npc; if (currentGoal == null) { - currentGoal = WanderGoal.builder(npc).xrange(xrange).yrange(yrange).fallback(this).tree(this) + currentGoal = WanderGoal.builder(npc).xrange(xrange).yrange(yrange).fallback(this).tree(this).delay(delay) .worldguardRegion(getWorldGuardRegion()).build(); - currentGoal.setDelay(delay); } Iterator itr = npc.getDefaultGoalController().iterator(); while (itr.hasNext()) { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java index 83cecbe46..5323848f2 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java @@ -290,7 +290,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable return; } super.U(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.a(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java index da3110906..f69587365 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java @@ -122,7 +122,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.a(); updatePackets(navigating); npc.update(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java index a321ad772..99b405a9e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java @@ -135,7 +135,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b(); updatePackets(navigating); npc.update(); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java index b2e077ade..934e885ea 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java @@ -355,7 +355,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable return; } W(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java index e774fd91d..285b8aa46 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java @@ -359,7 +359,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable return; } entityBaseTick(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java index 5f6f59611..45c4ec530 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java @@ -359,7 +359,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable return; } entityBaseTick(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java index 1d13988a8..2d1840264 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java @@ -389,7 +389,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable return; } entityBaseTick(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java index 05e214c3e..01fc23bc9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java @@ -169,7 +169,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable return; } super.baseTick(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.hasWanted(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java index ffac751c0..fb72602eb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java @@ -170,7 +170,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable return; } super.baseTick(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.hasWanted(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) 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 570a5ce2f..ce2a467cb 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 @@ -173,7 +173,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable return; } super.baseTick(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.hasWanted(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java index ac9cb5e5c..f62cdb989 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java @@ -291,7 +291,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } super.K(); - boolean navigating = npc.getNavigator().isNavigating(); + boolean navigating = npc.getNavigator().isNavigating() || controllerMove.a(); if (!navigating && getBukkitEntity() != null && (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity()) && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION))