From b85d0270140b30a6575a2617575dfa1450d2ab61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 10 May 2016 12:57:23 +0200 Subject: Map5Marshal: block unitId while loading players --- core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java | 2 ++ 1 file changed, 2 insertions(+) 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) -- cgit v1.1-2-g2b99