Merge pull request #353 from omg-xtao/tp

Support Teleport from console & custom server avatar

README.md

@@ -135,7 +135,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                                    |                                                 |
 | 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           |                                                 |
-| teleport       | teleport \<x> \<y> \<z>                              | player.teleport           | Client only  | Change the player's position.                                | tp                                              |
+| teleport       | teleport [@playerUid] \<x> \<y> \<z> [sceneId]                             | player.teleport           | Both side  | Change the player's position.                                | tp                                              |
 | 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                                               |
 

README_zh-CN.md

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

src/main/java/emu/grasscutter/Config.java

@@ -71,6 +71,8 @@ public final class Config {
 		public int MaxAvatarsInTeamMultiplayer = 4;
 		public int MaxEntityLimit = 1000; // Max entity limit per world. // TODO: Enforce later.
 		public boolean WatchGacha = false;
+		public String ServerNickname = "Server";
+		public int ServerAvatarId = 10000007;
 		public int[] WelcomeEmotes = {2007, 1002, 4010};
 		public String WelcomeMotd = "Welcome to Grasscutter emu";
 		public String WelcomeMailContent = "Hi there!\r\nFirst of all, welcome to Grasscutter. If you have any issues, please let us know so that Lawnmower can help you! \r\n\r\nCheck out our:\r\n<type=\"browser\" text=\"Discord\" href=\"https://discord.gg/T5vZU6UyeG\"/> <type=\"browser\" text=\"GitHub\" href=\"https://github.com/Melledy/Grasscutter\"/>";

src/main/java/emu/grasscutter/GameConstants.java

@@ -11,6 +11,8 @@ public final class GameConstants {
 	public static final int MAX_TEAMS = 4;
 	public static final int MAIN_CHARACTER_MALE = 10000005;
 	public static final int MAIN_CHARACTER_FEMALE = 10000007;
+	public static final String SERVER_AVATAR_NAME = Grasscutter.getConfig().getGameServerOptions().ServerNickname;
+	public static final int SERVER_AVATAR_ID = Grasscutter.getConfig().getGameServerOptions().ServerAvatarId;
 	public static final Position START_POSITION = new Position(2747, 194, -1719);
 	
 	public static final int MAX_FRIENDS = 45;

src/main/java/emu/grasscutter/command/commands/TeleportCommand.java

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

src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java

@@ -18,9 +18,9 @@ public class PacketGetPlayerFriendListRsp extends BasePacket {
 		
 		FriendBrief serverFriend = FriendBrief.newBuilder()
 				.setUid(GameConstants.SERVER_CONSOLE_UID)
-				.setNickname("Server")
+				.setNickname(GameConstants.SERVER_AVATAR_NAME)
 				.setLevel(1)
-				.setProfilePicture(ProfilePicture.newBuilder().setAvatarId(GameConstants.MAIN_CHARACTER_FEMALE))
+				.setProfilePicture(ProfilePicture.newBuilder().setAvatarId(GameConstants.SERVER_AVATAR_ID))
 				.setWorldLevel(0)
 				.setSignature("")
 				.setLastActiveTime((int) (System.currentTimeMillis() / 1000f))