diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java index c44bc80e4..53c8c25b4 100644 --- a/main/src/main/java/net/citizensnpcs/Settings.java +++ b/main/src/main/java/net/citizensnpcs/Settings.java @@ -117,7 +117,7 @@ public class Settings { DEFAULT_LOOK_CLOSE("Enable look close by default", "npc.default.look-close.enabled", false), DEFAULT_LOOK_CLOSE_RANGE("Default look close range in blocks", "npc.default.look-close.range", 10), DEFAULT_NAME_HOLOGRAM_RENDERER( - "The default renderer for name holograms, must be one of the following:
interaction - matches inbuilt nametags most closely
display - allows for different colored backgrounds
display_vehicle - allows for different colored backgrounds
armorstand - the most stable option, very very small hit to client FPS compared to other options", + "The default renderer for name holograms, must be one of the following:
interaction - matches inbuilt nametags most closely
display - allows for different colored backgrounds
display_vehicle - allows for different colored backgrounds
armorstand - the most stable option, very very small hit to client FPS compared to other options
armorstand_vehicle - the most stable option, very very small hit to client FPS compared to other options", "npc.hologram.default-name-renderer", ""), DEFAULT_NPC_HOLOGRAM_LINE_HEIGHT("Default distance between hologram lines", "npc.hologram.default-line-height", 0.4D), diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java index b9d0d698e..e678a1be8 100644 --- a/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java +++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java @@ -26,7 +26,6 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPCRegistry; import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.util.Messages; -import net.citizensnpcs.util.Util; public class NPCCommandSelector extends NumericPrompt { private final Callback callback; @@ -114,7 +113,7 @@ public class NPCCommandSelector extends NumericPrompt { for (NPC test : npcRegistry) { if (test.getName().equalsIgnoreCase(name)) { if (range > 0 && test.isSpawned() - && !Util.locationWithinRange(args.getSenderLocation(), test.getEntity().getLocation(), range)) { + && args.getSenderLocation().distance(test.getEntity().getLocation()) > range) { continue; } possible.add(test); diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java index c18ecbe5b..cd921d503 100644 --- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java +++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java @@ -2347,7 +2347,7 @@ public class NPCCommands { max = 2, permission = "citizens.npc.panimate") @Requirements(selected = true, ownership = true, types = EntityType.PLAYER) - public void playerAnimate(CommandContext args, CommandSender sender, NPC npc, @Arg(1) PlayerAnimation animation) + public void playeranimate(CommandContext args, CommandSender sender, NPC npc, @Arg(1) PlayerAnimation animation) throws CommandException { if (animation == null) { Messaging.sendErrorTr(sender, Messages.UNKNOWN_PLAYER_ANIMATION, diff --git a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java index d18637b44..aeaa9cc2e 100644 --- a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java @@ -529,6 +529,13 @@ public class ShopTrait extends Trait { callback = consumer; } + private ItemStack editTitle(ItemStack item, Function transform) { + ItemMeta meta = item.getItemMeta(); + meta.setDisplayName(transform.apply(meta.hasDisplayName() ? meta.getDisplayName() : "")); + item.setItemMeta(meta); + return item; + } + @Override public void initialise(MenuContext ctx) { this.ctx = ctx; @@ -595,13 +602,13 @@ public class ShopTrait extends Trait { NPCShopAction oldCost = modified.cost.stream().filter(template::manages).findFirst().orElse(null); costItems.getSlots().get(pos) - .setItemStack(Util.editTitle(template.createMenuItem(oldCost), title -> title + " Cost")); + .setItemStack(editTitle(template.createMenuItem(oldCost), title -> title + " Cost")); costItems.getSlots().get(pos).setClickHandler(event -> ctx.getMenu().transition( template.createEditor(oldCost, cost -> modified.changeCost(template::manages, cost)))); NPCShopAction oldResult = modified.result.stream().filter(template::manages).findFirst().orElse(null); actionItems.getSlots().get(pos) - .setItemStack(Util.editTitle(template.createMenuItem(oldResult), title -> title + " Result")); + .setItemStack(editTitle(template.createMenuItem(oldResult), title -> title + " Result")); actionItems.getSlots().get(pos).setClickHandler(event -> ctx.getMenu().transition( template.createEditor(oldResult, result -> modified.changeResult(template::manages, result)))); diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java index 367fe7f15..1f95b75d5 100644 --- a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java +++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java @@ -625,8 +625,8 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider { } double margin = getNavigator().getLocalParameters().distanceMargin(); getNavigator().getLocalParameters().addSingleUseCallback(cancelReason -> { - if (npc.isSpawned() && currentDestination != null && Util.locationWithinRange(npc.getStoredLocation(), - currentDestination.getLocation(), margin + 1)) { + if (npc.isSpawned() && currentDestination != null + && npc.getStoredLocation().distance(currentDestination.getLocation()) <= margin + 1) { currentDestination.onReach(npc); if (cachePaths && cancelReason == null) { Iterable path = getNavigator().getPathStrategy().getPath(); diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java index 5496958a5..470e7aae2 100644 --- a/main/src/main/java/net/citizensnpcs/util/Util.java +++ b/main/src/main/java/net/citizensnpcs/util/Util.java @@ -12,7 +12,6 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.stream.Collectors; import org.bukkit.Bukkit; @@ -152,13 +151,6 @@ public class Util { return stack; } - public static ItemStack editTitle(ItemStack item, Function transform) { - ItemMeta meta = item.getItemMeta(); - meta.setDisplayName(transform.apply(meta.hasDisplayName() ? meta.getDisplayName() : "")); - item.setItemMeta(meta); - return item; - } - public static void face(Entity entity, float yaw, float pitch) { double pitchCos = Math.cos(Math.toRadians(pitch)); Vector vector = new Vector(Math.sin(Math.toRadians(yaw)) * -pitchCos, -Math.sin(Math.toRadians(pitch)), @@ -201,23 +193,6 @@ public class Util { return center; } - /** - * Returns the yaw to face along the given velocity (corrected for dragon yaw i.e. facing backwards) - */ - public static float getDragonYaw(Entity entity, double motX, double motZ) { - Location location = entity.getLocation(); - double x = location.getX(); - double z = location.getZ(); - double tX = x + motX; - double tZ = z + motZ; - if (z > tZ) - return (float) -Math.toDegrees(Math.atan((x - tX) / (z - tZ))); - if (z < tZ) - return (float) -Math.toDegrees(Math.atan((x - tX) / (z - tZ))) + 180.0F; - - return location.getYaw(); - } - public static Scoreboard getDummyScoreboard() { return DUMMY_SCOREBOARD; } @@ -279,6 +254,23 @@ public class Util { return "CIT-" + id.toString().replace("-", "").substring(0, 12); } + /** + * Returns the yaw to face along the given velocity (corrected for dragon yaw i.e. facing backwards) + */ + public static float getYawFromVelocity(Entity entity, double motX, double motZ) { + Location location = entity.getLocation(); + double x = location.getX(); + double z = location.getZ(); + double tX = x + motX; + double tZ = z + motZ; + if (z > tZ) + return (float) -Math.toDegrees(Math.atan((x - tX) / (z - tZ))); + if (z < tZ) + return (float) -Math.toDegrees(Math.atan((x - tX) / (z - tZ))) + 180.0F; + + return location.getYaw(); + } + public static boolean inBlock(Entity entity) { // TODO: bounding box aware? Location loc = entity.getLocation(); @@ -344,12 +336,6 @@ public class Util { return "" + Joiner.on(", ").join(values).replace('_', ' ').toLowerCase(Locale.US); } - public static boolean locationWithinRange(Location current, Location target, double range) { - if (current == null || target == null || (current.getWorld() != target.getWorld())) - return false; - return current.distance(target) <= range; - } - public static > T matchEnum(T[] values, String toMatch) { toMatch = toMatch.replace('-', '_').replace(' ', '_'); for (T check : values) { @@ -450,7 +436,7 @@ public class Util { String bungeeServer = split.size() == 2 && split.get(0).equalsIgnoreCase("server") ? split.get(1) : null; String cmd = command; if (command.startsWith("say")) { - cmd = "npc speak " + command.replaceFirst("say", "").trim() + " --target

"; + cmd = "npc speak \"" + command.replaceFirst("say", "").trim() + "\" --target

"; } if ((cmd.startsWith("npc ") || cmd.startsWith("waypoints ") || cmd.startsWith("wp ")) && !cmd.contains("--id ")) { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java index 9fe36ceca..cc71127fe 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java @@ -201,7 +201,7 @@ public class EnderDragonController extends MobEntityController { motY *= 0.98; motZ *= 0.98; if (getBukkitEntity().getPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ); + yaw = Util.getYawFromVelocity(getBukkitEntity(), motX, motZ); } setPosition(locX + motX, locY + motY, locZ + motZ); } diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index e0cdcae80..593786f32 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java @@ -830,7 +830,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle instanceof EntityEnderDragon) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java index 0704ae1c8..bc4e166f3 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java @@ -202,7 +202,7 @@ public class EnderDragonController extends MobEntityController { motY *= 0.98; motZ *= 0.98; if (getBukkitEntity().getPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ); + yaw = Util.getYawFromVelocity(getBukkitEntity(), motX, motZ); } setPosition(locX + motX, locY + motY, locZ + motZ); } diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java index 7b82b5b79..f519aa16a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java @@ -883,7 +883,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle instanceof EntityEnderDragon) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java index 2452dd837..357f140e1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java @@ -208,7 +208,7 @@ public class EnderDragonController extends MobEntityController { motY *= 0.98; motZ *= 0.98; if (getBukkitEntity().getPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ); + yaw = Util.getYawFromVelocity(getBukkitEntity(), motX, motZ); } setPosition(locX + motX, locY + motY, locZ + motZ); } diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java index 58afb413e..110401c1e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java @@ -888,7 +888,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle instanceof EntityEnderDragon) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java index 42afa5994..e90d53e2b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java @@ -229,7 +229,7 @@ public class EnderDragonController extends MobEntityController { motY *= 0.98; motZ *= 0.98; if (getBukkitEntity().getPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ); + yaw = Util.getYawFromVelocity(getBukkitEntity(), motX, motZ); } setPosition(locX + motX, locY + motY, locZ + motZ); } diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index f58beb7ba..dbf3f77b5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -924,7 +924,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle instanceof EntityEnderDragon) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java index a3a375a58..b693f829f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java @@ -222,7 +222,7 @@ public class EnderDragonController extends MobEntityController { if (mot.getX() != 0 || mot.getY() != 0 || mot.getZ() != 0) { mot = mot.d(0.98, 0.98, 0.98); if (getRidingPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z); + yaw = Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z); } setPosition(locX + mot.getX(), locY + mot.getY(), locZ + mot.getZ()); setMot(mot); diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index 0e0446eff..32fbc3a92 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -994,7 +994,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle instanceof EntityEnderDragon) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java index 7305b9593..0b944d5e9 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java @@ -217,7 +217,7 @@ public class EnderDragonController extends MobEntityController { if (mot.getX() != 0 || mot.getY() != 0 || mot.getZ() != 0) { mot = mot.d(0.98, 0.98, 0.98); if (getRidingPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z); + yaw = Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z); } setPosition(locX() + mot.getX(), locY() + mot.getY(), locZ() + mot.getZ()); setMot(mot); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index b05f21ac4..44ea6850f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -1011,7 +1011,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle instanceof EntityEnderDragon) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java index 3b04f077e..01f0297d3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java @@ -217,7 +217,7 @@ public class EnderDragonController extends MobEntityController { if (mot.getX() != 0 || mot.getY() != 0 || mot.getZ() != 0) { mot = mot.d(0.98, 0.98, 0.98); if (getRidingPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z); + yaw = Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z); } setPosition(locX() + mot.getX(), locY() + mot.getY(), locZ() + mot.getZ()); setMot(mot); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index 393f7748e..7ea57ff47 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -1041,7 +1041,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } 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 aa27cc7b2..3f7b22cee 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 @@ -104,7 +104,7 @@ public class EnderDragonController extends MobEntityController { if (mot.x != 0 || mot.y != 0 || mot.z != 0) { mot = mot.multiply(0.98, 0.98, 0.98); if (getFirstPassenger() == null) { - setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z)); + setYRot(Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z)); } setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z); setDeltaMovement(mot); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index e26a23abc..e034ce19a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -1049,7 +1049,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } 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 927fef8e5..25a4b7d10 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 @@ -106,7 +106,7 @@ public class EnderDragonController extends MobEntityController { if (mot.x != 0 || mot.y != 0 || mot.z != 0) { mot = mot.multiply(0.98, 0.98, 0.98); if (getFirstPassenger() == null) { - setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z)); + setYRot(Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z)); } setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z); setDeltaMovement(mot); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index d82e51d91..aa89070a2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -1058,7 +1058,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java index 21c2b8bf6..e5d726473 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java @@ -107,7 +107,7 @@ public class EnderDragonController extends MobEntityController { if (mot.x != 0 || mot.y != 0 || mot.z != 0) { mot = mot.multiply(0.98, 0.91, 0.98); if (getFirstPassenger() == null) { - setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z)); + setYRot(Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z)); } setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z); setDeltaMovement(mot); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java index 47be89f35..bd22f51e2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java @@ -1138,7 +1138,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java index deae5d04a..0bcba00d7 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EnderDragonController.java @@ -102,7 +102,7 @@ public class EnderDragonController extends MobEntityController { if (mot.x != 0 || mot.y != 0 || mot.z != 0) { mot = mot.multiply(0.98, 0.91, 0.98); if (getFirstPassenger() == null) { - setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z)); + setYRot(Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z)); } setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z); setDeltaMovement(mot); diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java index 7b2d7a394..0c3562fb8 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java @@ -1124,7 +1124,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java index 6bc952097..3173fbec4 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/EnderDragonController.java @@ -102,7 +102,7 @@ public class EnderDragonController extends MobEntityController { if (mot.x != 0 || mot.y != 0 || mot.z != 0) { mot = mot.multiply(0.98, 0.91, 0.98); if (getFirstPassenger() == null) { - setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z)); + setYRot(Util.getYawFromVelocity(getBukkitEntity(), mot.x, mot.z)); } setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z); setDeltaMovement(mot); diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java index 20e8e8287..d4f55602d 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java @@ -1102,7 +1102,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java index 4740fe0ae..b09755db4 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java @@ -188,7 +188,7 @@ public class EnderDragonController extends MobEntityController { motY *= 0.98; motZ *= 0.98; if (getBukkitEntity().getPassenger() == null) { - yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ); + yaw = Util.getYawFromVelocity(getBukkitEntity(), motX, motZ); } setPosition(locX + motX, locY + motY, locZ + motZ); } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java index f5e31fd0e..2d20172de 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java @@ -768,7 +768,7 @@ public class NMSImpl implements NMSBridge { yaw += Math.abs(180 - yaw) * 2; } if (handle instanceof EntityEnderDragon) { - yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff); + yaw = Util.getYawFromVelocity(handle.getBukkitEntity(), xDiff, zDiff); } else { yaw = yaw - 90; }