Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +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

2
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
View File

@@ -159,7 +159,7 @@ class at_baltharus_plateau : public OnlyOnceAreaTriggerScript
public:
at_baltharus_plateau() : OnlyOnceAreaTriggerScript("at_baltharus_plateau") { }
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
bool TryHandleOnce(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
// Only trigger once
if (InstanceScript* instance = player->GetInstanceScript())

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
View File

@@ -1007,7 +1007,7 @@ class at_lady_deathwhisper_entrance : public OnlyOnceAreaTriggerScript
public:
at_lady_deathwhisper_entrance() : OnlyOnceAreaTriggerScript("at_lady_deathwhisper_entrance") { }
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
bool TryHandleOnce(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (InstanceScript* instance = player->GetInstanceScript())
if (instance->GetBossState(DATA_LADY_DEATHWHISPER) != DONE)

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
View File

@@ -773,7 +773,7 @@ class at_lord_marrowgar_entrance : public OnlyOnceAreaTriggerScript
public:
at_lord_marrowgar_entrance() : OnlyOnceAreaTriggerScript("at_lord_marrowgar_entrance") { }
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
bool TryHandleOnce(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (InstanceScript* instance = player->GetInstanceScript())
if (Creature* lordMarrowgar = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_LORD_MARROWGAR)))

2
src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
View File

@@ -246,7 +246,7 @@ class at_anubrekhan_entrance : public OnlyOnceAreaTriggerScript
public:
at_anubrekhan_entrance() : OnlyOnceAreaTriggerScript("at_anubrekhan_entrance") { }
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
bool TryHandleOnce(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
InstanceScript* instance = player->GetInstanceScript();
if (!instance || instance->GetBossState(BOSS_ANUBREKHAN) != NOT_STARTED)

2
src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
View File

@@ -269,7 +269,7 @@ class at_faerlina_entrance : public OnlyOnceAreaTriggerScript
public:
at_faerlina_entrance() : OnlyOnceAreaTriggerScript("at_faerlina_entrance") { }
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
bool TryHandleOnce(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
InstanceScript* instance = player->GetInstanceScript();
if (!instance || instance->GetBossState(BOSS_FAERLINA) != NOT_STARTED)

2
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
View File

@@ -1218,7 +1218,7 @@ class at_thaddius_entrance : public OnlyOnceAreaTriggerScript
public:
at_thaddius_entrance() : OnlyOnceAreaTriggerScript("at_thaddius_entrance") { }
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
bool TryHandleOnce(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
InstanceScript* instance = player->GetInstanceScript();
if (!instance || instance->GetBossState(BOSS_THADDIUS) == DONE)

2
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
View File

@@ -432,7 +432,7 @@ class at_teron_gorefiend_entrance : public OnlyOnceAreaTriggerScript
public:
at_teron_gorefiend_entrance() : OnlyOnceAreaTriggerScript("at_teron_gorefiend_entrance") { }
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
bool TryHandleOnce(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (InstanceScript* instance = player->GetInstanceScript())
if (Creature* teron = instance->GetCreature(DATA_TERON_GOREFIEND))