Merge branch 'NPE' into 'master'

viewDeckList: Fix NPE

See merge request core-developers/forge!4639
This commit is contained in:
Michael Kamensky
2021-05-02 03:55:14 +00:00

View File

@@ -270,7 +270,7 @@ public final class CMatchUI
* View deck list. * View deck list.
*/ */
public void viewDeckList() { public void viewDeckList() {
if (!isInGame()) { if (!isInGame() || getCurrentPlayer() == null) {
return; return;
} }
final Deck deck = getGameView().getDeck(getCurrentPlayer()); final Deck deck = getGameView().getDeck(getCurrentPlayer());