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

GameServer#getPlayerByUid = GameServer#getPlayerById

Browse Source
This commit is contained in:
KingRainbow44 2022-04-18 23:53:05 -04:00
parent 824b3a4bf4
commit 7666c92cf1
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/grasscutter/commands/PlayerCommands.java
View File

@ -51,7 +51,7 @@ public final class PlayerCommands {
case 2: case 2:
try { try {
target = Integer.parseInt(args.get(0)); 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)); target = player.getId(); amount = Integer.parseInt(args.get(1));
item = Integer.parseInt(args.get(0)); item = Integer.parseInt(args.get(0));
} else { } else {
@ -66,7 +66,7 @@ public final class PlayerCommands {
case 3: case 3:
try { try {
target = Integer.parseInt(args.get(0)); 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; CommandHandler.sendMessage(player, "Invalid player ID."); return;
} }
@ -80,7 +80,7 @@ public final class PlayerCommands {
break; break;
} }
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
if(targetPlayer == null) { if(targetPlayer == null) {
CommandHandler.sendMessage(player, "Player not found."); return; CommandHandler.sendMessage(player, "Player not found."); return;
} }
@ -107,7 +107,7 @@ public final class PlayerCommands {
int item = Integer.parseInt(args.get(1)); int item = Integer.parseInt(args.get(1));
int amount = 1; if(args.size() > 2) amount = Integer.parseInt(args.get(2)); 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) { if(targetPlayer == null) {
CommandHandler.sendMessage(null, "Player not found."); return; CommandHandler.sendMessage(null, "Player not found."); return;
} }

4
src/main/java/emu/grasscutter/commands/ServerCommands.java
View File

@ -43,7 +43,7 @@ public final class ServerCommands {
int target = Integer.parseInt(args.get(0)); int target = Integer.parseInt(args.get(0));
String message = String.join(" ", args.subList(1, args.size())); String message = String.join(" ", args.subList(1, args.size()));
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
if(targetPlayer == null) { if(targetPlayer == null) {
CommandHandler.sendMessage(null, "Player not found."); return; CommandHandler.sendMessage(null, "Player not found."); return;
} }
@ -65,7 +65,7 @@ public final class ServerCommands {
int target = Integer.parseInt(args.get(0)); int target = Integer.parseInt(args.get(0));
String message = String.join(" ", args.subList(1, args.size())); String message = String.join(" ", args.subList(1, args.size()));
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
if(targetPlayer == null) { if(targetPlayer == null) {
CommandHandler.sendMessage(player, "Player not found."); return; CommandHandler.sendMessage(player, "Player not found."); return;
} }

6
src/main/java/emu/grasscutter/server/game/GameServer.java
View File

@ -110,12 +110,6 @@ public final class GameServer extends MihoyoKcpServer {
return this.getPlayers().get(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) { public GenshinPlayer forceGetPlayerById(int id) {
// Console check // Console check
if (id == GenshinConstants.SERVER_CONSOLE_UID) { if (id == GenshinConstants.SERVER_CONSOLE_UID) {