From f2456ff319b2145457da01ec78844fdc32d8713b Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 10 Nov 2021 00:01:50 +0100 Subject: Scripts/Areatriggers: Fixed all areatrigger scripts triggering both on enter and exit instead of only on enter --- src/server/game/Scripting/ScriptMgr.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/server/game/Scripting/ScriptMgr.h') diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 863661022af..1ab7fc54478 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -445,7 +445,10 @@ class TC_GAME_API AreaTriggerScript : public ScriptObject public: // Called when the area trigger is activated by a player. - virtual bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/, bool /*entered*/) { return false; } + virtual bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) { return false; } + + // Called when the area trigger is left by a player. + virtual bool OnExit(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) { return false; } }; class TC_GAME_API OnlyOnceAreaTriggerScript : public AreaTriggerScript @@ -453,10 +456,10 @@ class TC_GAME_API OnlyOnceAreaTriggerScript : public AreaTriggerScript using AreaTriggerScript::AreaTriggerScript; public: - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) final override; + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) final; protected: - virtual bool _OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) = 0; + virtual bool _OnTrigger(Player* player, AreaTriggerEntry const* trigger) = 0; void ResetAreaTriggerDone(InstanceScript* instance, uint32 triggerId); void ResetAreaTriggerDone(Player const* player, AreaTriggerEntry const* trigger); }; -- cgit v1.2.3