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

Support Teleport from console

Browse Source
This commit is contained in:
xtaodada 2022-04-29 17:53:42 +08:00
parent f0ffc982e1
commit 4339810ca3
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
3 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -134,7 +134,7 @@ There is a dummy user named "Server" in every player's friends list that you can
| spawn | spanw <entityID\|entityName> [level] [amount] | server.spawn | Client only | Spawns an entity near you | | | spawn | spanw <entityID\|entityName> [level] [amount] | server.spawn | Client only | Spawns an entity near you | |
| stop | stop | server.stop | Both side | Stops the server | | | stop | stop | server.stop | Both side | Stops the server | |
| talent | talent <talentID> <value> | player.settalent | Client only | Sets talent level for your currently selected character | | | talent | talent <talentID> <value> | player.settalent | Client only | Sets talent level for your currently selected character | |
| teleport | teleport <x> <y> <z> | player.teleport | Client only | Change the player's position. | tp | | teleport | teleport [@player id] <x> <y> <z> [scene id] | player.teleport | Both side | Change the player's position. | tp |
| tpall | | player.tpall | Client only | Teleports all players in your world to your position | | | tpall | | player.tpall | Client only | Teleports all players in your world to your position | |
| weather | weather <weatherID> <climateID> | player.weather | Client only | Changes the weather | w | | weather | weather <weatherID> <climateID> | player.weather | Client only | Changes the weather | w |

2
README_zh-CN.md
View File

@ -135,7 +135,7 @@ chmod +x gradlew
| spawn | spanw <实体ID\|实体名称> [等级] [数量] | server.spawn | 仅客户端 | 在你周围生成实体 | | | spawn | spanw <实体ID\|实体名称> [等级] [数量] | server.spawn | 仅客户端 | 在你周围生成实体 | |
| stop | stop | server.stop | 均可使用 | 停止服务器 | | | stop | stop | server.stop | 均可使用 | 停止服务器 | |
| talent | talent <天赋ID> <等级> | player.settalent | 仅客户端 | 设置当前角色的天赋等级 | | | talent | talent <天赋ID> <等级> | player.settalent | 仅客户端 | 设置当前角色的天赋等级 | |
| teleport | teleport <x> <y> <z> | player.teleport | 仅客户端 | 传送玩家到指定坐标 | tp | | teleport | teleport [@player id] <x> <y> <z> [scene id] | player.teleport | 均可使用 | 传送玩家到指定坐标 | tp |
| tpall | | player.tpall | 仅客户端 | 传送多人世界中所有的玩家到自身地点 | | | tpall | | player.tpall | 仅客户端 | 传送多人世界中所有的玩家到自身地点 | |
| weather | weather <天气ID> <气候ID> | player.weather | 仅客户端 | 改变天气 | w | | weather | weather <天气ID> <气候ID> | player.weather | 仅客户端 | 改变天气 | w |

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

@ -1,5 +1,6 @@
package emu.grasscutter.command.commands; package emu.grasscutter.command.commands;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command; import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler; import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
@ -7,21 +8,39 @@ import emu.grasscutter.utils.Position;
import java.util.List; import java.util.List;
@Command(label = "teleport", usage = "teleport <x> <y> <z>", aliases = {"tp"}, @Command(label = "teleport", usage = "teleport [@player id] <x> <y> <z> [scene id]", aliases = {"tp"},
description = "Change the player's position.", permission = "player.teleport") description = "Change the player's position.", permission = "player.teleport")
public final class TeleportCommand implements CommandHandler { public final class TeleportCommand implements CommandHandler {
@Override @Override
public void execute(Player sender, List<String> args) { public void execute(Player sender, List<String> args) {
if (sender == null) { int target;
CommandHandler.sendMessage(null, "Run this command in-game."); if (args.size() < (sender == null ? 4 : 3)) {
CommandHandler.sendMessage(sender, sender == null ? "Usage: /tp @<player id> <x> <y> <z> [scene id]" :
"Usage: /tp [@<player id>] <x> <y> <z> [scene id]");
return; return;
} }
if (args.get(0).startsWith("@")) {
try {
target = Integer.parseInt(args.get(0).substring(1));
} catch (NumberFormatException e) {
CommandHandler.sendMessage(sender, "Invalid player id.");
return;
}
} else {
if (sender == null) {
CommandHandler.sendMessage(null, "You must specify a player id.");
return;
}
target = sender.getUid();
}
if (args.size() < 3){ Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
CommandHandler.sendMessage(sender, "Usage: /tp <x> <y> <z> [scene id]"); if (targetPlayer == null) {
CommandHandler.sendMessage(sender, "Player not found or offline.");
return; return;
} }
args = args.subList(args.get(0).startsWith("@") ? 1 : 0, args.size());
try { try {
float x = 0f; float x = 0f;
@ -29,39 +48,41 @@ public final class TeleportCommand implements CommandHandler {
float z = 0f; float z = 0f;
if (args.get(0).contains("~")) { if (args.get(0).contains("~")) {
if (args.get(0).equals("~")) { if (args.get(0).equals("~")) {
x = sender.getPos().getX(); x = targetPlayer.getPos().getX();
} else { } else {
x = Float.parseFloat(args.get(0).replace("~", "")) + sender.getPos().getX(); x = Float.parseFloat(args.get(0).replace("~", "")) + targetPlayer.getPos().getX();
} }
} else { } else {
x = Float.parseFloat(args.get(0)); x = Float.parseFloat(args.get(0));
} }
if (args.get(1).contains("~")) { if (args.get(1).contains("~")) {
if (args.get(1).equals("~")) { if (args.get(1).equals("~")) {
y = sender.getPos().getY(); y = targetPlayer.getPos().getY();
} else { } else {
y = Float.parseFloat(args.get(1).replace("~", "")) + sender.getPos().getY(); y = Float.parseFloat(args.get(1).replace("~", "")) + targetPlayer.getPos().getY();
} }
} else { } else {
y = Float.parseFloat(args.get(1)); y = Float.parseFloat(args.get(1));
} }
if (args.get(2).contains("~")) { if (args.get(2).contains("~")) {
if (args.get(2).equals("~")) { if (args.get(2).equals("~")) {
z = sender.getPos().getZ(); z = targetPlayer.getPos().getZ();
} else { } else {
z = Float.parseFloat(args.get(2).replace("~", "")) + sender.getPos().getZ(); z = Float.parseFloat(args.get(2).replace("~", "")) + targetPlayer.getPos().getZ();
} }
} else { } else {
z = Float.parseFloat(args.get(2)); z = Float.parseFloat(args.get(2));
} }
int sceneId = sender.getSceneId(); int sceneId = targetPlayer.getSceneId();
if (args.size() == 4){ if (args.size() == 4){
sceneId = Integer.parseInt(args.get(3)); sceneId = Integer.parseInt(args.get(3));
} }
Position target = new Position(x, y, z); Position target_pos = new Position(x, y, z);
boolean result = sender.getWorld().transferPlayerToScene(sender, sceneId, target); boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, target_pos);
if (!result) { if (!result) {
CommandHandler.sendMessage(sender, "Invalid position."); CommandHandler.sendMessage(sender, "Invalid position.");
} else {
CommandHandler.sendMessage(sender, "Teleported " + targetPlayer.getNickname() + " to " + x + "," + y + "," + z + " in scene " + sceneId);
} }
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
CommandHandler.sendMessage(sender, "Invalid position."); CommandHandler.sendMessage(sender, "Invalid position.");