Map sequence bug fix

core/app/Controller.java

@@ -157,6 +157,7 @@ public class Controller {
 	 */
 	private boolean initMap(String mapPath) throws IOException
 	{
+		Model.getInstance().restartMap();
 		BufferedReader br = new BufferedReader(new FileReader(mapPath));
 
 		String command;

core/app/GameController.java

@@ -39,8 +39,6 @@ public class GameController implements PropertyChangeListener{
 	 */
 	public void startGameProcess( int[] rZPMCount) throws GameRunningException
 	{
-		Model.getInstance().restartMap();
-
 		int failure = 0;
 		int counter = 0;
 
@@ -217,7 +215,7 @@ public class GameController implements PropertyChangeListener{
 
 		} // end of while
 
-
+		Model.getInstance().removePropertyChangeListener(this);
 
 		return;	// Map finished
 	}
@@ -316,6 +314,7 @@ public class GameController implements PropertyChangeListener{
 
 		// update only the changed fields
 		int coord = (int)evt.getNewValue();
+		System.out.println(coord);
 		int xCoord = coord / map[0].length;
 		int yCoord = coord % map[0].length;
 		Field changedField = (Field)evt.getOldValue();

core/game/Model.java

@@ -51,6 +51,14 @@ public class Model implements PropertyChangeListener
 		}
 	}
 	
+	public void removePropertyChangeListener(PropertyChangeListener listener)
+	{
+		if(listener != null)
+		{
+			propSupp.removePropertyChangeListener(listener);
+		}
+	}
+
 	public void setColonel(Player colonel)
 	{
 		this.colonel = colonel;
@@ -94,6 +102,7 @@ public class Model implements PropertyChangeListener
 
 	public void restartMap()
 	{
+		map = new ArrayList<>();
 		isMapFinished = false;
 	}