mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
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:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user