Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +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

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))