Merge pull request #2041 from kevlahnota/newmaster2

fix ConcurrentModificationException and reloading WorldSave

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

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();