sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Spells): Fixed Glyph of Kilrogg. (#13802)

Browse Source 
Fixes #13623
This commit is contained in:
UltraNix
2022-11-16 05:26:05 +01:00
committed by GitHub
parent a490a9ac31
commit ae84bf67c4
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+18
View File
@@ -16681,11 +16681,29 @@ void Unit::TriggerAurasProcOnEvent(ProcEventInfo& eventInfo, std::list<AuraAppli
Player* Unit::GetSpellModOwner() const Player* Unit::GetSpellModOwner() const
{ {
if (Player* player = const_cast<Unit*>(this)->ToPlayer()) if (Player* player = const_cast<Unit*>(this)->ToPlayer())
{
return player; return player;
}
if (Unit* owner = GetOwner()) if (Unit* owner = GetOwner())
{
if (Player* player = owner->ToPlayer()) if (Player* player = owner->ToPlayer())
{
return player; return player;
}
}
// Special handling for Eye of Kilrogg
if (GetEntry() == NPC_EYE_OF_KILROGG)
{
if (TempSummon const* tempSummon = ToTempSummon())
{
if (Unit* summoner = tempSummon->GetSummonerUnit())
{
return summoner->ToPlayer();
}
}
}
return nullptr; return nullptr;
} }
src/server/scripts/Spells/spell_warlock.cpp
+5 -5
View File
@@ -62,7 +62,8 @@ enum WarlockSpells
SPELL_WARLOCK_SIPHON_LIFE_HEAL = 63106, SPELL_WARLOCK_SIPHON_LIFE_HEAL = 63106,
SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL = 31117, SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL = 31117,
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_R1 = 18213, SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_R1 = 18213,
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_PROC = 18371 SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_PROC = 18371,
SPELL_WARLOCK_EYE_OF_KILROGG_FLY = 58083
}; };
enum WarlockSpellIcons enum WarlockSpellIcons
@@ -84,14 +85,13 @@ class spell_warl_eye_of_kilrogg : public AuraScript
// Glyph of Kilrogg // Glyph of Kilrogg
if (player->HasAura(58081)) if (player->HasAura(58081))
{
if (Unit* charm = player->GetCharm()) if (Unit* charm = player->GetCharm())
{ {
charm->SetSpeed(MOVE_RUN, 2.14f, true);
if (charm->GetMapId() == 530 || charm->GetMapId() == 571) if (charm->GetMapId() == 530 || charm->GetMapId() == 571)
{ {
charm->SetCanFly(true); charm->CastSpell(charm, SPELL_WARLOCK_EYE_OF_KILROGG_FLY, true);
charm->SetSpeed(MOVE_FLIGHT, 2.14f, true); }
charm->SendMovementFlagUpdate();
} }
} }
} }