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

Find by player's UID not IID

Browse Source
This commit is contained in:
KingRainbow44 2022-04-18 22:23:22 -04:00
parent a4932c7557
commit 2e01c7d5ad
4 changed files with 15 additions and 13 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().getPlayerById(target) == null) { if(Grasscutter.getGameServer().getPlayerByUid(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().getPlayerById(target) == null) { if(Grasscutter.getGameServer().getPlayerByUid(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().getPlayerById(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(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().getPlayerById(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { if(targetPlayer == null) {
CommandHandler.sendMessage(null, "Player not found."); return; CommandHandler.sendMessage(null, "Player not found."); return;
} }

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

@ -42,7 +42,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().getPlayerById(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { if(targetPlayer == null) {
CommandHandler.sendMessage(null, "Player not found."); return; CommandHandler.sendMessage(null, "Player not found."); return;
} }
@ -64,7 +64,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().getPlayerById(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { if(targetPlayer == null) {
CommandHandler.sendMessage(null, "Player not found."); return; CommandHandler.sendMessage(null, "Player not found."); return;
} }
@ -108,7 +108,7 @@ public final class ServerCommands {
Account account = DatabaseHelper.createAccountWithId(username, uid); Account account = DatabaseHelper.createAccountWithId(username, uid);
if(account == null) { if(account == null) {
CommandHandler.sendMessage(null, "Account already exists."); return; CommandHandler.sendMessage(null, "Account already exists."); return;
} else CommandHandler.sendMessage(null, "Account created with UID " + account.getId() + "."); } else CommandHandler.sendMessage(null, "Account created with UID " + account.getPlayerId() + ".");
return; return;
case "delete": case "delete":
if(DatabaseHelper.deleteAccount(username)) { if(DatabaseHelper.deleteAccount(username)) {

1
src/main/java/emu/grasscutter/database/DatabaseHelper.java
View File

@ -36,6 +36,7 @@ public class DatabaseHelper {
if (reservedId == GenshinConstants.SERVER_CONSOLE_UID) { if (reservedId == GenshinConstants.SERVER_CONSOLE_UID) {
return null; return null;
} }
exists = DatabaseHelper.getAccountByPlayerId(reservedId); exists = DatabaseHelper.getAccountByPlayerId(reservedId);
if (exists != null) { if (exists != null) {
return null; return null;

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

@ -1,12 +1,7 @@
package emu.grasscutter.server.game; package emu.grasscutter.server.game;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import emu.grasscutter.GenshinConstants; import emu.grasscutter.GenshinConstants;
@ -115,6 +110,12 @@ 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) {