Merge branch 'fix-multiplayer-crash' into 'master'

A player who lost cannot initiate combat

Closes #1255

See merge request core-developers/forge!2643
This commit is contained in:
Michael Kamensky
2020-03-31 05:01:24 +00:00

View File

@@ -2525,6 +2525,10 @@ public class Player extends GameEntity implements Comparable<Player> {
}
public boolean isSkippingCombat() {
if (hasLost()) {
return true;
}
if (hasKeyword("Skip your next combat phase.")) {
return true;
}