diff --git a/src/main/java/emu/grasscutter/command/CommandHelpers.java b/src/main/java/emu/grasscutter/command/CommandHelpers.java index d53854667..9f09c785f 100644 --- a/src/main/java/emu/grasscutter/command/CommandHelpers.java +++ b/src/main/java/emu/grasscutter/command/CommandHelpers.java @@ -1,7 +1,6 @@ package emu.grasscutter.command; import emu.grasscutter.game.world.Position; - import java.util.*; import java.util.function.BiConsumer; import java.util.regex.*; @@ -68,7 +67,8 @@ public class CommandHelpers { return current; } - public static Position parsePosition(String inputX, String inputY, String inputZ, Position curPos, Position curRot) { + public static Position parsePosition( + String inputX, String inputY, String inputZ, Position curPos, Position curRot) { Position offset = new Position(); Position target = new Position(curPos); if (inputX.contains("~")) { // Relative @@ -121,8 +121,12 @@ public class CommandHelpers { // Calculate offset based on current position and rotation return new Position( - pos.getX() + offset.getZ() * (float)Math.sin(angleZ) + offset.getX() * (float)Math.sin(angleX), - pos.getY() + offset.getY(), - pos.getZ() + offset.getZ() * (float)Math.cos(angleZ) + offset.getX() * (float)Math.cos(angleX)); + pos.getX() + + offset.getZ() * (float) Math.sin(angleZ) + + offset.getX() * (float) Math.sin(angleX), + pos.getY() + offset.getY(), + pos.getZ() + + offset.getZ() * (float) Math.cos(angleZ) + + offset.getX() * (float) Math.cos(angleX)); } } diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java index 8d615f245..fddd1c20b 100644 --- a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java @@ -6,8 +6,6 @@ import emu.grasscutter.command.*; import emu.grasscutter.game.player.Player; import emu.grasscutter.game.world.Position; import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType; -import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify; - import java.util.List; @Command( @@ -54,11 +52,15 @@ public final class TeleportCommand implements CommandHandler { CommandHandler.sendMessage(sender, translate(sender, "commands.teleport.exists_error")); } else { CommandHandler.sendMessage( - sender, - translate( sender, - "commands.teleport.success", - targetPlayer.getNickname(), pos.getX(), pos.getY(), pos.getZ(), sceneId)); + translate( + sender, + "commands.teleport.success", + targetPlayer.getNickname(), + pos.getX(), + pos.getY(), + pos.getZ(), + sceneId)); } } }