Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 13:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions 2023-09-18 01:03:02 +00:00
parent 43db7eba8f
commit 7f5059cb8f
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/emu/grasscutter/command/CommandHelpers.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.command; package emu.grasscutter.command;
import emu.grasscutter.game.world.Position; import emu.grasscutter.game.world.Position;
import java.util.*; import java.util.*;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.regex.*; import java.util.regex.*;
@ -68,7 +67,8 @@ public class CommandHelpers {
return current; 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 offset = new Position();
Position target = new Position(curPos); Position target = new Position(curPos);
if (inputX.contains("~")) { // Relative if (inputX.contains("~")) { // Relative
@ -121,8 +121,12 @@ public class CommandHelpers {
// Calculate offset based on current position and rotation // Calculate offset based on current position and rotation
return new Position( return new Position(
pos.getX() + offset.getZ() * (float)Math.sin(angleZ) + offset.getX() * (float)Math.sin(angleX), pos.getX()
+ offset.getZ() * (float) Math.sin(angleZ)
+ offset.getX() * (float) Math.sin(angleX),
pos.getY() + offset.getY(), pos.getY() + offset.getY(),
pos.getZ() + offset.getZ() * (float)Math.cos(angleZ) + offset.getX() * (float)Math.cos(angleX)); pos.getZ()
+ offset.getZ() * (float) Math.cos(angleZ)
+ offset.getX() * (float) Math.cos(angleX));
} }
} }

8
src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
View File

@ -6,8 +6,6 @@ import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Position; import emu.grasscutter.game.world.Position;
import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType; import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
import java.util.List; import java.util.List;
@Command( @Command(
@ -58,7 +56,11 @@ public final class TeleportCommand implements CommandHandler {
translate( translate(
sender, sender,
"commands.teleport.success", "commands.teleport.success",
targetPlayer.getNickname(), pos.getX(), pos.getY(), pos.getZ(), sceneId)); targetPlayer.getNickname(),
pos.getX(),
pos.getY(),
pos.getZ(),
sceneId));
} }
} }
} }