aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/World
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2021-11-10 00:01:50 +0100
committerShauren <shauren.trinity@gmail.com>2021-11-10 00:01:50 +0100
commitf2456ff319b2145457da01ec78844fdc32d8713b (patch)
tree4e15da5dd1b08356a575071a6926fb50ff9f4d20 /src/server/scripts/World
parent938c7e518c7831637509c61764bfc50bae0a22dc (diff)
Scripts/Areatriggers: Fixed all areatrigger scripts triggering both on enter and exit instead of only on enter
Diffstat (limited to 'src/server/scripts/World')
-rw-r--r--src/server/scripts/World/areatrigger_scripts.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index dcde8ef2c7c..7fc6360b3de 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -60,7 +60,7 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript
public:
AreaTrigger_at_coilfang_waterfall() : AreaTriggerScript("at_coilfang_waterfall") { }
- bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (GameObject* go = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f))
if (go->getLootState() == GO_READY)
@@ -88,7 +88,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript
public:
AreaTrigger_at_legion_teleporter() : AreaTriggerScript("at_legion_teleporter") { }
- bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (player->IsAlive() && !player->IsInCombat())
{
@@ -126,7 +126,7 @@ class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript
public:
AreaTrigger_at_stormwright_shelf() : AreaTriggerScript("at_stormwright_shelf") { }
- bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (!player->isDead() && player->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE)
player->CastSpell(player, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false);
@@ -150,7 +150,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript
public:
AreaTrigger_at_scent_larkorwi() : AreaTriggerScript("at_scent_larkorwi") { }
- bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE)
{
@@ -184,7 +184,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript
public:
AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") { }
- bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override
{
if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE ||
(player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED)))
@@ -221,7 +221,7 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript
public:
AreaTrigger_at_nats_landing() : AreaTriggerScript("at_nats_landing") { }
- bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (!player->IsAlive() || !player->HasAura(SPELL_FISH_PASTE))
return false;
@@ -266,7 +266,7 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript
_triggerTimes[AT_BREWFEST_DUROTAR] = _triggerTimes[AT_BREWFEST_DUN_MOROGH] = 0;
}
- bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override
{
uint32 triggerId = areaTrigger->ID;
// Second trigger happened too early after first, skip for now
@@ -319,7 +319,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript
_triggerTimes[AT_AREA_52_SOUTH] = _triggerTimes[AT_AREA_52_NORTH] = _triggerTimes[AT_AREA_52_WEST] = _triggerTimes[AT_AREA_52_EAST] = 0;
}
- bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override
{
float x = 0.0f, y = 0.0f, z = 0.0f;
@@ -390,7 +390,7 @@ public:
stormforgedEradictorGUID.Clear();
}
- bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override
+ bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (player->GetQuestStatus(QUEST_THE_LONESOME_WATCHER) != QUEST_STATUS_INCOMPLETE)
return false;