From 9728a6967ea8e5dcd9e4edfb8fe3faddc2b66fb4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 20 Feb 2017 20:27:05 +0100
Subject: [PATCH] Reset fall height when teleporting (Fixes #2629)

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

diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 5162cac66..93705f005 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -4,6 +4,8 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
+#include "../mwmechanics/creaturestats.hpp"
+
 #include "../mwworld/class.hpp"
 
 #include "player.hpp"
@@ -34,6 +36,7 @@ namespace MWWorld
     void ActionTeleport::teleport(const Ptr &actor)
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
+        actor.getClass().getCreatureStats(actor).land();
         if(actor == world->getPlayerPtr())
         {
             world->getPlayer().setTeleported(true);