Merge pull request tonihele#487 from tonihele/bugfix/multiplayer-serialization-fix

Fix multiplayer serialization issues

Author: tonihele

src/toniarts/openkeeper/game/network/NetworkServer.java

@@ -77,10 +77,12 @@
 import toniarts.openkeeper.game.component.PortalGem;
 import toniarts.openkeeper.game.component.Position;
 import toniarts.openkeeper.game.component.Regeneration;
-import toniarts.openkeeper.game.component.Stored;
+import toniarts.openkeeper.game.component.RoomComponent;
 import toniarts.openkeeper.game.component.Senses;
 import toniarts.openkeeper.game.component.Slapped;
 import toniarts.openkeeper.game.component.Spellbook;
+import toniarts.openkeeper.game.component.Storage;
+import toniarts.openkeeper.game.component.Stored;
 import toniarts.openkeeper.game.component.TaskComponent;
 import toniarts.openkeeper.game.component.Threat;
 import toniarts.openkeeper.game.component.TrapComponent;
@@ -97,7 +99,6 @@
 import toniarts.openkeeper.game.network.chat.ChatHostedService;
 import toniarts.openkeeper.game.network.game.GameHostedService;
 import toniarts.openkeeper.game.network.lobby.LobbyHostedService;
-import toniarts.openkeeper.game.network.message.GameData;
 import toniarts.openkeeper.game.network.message.GameLoadProgressData;
 import toniarts.openkeeper.game.network.message.StreamedMessage;
 import toniarts.openkeeper.game.network.session.AccountHostedService;
@@ -146,8 +147,6 @@ private static void initialize() {
             Serializer.registerClass(Tile.BridgeTerrainType.class, new EnumSerializer());
             Serializer.registerClass(Thing.HeroParty.Objective.class, new EnumSerializer());
             Serializer.registerClass(ObjectiveType.class, new EnumSerializer());
-            Serializer.registerClass(GameData.class, new FieldSerializer());
-            //Serializer.registerClass(CreatureState.class, new EnumSerializer());
             Serializer.registerClass(AbstractRoomController.ObjectType.class, new EnumSerializer());
             Serializer.registerClass(ViewType.class, new EnumSerializer());
             Serializer.registerClass(TaskType.class, new EnumSerializer());
@@ -199,6 +198,8 @@ private static void initialize() {
             Serializer.registerClass(PortalGem.class, new FieldSerializer());
             Serializer.registerClass(Position.class, new FieldSerializer());
             Serializer.registerClass(Regeneration.class, new FieldSerializer());
+            Serializer.registerClass(RoomComponent.class, new FieldSerializer());
+            Serializer.registerClass(Storage.class, new FieldSerializer());
             Serializer.registerClass(Stored.class, new FieldSerializer());
             Serializer.registerClass(Senses.class, new FieldSerializer());
             Serializer.registerClass(Slapped.class, new FieldSerializer());

src/toniarts/openkeeper/game/network/message/GameData.java

@@ -308,6 +308,7 @@ public void run() {
                     disconnect();
                     return;
                 }
+                logger.log(Level.ERROR, "Error connecting, disconnecting", e);
                 disconnect();
                 showError("Error Connecting", e, true);
             }