external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
prevent NPE

See merge request core-developers/forge!4085
This commit is contained in:
Anthony Calosa
2021-03-03 10:44:33 +00:00
parent 55e81e0d92 ff4803c506
commit a9487b445c
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/player/PlayerView.java
View File

@@ -64,8 +64,6 @@ public class PlayerView extends GameEntityView {
} }
public String getLobbyPlayerName() { public String getLobbyPlayerName() {
if (get(TrackableProperty.LobbyPlayerName) == null)
return ""; //todo find the root cause why this would return null after succesful start of game and could freeze the UI?
return get(TrackableProperty.LobbyPlayerName); return get(TrackableProperty.LobbyPlayerName);
} }
void updateLobbyPlayerName(Player p) { void updateLobbyPlayerName(Player p) {

2
forge-gui/src/main/java/forge/match/AbstractGuiGame.java
View File

@@ -403,7 +403,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
@Override @Override
public final void awaitNextInput() { public final void awaitNextInput() {
if (awaitNextInputTimer == null) { if (awaitNextInputTimer == null && currentPlayer != null) { //Prevent NPE currentPlayer
awaitNextInputTimer = new Timer("awaitNextInputTimer Game:" + this.gameView.getId() + " Player:" + this.currentPlayer.getLobbyPlayerName()); awaitNextInputTimer = new Timer("awaitNextInputTimer Game:" + this.gameView.getId() + " Player:" + this.currentPlayer.getLobbyPlayerName());
} }
//delay updating prompt to await next input briefly so buttons don't flicker disabled then enabled //delay updating prompt to await next input briefly so buttons don't flicker disabled then enabled