From e79036f4e008b17c1b6c78ff0055951ede736e22 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 23 Mar 2021 20:43:52 +0100
Subject: [PATCH] Don't erase the player

---
 apps/openmw/mwworld/esmstore.hpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index d69c56d8c..4d962b28c 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -80,8 +80,6 @@ namespace MWWorld
 
         std::map<int, StoreBase *> mStores;
 
-        ESM::NPC mPlayerTemplate;
-
         unsigned int mDynamicCount;
 
         mutable std::map<std::string, std::weak_ptr<MWMechanics::SpellList> > mSpellListCache;
@@ -172,14 +170,13 @@ namespace MWWorld
             for (std::map<int, StoreBase *>::iterator it = mStores.begin(); it != mStores.end(); ++it)
                 it->second->clearDynamic();
 
-            mNpcs.insert(mPlayerTemplate);
+            movePlayerRecord();
         }
 
         void movePlayerRecord ()
         {
-            mPlayerTemplate = *mNpcs.find("player");
-            mNpcs.eraseStatic(mPlayerTemplate.mId);
-            mNpcs.insert(mPlayerTemplate);
+            auto player = mNpcs.find("player");
+            mNpcs.insert(*player);
         }
 
         void load(ESM::ESMReader &esm, Loading::Listener* listener);