From e87e5260b18c59a8d2ff931acbd0ee4457b58d13 Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Mon, 11 Apr 2016 13:52:08 +0200
Subject: BattleCommon: must load map before Players, to have exit and entry
 Zones available

---
 core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/ch/asynk')

diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index e88600c3..e938f69b 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -103,12 +103,12 @@ public abstract class BattleCommon implements Battle
 
     public void load(Marshal.Mode mode, JsonValue value)
     {
+        map.load(mode, value);
         if((mode == Marshal.Mode.FULL) || (mode == Marshal.Mode.STATE)) {
             JsonValue v = value.get("battle");
             this.turnCount = v.getInt("turnCount");
             map.loadPlayers(value, players);
         }
-        map.load(mode, value);
         this.currentPlayer = players[0];
     }
 
-- 
cgit v1.2.3