GameServer#getPlayerByUid = GameServer#getPlayerById

Relinke · Apr 19, 2022 · 27c9545 · 27c9545
1 parent 87a9d0c
commit 27c9545
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java
@@ -51,7 +51,7 @@ public void execute(GenshinPlayer player, List<String> args) {
                 case 2:
                     try {
                         target = Integer.parseInt(args.get(0));
-                        if(Grasscutter.getGameServer().getPlayerByUid(target) == null) {
+                        if(Grasscutter.getGameServer().getPlayerById(target) == null) {
                             target = player.getId(); amount = Integer.parseInt(args.get(1));
                             item = Integer.parseInt(args.get(0));
                         } else {
@@ -66,7 +66,7 @@ public void execute(GenshinPlayer player, List<String> args) {
                 case 3:
                     try {
                         target = Integer.parseInt(args.get(0));
-                        if(Grasscutter.getGameServer().getPlayerByUid(target) == null) {
+                        if(Grasscutter.getGameServer().getPlayerById(target) == null) {
                             CommandHandler.sendMessage(player, "Invalid player ID."); return;
                         }
 
@@ -80,7 +80,7 @@ public void execute(GenshinPlayer player, List<String> args) {
                     break;
             }
 
-            GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+            GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
             if(targetPlayer == null) {
                 CommandHandler.sendMessage(player, "Player not found."); return;
             }
@@ -107,7 +107,7 @@ public void execute(GenshinPlayer player, List<String> args) {
                 int item = Integer.parseInt(args.get(1));
                 int amount = 1; if(args.size() > 2) amount = Integer.parseInt(args.get(2));
 
-                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
                 if(targetPlayer == null) {
                     CommandHandler.sendMessage(null, "Player not found."); return;
                 }

diff --git a/src/main/java/emu/grasscutter/commands/ServerCommands.java b/src/main/java/emu/grasscutter/commands/ServerCommands.java
@@ -43,7 +43,7 @@ public void execute(List<String> args) {
                 int target = Integer.parseInt(args.get(0));
                 String message = String.join(" ", args.subList(1, args.size()));
 
-                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
                 if(targetPlayer == null) {
                     CommandHandler.sendMessage(null, "Player not found."); return;
                 }
@@ -65,7 +65,7 @@ public void execute(GenshinPlayer player, List<String> args) {
                 int target = Integer.parseInt(args.get(0));
                 String message = String.join(" ", args.subList(1, args.size()));
 
-                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
                 if(targetPlayer == null) {
                     CommandHandler.sendMessage(player, "Player not found."); return;
                 }

diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -110,12 +110,6 @@ public GenshinPlayer getPlayerById(int id) {
 		return this.getPlayers().get(id);
 	}
 
-	public GenshinPlayer getPlayerByUid(int uid) {
-		return this.getPlayers().values().stream()
-				.filter(player -> player.getAccount().getPlayerId() == uid)
-				.findFirst().orElse(this.getPlayerById(uid));
-	}
-
 	public GenshinPlayer forceGetPlayerById(int id) {
 		// Console check
 		if (id == GenshinConstants.SERVER_CONSOLE_UID) {