From 693dbbdd488ceeb3c0aaeec266f566d556365757 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 7 Dec 2022 10:57:14 +0800
Subject: [PATCH] fix ConcurrentModificationException and reloading WorldSave

---
 forge-ai/src/main/java/forge/ai/AiAttackController.java   | 2 +-
 forge-gui-mobile/src/forge/adventure/world/WorldSave.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java
index 7e4a53a269e..41a55e08f3a 100644
--- a/forge-ai/src/main/java/forge/ai/AiAttackController.java
+++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java
@@ -179,7 +179,7 @@ public class AiAttackController {
 
             List<Player> opps = Lists.newArrayList(ai.getOpponents());
             if (forCombatDmg) {
-                for (Player p : opps) {
+                for (Player p : ai.getOpponents().threadSafeIterable()) {
                     if (p.isMonarch() && ai.canBecomeMonarch()) {
                         // just increase the odds for now instead of being fully predictable
                         // as it could lead to other too complex factors giving this reasoning negative impact
diff --git a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java
index a8957a458ab..aa787f54634 100644
--- a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java
+++ b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java
@@ -79,6 +79,7 @@ public class WorldSave   {
                     System.err.println("Generating New World");
                     currentSave.world.generateNew(0);
                 }
+                currentSave.pointOfInterestChanges.clear();
 
                 currentSave.onLoadList.emit();