Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/AreaTrigger: Rename OnlyOnceAreaTriggerScript::_OnTrigger to TryHandleOnce, and make its return value useful.

Browse Source 
(cherry picked from commit 0c7f6ac89f)
This commit is contained in:
Treeston
2020-09-07 18:25:39 +02:00
committed by Shauren
parent 91f6163858
commit 358dc78e47
9 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/game/Scripting/ScriptMgr.cpp
View File

@@ -2439,14 +2439,14 @@ AreaTriggerScript::AreaTriggerScript(char const* name)
bool OnlyOnceAreaTriggerScript::OnTrigger(Player* player, AreaTriggerEntry const* trigger)
{
uint32 const triggerId = trigger->ID;
if (InstanceScript* instance = player->GetInstanceScript())
{
if (instance->IsAreaTriggerDone(triggerId))
return true;
else
instance->MarkAreaTriggerDone(triggerId);
}
return _OnTrigger(player, trigger);
InstanceScript* instance = player->GetInstanceScript();
if (instance && instance->IsAreaTriggerDone(triggerId))
return true;
if (TryHandleOnce(player, trigger) && instance)
instance->MarkAreaTriggerDone(triggerId);
return true;
}
void OnlyOnceAreaTriggerScript::ResetAreaTriggerDone(InstanceScript* script, uint32 triggerId) { script->ResetAreaTriggerDone(triggerId); }
void OnlyOnceAreaTriggerScript::ResetAreaTriggerDone(Player const* player, AreaTriggerEntry const* trigger) { if (InstanceScript* instance = player->GetInstanceScript()) ResetAreaTriggerDone(instance, trigger->ID); }

7
src/server/game/Scripting/ScriptMgr.h
View File

@@ -469,9 +469,10 @@ class TC_GAME_API OnlyOnceAreaTriggerScript : public AreaTriggerScript
bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) final;
protected:
virtual bool _OnTrigger(Player* player, AreaTriggerEntry const* trigger) = 0;
void ResetAreaTriggerDone(InstanceScript* instance, uint32 triggerId);
void ResetAreaTriggerDone(Player const* player, AreaTriggerEntry const* trigger);
// returns true if the trigger was successfully handled, false if we should try again next time
virtual bool TryHandleOnce(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) = 0;
void ResetAreaTriggerDone(InstanceScript* /*instance*/, uint32 /*triggerId*/);
void ResetAreaTriggerDone(Player const* /*player*/, AreaTriggerEntry const* /*trigger*/);
};
class TC_GAME_API BattlefieldScript : public ScriptObject