diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-03-07 15:40:04 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-03-07 15:40:04 +0100 |
commit | d88c5cc130025eb2a0214436a86c15dad2787589 (patch) | |
tree | 604355e533d9c5b7b316ddd4451c36498862436c /core/src/ch/asynk/rustanddust/game/map | |
parent | 6a87c1f59fd2fa379aeda871cf4535038756cb5e (diff) | |
download | RustAndDust-d88c5cc130025eb2a0214436a86c15dad2787589.zip RustAndDust-d88c5cc130025eb2a0214436a86c15dad2787589.tar.gz |
Player: remove id from constructor
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/map')
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java index cc5f3c9..ec02762 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java @@ -65,7 +65,7 @@ public abstract class Map5Marshal extends Map4Orders private void unload(Json json, Player player) { json.writeObjectStart(); - json.writeValue("id", player.getId()); + json.writeValue("id", player.id); json.writeValue("a", player.army); json.writeArrayStart("v"); json.writeValue(player.getTurn()); @@ -279,7 +279,8 @@ public abstract class Map5Marshal extends Map4Orders private Player loadPlayer(JsonValue v) { - Player p = new Player(v.getInt("id"), Army.valueOf(v.getString("a"))); + Player p = new Player(Army.valueOf(v.getString("a"))); + p.id = v.getInt("id"); JsonValue a = v.get("v"); p.setTurn(a.getInt(0), a.getInt(1), a.getInt(2)); p.actionCount = a.getInt(3); |