diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-05-23 21:08:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 21:08:29 +0200 |
| commit | 797fba98e95da1236465a15061ec4122d7ec33fe (patch) | |
| tree | 2ebd1df31f8bd2573cdb65683e0966b4e3c97a43 /src/server/scripts/Pet | |
| parent | 457fc224733cc78cedc5e956442a9f5d7bd2f049 (diff) | |
3.3.5 gameobject summoner (#23289)
* Scripts/Misc: Change IsSummonedBy(Unit*) to IsSummonedBy(WorldObject*)
* Scripts/Misc: Fix build
* Core/TempSummons: Rename GetSummoner() to GetSummonerUnit()
* Core/TempSummons: Add support to TempSummons::GetSummoner() to return GameObject too
* Fix build
* Core/TempSummons: Allow GameObject to be owner of TempSummon
* Core/TempSummons: Add support to SAI for GameObject owner of TempSummon
* Scripts/Misc: Fix no-pch build
* Core/TempSummons: Implement PR comments
Diffstat (limited to 'src/server/scripts/Pet')
| -rw-r--r-- | src/server/scripts/Pet/pet_hunter.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Pet/pet_priest.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index e3828e4be8c..3bfa8c1b5a3 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -92,7 +92,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript if (me->IsSummon() && !me->GetThreatManager().GetFixateTarget()) { // find new target - Unit* summoner = me->ToTempSummon()->GetSummoner(); + Unit* summoner = me->ToTempSummon()->GetSummonerUnit(); std::vector<Unit*> targets; for (std::pair<ObjectGuid const, PvPCombatReference*> const& pair : summoner->GetCombatManager().GetPvPCombatRefs()) diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp index bc560f83362..0198c4bc542 100644 --- a/src/server/scripts/Pet/pet_priest.cpp +++ b/src/server/scripts/Pet/pet_priest.cpp @@ -70,8 +70,12 @@ class npc_pet_pri_shadowfiend : public CreatureScript { npc_pet_pri_shadowfiendAI(Creature* creature) : PetAI(creature) { } - void IsSummonedBy(Unit* summoner) override + void IsSummonedBy(WorldObject* summonerWO) override { + Unit* summoner = summonerWO->ToUnit(); + if (!summoner) + return; + if (summoner->HasAura(SPELL_PRIEST_GLYPH_OF_SHADOWFIEND)) DoCastAOE(SPELL_PRIEST_SHADOWFIEND_DEATH); } |