From 5adeb58020a3d24e2b86d4414471ede98e5de753 Mon Sep 17 00:00:00 2001
From: TheBlackParade <runejs.dev@gmail.com>
Date: Thu, 5 Mar 2020 16:20:33 -0600
Subject: [PATCH] Fixing new players crashing due to savedMetadata and adding
 sourcemap support for debugging.

---
 package.json                     | 1 +
 src/main.ts                      | 1 +
 src/world/actor/player/player.ts | 9 +++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 7c194cd6b..39113efd2 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
         "js-yaml": "^3.13.1",
         "quadtree-lib": "^1.0.9",
         "rxjs": "^6.5.4",
+        "source-map-support": "^0.5.16",
         "ts-node": "^8.4.1",
         "tslib": "^1.10.0",
         "typescript": "^3.7.2",
diff --git a/src/main.ts b/src/main.ts
index 805ca1b45..026c40293 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,6 @@
 import { runGameServer } from './game-server';
 import { runWebServer } from './web-server';
+import 'source-map-support/register';
 // import { dumpItems } from '@server/data-dump';
 
 runGameServer();
diff --git a/src/world/actor/player/player.ts b/src/world/actor/player/player.ts
index a35b76760..d97878117 100644
--- a/src/world/actor/player/player.ts
+++ b/src/world/actor/player/player.ts
@@ -117,11 +117,11 @@ export class Player extends Actor {
         const firstTimePlayer: boolean = playerSave === null;
         this.firstTimePlayer = firstTimePlayer;
 
-        if(playerSave.savedMetadata) {
-            this.savedMetadata = playerSave.savedMetadata;
-        }
-
         if(!firstTimePlayer) {
+            if(playerSave.savedMetadata) {
+                this.savedMetadata = playerSave.savedMetadata;
+            }
+
             // Existing player logging in
             this.position = new Position(playerSave.position.x, playerSave.position.y, playerSave.position.level);
             if(playerSave.inventory && playerSave.inventory.length !== 0) {
@@ -158,6 +158,7 @@ export class Player extends Actor {
             this.inventory.add({itemId: 1201, amount: 1});
             this._appearance = defaultAppearance();
             this._rights = Rights.USER;
+            this.savedMetadata = {};
         }
 
         if(!this._settings) {