From 9a42d3d3f882a921424a53c4cd0512a37f65b898 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 28 May 2013 07:41:08 +0200 Subject: [PATCH] Trying to fix a ConcurrentModificationException during FFA match, if a player dies. --- Mage/src/mage/game/GameImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 86071b8a4d3..ee3046f88c2 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -1520,9 +1520,13 @@ public abstract class GameImpl> implements Game, Serializa */ @Override - public void leave(UUID playerId) { + public synchronized void leave(UUID playerId) { Player player = getPlayer(playerId); player.leave(); + if (this.isGameOver()) { + // no need to remove objects if only one player is left + return; + } //20100423 - 800.4a for (Iterator it = getBattlefield().getAllPermanents().iterator(); it.hasNext();) { Permanent perm = it.next();