From 08e4a056416ed83e67add92d229bf3e2a5a0949b Mon Sep 17 00:00:00 2001
From: MedicOP <MedicOP@users.noreply.github.com>
Date: Sat, 26 Jan 2019 01:18:43 +0100
Subject: [PATCH] Fix MapleMap.getCharacters() CME in 3 commands (#369)

---
 src/client/command/commands/gm2/WarpAreaCommand.java  | 6 +++++-
 src/client/command/commands/gm2/WarpMapCommand.java   | 7 ++++++-
 src/client/command/commands/gm3/ReloadMapCommand.java | 8 ++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/client/command/commands/gm2/WarpAreaCommand.java b/src/client/command/commands/gm2/WarpAreaCommand.java
index d9d97e9f48..b531215e24 100644
--- a/src/client/command/commands/gm2/WarpAreaCommand.java
+++ b/src/client/command/commands/gm2/WarpAreaCommand.java
@@ -29,6 +29,8 @@ import client.command.Command;
 import server.maps.MapleMap;
 
 import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collection;
 
 public class WarpAreaCommand extends Command {
     {
@@ -52,7 +54,9 @@ public class WarpAreaCommand extends Command {
 
             Point pos = player.getPosition();
 
-            for (MapleCharacter victim : player.getMap().getCharacters()) {
+            Collection<MapleCharacter> characters = new ArrayList<>(player.getMap().getCharacters());
+            
+            for (MapleCharacter victim : characters) {
                 if (victim.getPosition().distanceSq(pos) <= 50000) {
                     victim.saveLocationOnWarp();
                     victim.changeMap(target, target.getRandomPlayerSpawnpoint());
diff --git a/src/client/command/commands/gm2/WarpMapCommand.java b/src/client/command/commands/gm2/WarpMapCommand.java
index be8e60c295..238890d767 100644
--- a/src/client/command/commands/gm2/WarpMapCommand.java
+++ b/src/client/command/commands/gm2/WarpMapCommand.java
@@ -28,6 +28,9 @@ import client.MapleClient;
 import client.command.Command;
 import server.maps.MapleMap;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 public class WarpMapCommand extends Command {
     {
         setDescription("");
@@ -48,7 +51,9 @@ public class WarpMapCommand extends Command {
                 return;
             }
 
-            for (MapleCharacter victim : player.getMap().getCharacters()) {
+            Collection<MapleCharacter> characters = new ArrayList<>(player.getMap().getCharacters());
+            
+            for (MapleCharacter victim : characters) {
                 victim.saveLocationOnWarp();
                 victim.changeMap(target, target.getRandomPlayerSpawnpoint());
             }
diff --git a/src/client/command/commands/gm3/ReloadMapCommand.java b/src/client/command/commands/gm3/ReloadMapCommand.java
index 61a47117ce..12a0c31c5b 100644
--- a/src/client/command/commands/gm3/ReloadMapCommand.java
+++ b/src/client/command/commands/gm3/ReloadMapCommand.java
@@ -28,6 +28,9 @@ import client.MapleClient;
 import client.MapleCharacter;
 import server.maps.MapleMap;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 public class ReloadMapCommand extends Command {
     {
         setDescription("");
@@ -36,11 +39,12 @@ public class ReloadMapCommand extends Command {
     @Override
     public void execute(MapleClient c, String[] params) {
         MapleCharacter player = c.getPlayer();
-        MapleMap oldMap = c.getPlayer().getMap();
         MapleMap newMap = c.getChannelServer().getMapFactory().resetMap(player.getMapId());
         int callerid = c.getPlayer().getId();
 
-        for (MapleCharacter chr : oldMap.getCharacters()) {
+        Collection<MapleCharacter> characters = new ArrayList<>(player.getMap().getCharacters());
+        
+        for (MapleCharacter chr : characters) {
             chr.saveLocationOnWarp();
             chr.changeMap(newMap);
             if (chr.getId() != callerid)