From 8b3054aa8be0e62a4daff170922a97644c055eca Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 28 May 2015 02:45:38 +0200
Subject: [PATCH] Fix for player collision cleanup issue

---
 apps/openmw/mwworld/worldimp.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e20904d71..38353fa68 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2107,6 +2107,7 @@ namespace MWWorld
         {
             // Remove the old CharacterController
             MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr());
+            mPhysics->remove(getPlayerPtr());
 
             mPlayer->set(player);
         }
@@ -2128,6 +2129,7 @@ namespace MWWorld
 
         std::string model = getPlayerPtr().getClass().getModel(getPlayerPtr());
         model = Misc::ResourceHelpers::correctActorModelPath(model, mResourceSystem->getVFS());
+        mPhysics->remove(getPlayerPtr());
         mPhysics->addActor(getPlayerPtr(), model);
     }