diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_durotar.cpp | 13 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_moonglade.cpp | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 05d31d88a3e..d9b0e2da887 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -1282,7 +1282,7 @@ public: void JustDied(Unit* /*killer*/) override { if (TempSummon* summon = me->ToTempSummon()) - if (Unit* summoner = summon->GetSummoner()) + if (Unit* summoner = summon->GetSummonerUnit()) if (summoner->IsAIEnabled()) summoner->GetAI()->DoAction(ACTION_FLESH_TENTACLE_KILLED); } diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index cb5f81e9ac2..9995c9fa1a4 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -122,7 +122,7 @@ class npc_tiger_matriarch_credit : public CreatureScript if (!(*itr)->IsSummon()) continue; - if (Unit* summoner = (*itr)->ToTempSummon()->GetSummoner()) + if (Unit* summoner = (*itr)->ToTempSummon()->GetSummonerUnit()) if (!summoner->HasAura(SPELL_NO_SUMMON_AURA) && !summoner->HasAura(SPELL_SUMMON_ZENTABRA_TRIGGER) && !summoner->IsInCombat()) { @@ -166,9 +166,10 @@ class npc_tiger_matriarch : public CreatureScript _events.ScheduleEvent(EVENT_NOSUMMON, 50s); } - void IsSummonedBy(Unit* summoner) override + void IsSummonedBy(WorldObject* summonerWO) override { - if (summoner->GetTypeId() != TYPEID_PLAYER || !summoner->GetVehicle()) + Player* summoner = summonerWO->ToPlayer(); + if (!summoner || !summoner->GetVehicle()) return; _tigerGuid = summoner->GetVehicle()->GetBase()->GetGUID(); @@ -184,7 +185,7 @@ class npc_tiger_matriarch : public CreatureScript if (victim->GetTypeId() != TYPEID_UNIT || !victim->IsSummon()) return; - if (Unit* vehSummoner = victim->ToTempSummon()->GetSummoner()) + if (Unit* vehSummoner = victim->ToTempSummon()->GetSummonerUnit()) { vehSummoner->RemoveAurasDueToSpell(SPELL_NO_SUMMON_AURA); vehSummoner->RemoveAurasDueToSpell(SPELL_DETECT_INVIS); @@ -203,7 +204,7 @@ class npc_tiger_matriarch : public CreatureScript { damage = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* vehSummoner = attacker->ToTempSummon()->GetSummoner()) + if (Unit* vehSummoner = attacker->ToTempSummon()->GetSummonerUnit()) { vehSummoner->AddAura(SPELL_SUMMON_ZENTABRA_TRIGGER, vehSummoner); vehSummoner->CastSpell(vehSummoner, SPELL_SUMMON_ZENTABRA, true); @@ -240,7 +241,7 @@ class npc_tiger_matriarch : public CreatureScript if (Unit* tiger = ObjectAccessor::GetUnit(*me, _tigerGuid)) { if (tiger->IsSummon()) - if (Unit* vehSummoner = tiger->ToTempSummon()->GetSummoner()) + if (Unit* vehSummoner = tiger->ToTempSummon()->GetSummonerUnit()) me->AddAura(SPELL_NO_SUMMON_AURA, vehSummoner); } _events.ScheduleEvent(EVENT_NOSUMMON, 50s); diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index a3631d92746..fc480b42418 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -145,7 +145,7 @@ public: Initialize(); } - void IsSummonedBy(Unit* /*summoner*/) override + void IsSummonedBy(WorldObject* /*summoner*/) override { std::list<Player*> playerOnQuestList; Trinity::AnyPlayerInObjectRangeCheck checker(me, 5.0f); |