External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fix

Browse source
This commit is contained in:
Oleg Agafonov 2025-06-29 01:09:16 +04:00
parent dfb84b09f3
commit c259b3a4e4
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -887,6 +887,12 @@ public abstract class GameImpl implements Game {
if (state.isGameOver()) { if (state.isGameOver()) {
return true; return true;
} }
// stop on game thread ended by third party tools or AI's timeout
if (Thread.currentThread().isInterrupted()) {
return true;
}
int remainingPlayers = 0; int remainingPlayers = 0;
int numLosers = 0; int numLosers = 0;
for (Player player : state.getPlayers().values()) { for (Player player : state.getPlayers().values()) {
@ -897,9 +903,10 @@ public abstract class GameImpl implements Game {
numLosers++; numLosers++;
} }
} }
// stop on no more active players
boolean noMorePlayers = remainingPlayers <= 1 || numLosers >= state.getPlayers().size() - 1; boolean noMorePlayers = remainingPlayers <= 1 || numLosers >= state.getPlayers().size() - 1;
// stop on no more players or on stopped game sim thread if (noMorePlayers) {
if (noMorePlayers || Thread.currentThread().isInterrupted()) {
end(); end();
if (remainingPlayers == 0 && logger.isDebugEnabled()) { if (remainingPlayers == 0 && logger.isDebugEnabled()) {
logger.debug("DRAW for gameId: " + getId()); logger.debug("DRAW for gameId: " + getId());