From b64bbc8132ee15788a18c84fd698c3226f725dc7 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@gmail.com>
Date: Thu, 14 May 2020 22:46:31 +0200
Subject: [PATCH] Fix hub being removable after restoring a game, fix tslint
 errors

---
 src/js/game/buildings/miner.js         | 2 +-
 src/js/game/components/unremovable.js  | 4 ++++
 src/js/game/entity.js                  | 2 +-
 src/js/game/root.js                    | 1 -
 src/js/savegame/savegame_serializer.js | 1 -
 src/js/savegame/savegame_typedefs.js   | 7 +++----
 src/js/savegame/serializer_internal.js | 6 +-----
 src/js/states/ingame.js                | 4 ----
 8 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/js/game/buildings/miner.js b/src/js/game/buildings/miner.js
index 83791504..5503ddac 100644
--- a/src/js/game/buildings/miner.js
+++ b/src/js/game/buildings/miner.js
@@ -26,7 +26,7 @@ export class MetaMinerBuilding extends MetaBuilding {
      * @param {Entity} entity
      */
     setupEntityComponents(entity) {
-        entity.addComponent(new MinerComponent({}));
+        entity.addComponent(new MinerComponent());
         entity.addComponent(
             new ItemEjectorComponent({
                 slots: [{ pos: new Vector(0, 0), direction: enumDirection.top }],
diff --git a/src/js/game/components/unremovable.js b/src/js/game/components/unremovable.js
index 4f6dd33a..17e9f36b 100644
--- a/src/js/game/components/unremovable.js
+++ b/src/js/game/components/unremovable.js
@@ -4,4 +4,8 @@ export class UnremovableComponent extends Component {
     static getId() {
         return "Unremovable";
     }
+
+    static getSchema() {
+        return {};
+    }
 }
diff --git a/src/js/game/entity.js b/src/js/game/entity.js
index bc3ea0db..89b7044a 100644
--- a/src/js/game/entity.js
+++ b/src/js/game/entity.js
@@ -77,7 +77,7 @@ export class Entity extends BasicSerializableObject {
     static getSchema() {
         return {
             uid: types.uint,
-            components: types.keyValueMap(types.objData(gComponentRegistry), false),
+            components: types.keyValueMap(types.objData(gComponentRegistry)),
         };
     }
 
diff --git a/src/js/game/root.js b/src/js/game/root.js
index 19d32db5..72658fc5 100644
--- a/src/js/game/root.js
+++ b/src/js/game/root.js
@@ -20,7 +20,6 @@ import { Savegame } from "../savegame/savegame";
 import { GameLogic } from "./logic";
 import { ShapeDefinitionManager } from "./shape_definition_manager";
 import { CanvasClickInterceptor } from "./canvas_click_interceptor";
-import { PerlinNoise } from "../core/perlin_noise";
 import { HubGoals } from "./hub_goals";
 import { BufferMaintainer } from "../core/buffer_maintainer";
 import { ProductionAnalytics } from "./production_analytics";
diff --git a/src/js/savegame/savegame_serializer.js b/src/js/savegame/savegame_serializer.js
index ad9b9569..5c46e07c 100644
--- a/src/js/savegame/savegame_serializer.js
+++ b/src/js/savegame/savegame_serializer.js
@@ -128,7 +128,6 @@ export class SavegameSerializer {
         if (!verifyResult.result) {
             return ExplainedResult.bad(verifyResult.reason);
         }
-        console.log("SAVEGAME:", savegame);
         let errorReason = null;
 
         errorReason = errorReason || root.entityMgr.deserialize(savegame.entityMgr);
diff --git a/src/js/savegame/savegame_typedefs.js b/src/js/savegame/savegame_typedefs.js
index 3ab73761..ca72d856 100644
--- a/src/js/savegame/savegame_typedefs.js
+++ b/src/js/savegame/savegame_typedefs.js
@@ -18,10 +18,9 @@
  *   camera: any,
  *   time: any,
  *   entityMgr: any,
- *   entities: {
- *     resources: Array<SerializedMapResource>,
- *     buildings: Array<any>
- *   }
+ *   map: any,
+ *   hubGoals: any,
+ *   entities: Array<any>
  * }} SerializedGame
  */
 
diff --git a/src/js/savegame/serializer_internal.js b/src/js/savegame/serializer_internal.js
index 75a7b88f..3eb0f72b 100644
--- a/src/js/savegame/serializer_internal.js
+++ b/src/js/savegame/serializer_internal.js
@@ -33,12 +33,8 @@ export class SerializerInternal {
      */
     deserializeEntityArray(root, array) {
         for (let i = 0; i < array.length; ++i) {
-            const errorState = this.deserializeEntity(root, array[i]);
-            if (errorState) {
-                return errorState;
-            }
+            this.deserializeEntity(root, array[i]);
         }
-        return null;
     }
 
     /**
diff --git a/src/js/states/ingame.js b/src/js/states/ingame.js
index cb2d336a..46b86dde 100644
--- a/src/js/states/ingame.js
+++ b/src/js/states/ingame.js
@@ -67,10 +67,6 @@ export class InGameState extends GameState {
         this.savegame;
 
         this.boundInputFilter = this.filterInput.bind(this);
-
-        if (G_IS_DEV) {
-            window.performSave = this.doSave.bind(this);
-        }
     }
 
     /**