From 36a1d00444b35d6f8fbfaabebf835f4ad9c01108 Mon Sep 17 00:00:00 2001
From: ccrs <ccrs@users.noreply.github.com>
Date: Fri, 17 May 2019 01:07:27 +0200
Subject: Core/Movement: implement MotionMasterDelayedAction validator

(cherry picked from commit b2b85dedb6fe1ad120c9f3eeb280fc65da360dd5)
---
 src/server/game/Movement/MotionMaster.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index afe61a6dd55..18c6e5c157f 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -82,14 +82,21 @@ struct MovementGeneratorInformation
     std::string TargetName;
 };
 
+static bool EmptyValidator()
+{
+    return true;
+}
+
 class MotionMasterDelayedAction
 {
     public:
-        explicit MotionMasterDelayedAction(std::function<void()>&& action, MotionMasterDelayedActionType type) : Action(std::move(action)), Type(type) { }
+        explicit MotionMasterDelayedAction(std::function<void()>&& action, std::function<bool()>&& validator, MotionMasterDelayedActionType type) : Action(std::move(action)), Validator(std::move(validator)), Type(type) { }
+        explicit MotionMasterDelayedAction(std::function<void()>&& action, MotionMasterDelayedActionType type) : Action(std::move(action)), Validator(EmptyValidator), Type(type) { }
         ~MotionMasterDelayedAction() { }
 
-        void Resolve() { Action(); }
+        void Resolve() { if (Validator()) Action(); }
 
+        std::function<bool()> Validator;
         std::function<void()> Action;
         uint8 Type;
 };
-- 
cgit v1.2.3