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

Merge pull request #52 from iTruth/development

Browse Source 
Fix playerOpt is always throw an exception when it's null
This commit is contained in:
Melledy 2022-04-20 06:25:00 -07:00 committed by GitHub
commit 0811c52f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ public final class GameServer extends MihoyoKcpServer {
public Account getAccountByName(String username) { public Account getAccountByName(String username) {
Optional<GenshinPlayer> playerOpt = getPlayers().values().stream().filter(player -> player.getAccount().getUsername().equals(username)).findFirst(); Optional<GenshinPlayer> playerOpt = getPlayers().values().stream().filter(player -> player.getAccount().getUsername().equals(username)).findFirst();
if (playerOpt.get() != null) { if (playerOpt.isPresent()) {
return playerOpt.get().getAccount(); return playerOpt.get().getAccount();
} }
return DatabaseHelper.getAccountByName(username); return DatabaseHelper.getAccountByName(username);