From e31a4d0fa9d0365d7975e7b65bdc203622c3dd28 Mon Sep 17 00:00:00 2001
From: M'Dic <joshua.lee.betts@gmail.com>
Date: Sun, 13 Aug 2023 13:48:23 -0400
Subject: [PATCH] moar conflict fixit

---
 src/server/game/Movement/MotionMaster.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index c3577f0d16..28bace6cab 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -1002,7 +1002,7 @@ void MotionMaster::MoveFallPlayer(uint32 id/* = 0*/)
         _owner->ToPlayer()->SetFallInformation(0, _owner->GetPositionZ());
     }
 
-    std::function<void(Movement::MoveSplineInit&)> initializer = [=](Movement::MoveSplineInit& init)
+    std::function<void(Movement::MoveSplineInit&)> initializer = [=, this](Movement::MoveSplineInit& init)
     {
         init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), tz + _owner->GetHoverOffset(), false);
         init.SetFall();