From 237901719a16600908607a112bba7363fa5cae70 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sun, 14 Apr 2019 11:46:51 +0200
Subject: [PATCH] Core/MMaps: Fix crash added in
 386b5a6fd948b4866cbd9a8a9892e8777922e9c9

# Conflicts:
#	src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp

* fixed cherrypick conflicts
---
 src/server/authserver/Main.cpp                                 | 1 -
 src/server/authserver/Realms/GruntRealmList.cpp                | 3 ++-
 src/server/authserver/Realms/GruntRealmList.h                  | 3 ++-
 src/server/bnetserver/Realms/BNetRealmList.cpp                 | 3 ++-
 src/server/bnetserver/Realms/BNetRealmList.h                   | 3 ++-
 .../Movement/MovementGenerators/ChaseMovementGenerator .cpp    | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 11ec5a4333d..7e084d59de9 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -37,7 +37,6 @@
 #include "IPLocation.h"
 #include "MySQLThreading.h"
 #include "ProcessPriority.h"
-#include "RealmList.h"
 #include "Util.h"
 #include <boost/asio/signal_set.hpp>
 #include <boost/program_options.hpp>
diff --git a/src/server/authserver/Realms/GruntRealmList.cpp b/src/server/authserver/Realms/GruntRealmList.cpp
index 0dff0a93f3e..b35303f09c1 100644
--- a/src/server/authserver/Realms/GruntRealmList.cpp
+++ b/src/server/authserver/Realms/GruntRealmList.cpp
@@ -18,6 +18,7 @@
 
 #include "GruntRealmList.h"
 #include "DatabaseEnv.h"
+#include "DeadlineTimer.h"
 #include "IoContext.h"
 #include "Log.h"
 #include "Resolver.h"
@@ -43,7 +44,7 @@ GruntRealmList* GruntRealmList::Instance()
 void GruntRealmList::Initialize(Trinity::Asio::IoContext& ioContext, uint32 updateInterval)
 {
     _updateInterval = updateInterval;
-    _updateTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioContext);
+    _updateTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
     _resolver = Trinity::make_unique<boost::asio::ip::tcp_resolver>(ioContext);
 
     // Get the content of the realmlist table in the database
diff --git a/src/server/authserver/Realms/GruntRealmList.h b/src/server/authserver/Realms/GruntRealmList.h
index 06211235129..1f314e9d371 100644
--- a/src/server/authserver/Realms/GruntRealmList.h
+++ b/src/server/authserver/Realms/GruntRealmList.h
@@ -38,6 +38,7 @@ namespace Trinity
     namespace Asio
     {
         class IoContext;
+        class DeadlineTimer;
     }
 }
 
@@ -67,7 +68,7 @@ class GruntRealmList
 
         RealmMap _realms;
         uint32 _updateInterval;
-        std::unique_ptr<boost::asio::deadline_timer> _updateTimer;
+        std::unique_ptr<Trinity::Asio::DeadlineTimer> _updateTimer;
         std::unique_ptr<boost::asio::ip::tcp_resolver> _resolver;
 };
 
diff --git a/src/server/bnetserver/Realms/BNetRealmList.cpp b/src/server/bnetserver/Realms/BNetRealmList.cpp
index c4d8a97d8a3..167d6f452d7 100644
--- a/src/server/bnetserver/Realms/BNetRealmList.cpp
+++ b/src/server/bnetserver/Realms/BNetRealmList.cpp
@@ -18,6 +18,7 @@
 
 #include "BNetRealmList.h"
 #include "DatabaseEnv.h"
+#include "DeadlineTimer.h"
 #include "IoContext.h"
 #include "Log.h"
 #include "Resolver.h"
@@ -45,7 +46,7 @@ BNetRealmList* BNetRealmList::Instance()
 void BNetRealmList::Initialize(Trinity::Asio::IoContext& ioContext, uint32 updateInterval, uint16 worldListenPort)
 {
     _updateInterval = updateInterval;
-    _updateTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioContext);
+    _updateTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
     _resolver = Trinity::make_unique<boost::asio::ip::tcp_resolver>(ioContext);
 
     // Get the content of the realmlist table in the database
diff --git a/src/server/bnetserver/Realms/BNetRealmList.h b/src/server/bnetserver/Realms/BNetRealmList.h
index b4bdf59649f..7b035aab8e7 100644
--- a/src/server/bnetserver/Realms/BNetRealmList.h
+++ b/src/server/bnetserver/Realms/BNetRealmList.h
@@ -40,6 +40,7 @@ namespace Trinity
     namespace Asio
     {
         class IoContext;
+        class DeadlineTimer;
     }
 }
 
@@ -69,7 +70,7 @@ class BNetRealmList
 
         RealmMap _realms;
         uint32 _updateInterval;
-        std::unique_ptr<boost::asio::deadline_timer> _updateTimer;
+        std::unique_ptr<Trinity::Asio::DeadlineTimer> _updateTimer;
         std::unique_ptr<boost::asio::ip::tcp_resolver> _resolver;
         std::unique_ptr<WorldListener> _worldListener;
 };
diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp
index 1b14c23731d..9426dac2876 100644
--- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp	
+++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp	
@@ -165,7 +165,7 @@ bool ChaseMovementGenerator::Update(Unit* owner, uint32 diff)
             if (owner->IsHovering())
                 owner->UpdateAllowedPositionZ(x, y, z);
 
-            bool success = _path->CalculatePath(x, y, z, cOwner->CanFly());
+            bool success = _path->CalculatePath(x, y, z, owner->CanFly());
             if (!success || (_path->GetPathType() & (PATHFIND_NOPATH | PATHFIND_INCOMPLETE)))
             {
                 if (cOwner)