diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-05-10 12:57:23 +0200 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-05-10 12:57:23 +0200 |
commit | b85d0270140b30a6575a2617575dfa1450d2ab61 (patch) | |
tree | e9f00cc57d3c545a81b21374ecd9a9e5096c17a6 /core/src/ch/asynk | |
parent | 8ff4b3b1af1f5ebe76d84bca88cadcdddfc380ec (diff) | |
download | RustAndDust-b85d0270140b30a6575a2617575dfa1450d2ab61.zip RustAndDust-b85d0270140b30a6575a2617575dfa1450d2ab61.tar.gz |
Map5Marshal: block unitId while loading players
Diffstat (limited to 'core/src/ch/asynk')
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java index 2448b07..d1d7ccc 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java @@ -274,8 +274,10 @@ public abstract class Map5Marshal extends Map4Orders implements Marshal public void loadPlayers(JsonValue v, Player[] players) { clearMarshalUnits(); + Unit.blockId = true; players[0] = loadPlayer(v.get("players").get(0)); players[1] = loadPlayer(v.get("players").get(1)); + Unit.blockId = false; } private Player loadPlayer(JsonValue v) |