Permalink
Browse files

Merge pull request #5975 from GyxTom/master

Core/Script: Code style and some rewriting.
  • Loading branch information...
2 parents 00264e4 + a1c4786 commit f66087c58c2b27c21cfaa848af67a0fea7f8dae1 @jasperrietrae jasperrietrae committed Apr 1, 2012
Showing with 416 additions and 470 deletions.
  1. +1 −1 src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
  2. +1 −1 src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
  3. +2 −2 src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
  4. +1 −1 src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
  5. +8 −8 src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
  6. +1 −1 src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
  7. +2 −2 src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
  8. +1 −1 src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
  9. +2 −2 src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
  10. +5 −5 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
  11. +12 −12 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
  12. +5 −5 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
  13. +3 −3 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
  14. +6 −6 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
  15. +2 −2 src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
  16. +1 −1 src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
  17. +2 −6 src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
  18. +2 −6 src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
  19. +1 −1 src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
  20. +8 −8 src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
  21. +7 −11 src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
  22. +1 −1 src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
  23. +2 −2 src/server/scripts/EasternKingdoms/stormwind_city.cpp
  24. +1 −1 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
  25. +2 −2 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
  26. +1 −1 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
  27. +1 −1 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
  28. +1 −1 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
  29. +2 −2 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
  30. +16 −16 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
  31. +1 −1 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
  32. +2 −2 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
  33. +1 −5 src/server/scripts/Kalimdor/ashenvale.cpp
  34. +1 −1 src/server/scripts/Kalimdor/boss_azuregos.cpp
  35. +1 −1 src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
  36. +2 −2 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
  37. +3 −3 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
  38. +4 −4 src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
  39. +14 −16 src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
  40. +1 −1 src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
  41. +4 −4 src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
  42. +1 −1 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
  43. +6 −6 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
  44. +3 −4 src/server/scripts/Northrend/sholazar_basin.cpp
  45. +18 −18 src/server/scripts/Northrend/storm_peaks.cpp
  46. +1 −1 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
  47. +2 −2 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
  48. +1 −1 src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
  49. +6 −6 src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
  50. +1 −1 src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
  51. +2 −2 src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
  52. +1 −1 src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
  53. +4 −4 src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
  54. +3 −3 src/server/scripts/Outland/BlackTemple/illidari_council.cpp
  55. +7 −7 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
  56. +2 −2 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
  57. +2 −2 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
  58. +1 −1 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
  59. +5 −5 src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
  60. +2 −2 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
  61. +1 −1 src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
  62. +1 −1 src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
  63. +6 −6 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
  64. +5 −5 src/server/scripts/Outland/netherstorm.cpp
  65. +171 −206 src/server/scripts/Outland/shadowmoon_valley.cpp
  66. +30 −30 src/server/scripts/World/npcs_special.cpp
@@ -274,7 +274,7 @@ void ScriptedAI::DoResetThreat()
for (std::list<HostileReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
- Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid());
+ Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (unit && DoGetThreat(unit))
DoModifyThreatPercent(unit, -100);
@@ -245,7 +245,7 @@ class boss_chromaggus : public CreatureScript
Unit* unit;
if ((*i) && (*i)->getSource())
{
- unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
+ unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit)
{
//Cast affliction
@@ -176,9 +176,9 @@ class boss_vaelastrasz : public CreatureScript
break;
case 2:
me->setFaction(103);
- if (PlayerGUID && Unit::GetUnit((*me), PlayerGUID))
+ if (PlayerGUID && Unit::GetUnit(*me, PlayerGUID))
{
- AttackStart(Unit::GetUnit((*me), PlayerGUID));
+ AttackStart(Unit::GetUnit(*me, PlayerGUID));
DoCast(me, SPELL_ESSENCEOFTHERED);
}
SpeechTimer = 0;
@@ -127,7 +127,7 @@ class boss_mr_smite : public CreatureScript
DoCastAOE(SPELL_SMITE_STOMP, false);
SetCombatMovement(false);
if (instance)
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_SMITE_CHEST)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_SMITE_CHEST)))
{
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MovePoint(1, go->GetPositionX() - 3.0f, go->GetPositionY(), go->GetPositionZ());
@@ -189,11 +189,11 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
if (bBool)
{
if (instance)
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
instance->HandleGameObject(0, false, go);
}else
if (instance)
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
instance->HandleGameObject(0, false, go);
}
@@ -204,10 +204,10 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
if (bBool)
{
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
me->SetFacingToObject(go);
}else
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
me->SetFacingToObject(go);
}
@@ -216,10 +216,10 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
if (!instance)
return;
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
instance->HandleGameObject(0, false, go);
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
instance->HandleGameObject(0, false, go);
if (!GoSummonList.empty())
@@ -445,7 +445,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
DoScriptText(SAY_BLASTMASTER_5, me);
Summon(1);
if (instance)
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
instance->HandleGameObject(0, true, go);
NextStep(3000, true);
break;
@@ -491,7 +491,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
DoScriptText(SAY_BLASTMASTER_23, me);
SetInFace(false);
if (instance)
- if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
+ if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
instance->HandleGameObject(0, true, go);
NextStep(2000, true);
break;
@@ -358,7 +358,7 @@ struct boss_moroes_guestAI : public ScriptedAI
uint64 TempGUID = GuestGUID[rand()%4];
if (TempGUID)
{
- Unit* unit = Unit::GetUnit((*me), TempGUID);
+ Unit* unit = Unit::GetUnit(*me, TempGUID);
if (unit && unit->isAlive())
return unit;
}
@@ -101,7 +101,7 @@ class mob_kilrek : public CreatureScript
uint64 TerestianGUID = instance->GetData64(DATA_TERESTIAN);
if (TerestianGUID)
{
- Unit* Terestian = Unit::GetUnit((*me), TerestianGUID);
+ Unit* Terestian = Unit::GetUnit(*me, TerestianGUID);
if (Terestian && Terestian->isAlive())
DoCast(Terestian, SPELL_BROKEN_PACT, true);
}
@@ -157,7 +157,7 @@ class mob_demon_chain : public CreatureScript
{
if (SacrificeGUID)
{
- Unit* Sacrifice = Unit::GetUnit((*me), SacrificeGUID);
+ Unit* Sacrifice = Unit::GetUnit(*me, SacrificeGUID);
if (Sacrifice)
Sacrifice->RemoveAurasDueToSpell(SPELL_SACRIFICE);
}
@@ -886,7 +886,7 @@ class boss_bigbadwolf : public CreatureScript
{
IsChasing = false;
- if (Unit* target = Unit::GetUnit((*me), HoodGUID))
+ if (Unit* target = Unit::GetUnit(*me, HoodGUID))
{
HoodGUID = 0;
if (DoGetThreat(target))
@@ -536,7 +536,7 @@ class npc_image_of_medivh : public CreatureScript
uint32 NextStep(uint32 Step)
{
- Unit* arca = Unit::GetUnit((*me), ArcanagosGUID);
+ Unit* arca = Unit::GetUnit(*me, ArcanagosGUID);
Map* map = me->GetMap();
switch (Step)
{
@@ -625,7 +625,7 @@ class npc_image_of_medivh : public CreatureScript
if (Step >= 7 && Step <= 12)
{
- Unit* arca = Unit::GetUnit((*me), ArcanagosGUID);
+ Unit* arca = Unit::GetUnit(*me, ArcanagosGUID);
if (FireArcanagosTimer <= diff)
{
@@ -197,7 +197,7 @@ class boss_felblood_kaelthas : public CreatureScript
std::list<HostileReference*>::const_iterator i = m_threatlist.begin();
for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
{
- Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
+ Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && unit->isAlive())
{
float threat = me->getThreatManager().getThreat(unit);
@@ -215,7 +215,7 @@ class boss_felblood_kaelthas : public CreatureScript
std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i)
{
- Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
+ Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
unit->CastSpell(unit, SPELL_TELEPORT_CENTER, true);
}
@@ -227,7 +227,7 @@ class boss_felblood_kaelthas : public CreatureScript
std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i)
{
- Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
+ Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
// Knockback into the air
unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, me->GetGUID());
@@ -239,7 +239,7 @@ class boss_felblood_kaelthas : public CreatureScript
std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i)
{
- Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
+ Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
{
// Also needs an exception in spell system.
@@ -259,7 +259,7 @@ class boss_felblood_kaelthas : public CreatureScript
std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i)
{
- Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
+ Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
{
unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY);
@@ -627,48 +627,48 @@ class npc_a_special_surprise : public CreatureScript
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
}
- bool MeetQuestCondition(Unit* player)
+ bool MeetQuestCondition(Player* player)
{
switch (me->GetEntry())
{
case 29061: // Ellen Stanbridge
- if (CAST_PLR(player)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29072: // Kug Ironjaw
- if (CAST_PLR(player)->GetQuestStatus(12748) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12748) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29067: // Donovan Pulfrost
- if (CAST_PLR(player)->GetQuestStatus(12744) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12744) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29065: // Yazmina Oakenthorn
- if (CAST_PLR(player)->GetQuestStatus(12743) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12743) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29071: // Antoine Brack
- if (CAST_PLR(player)->GetQuestStatus(12750) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12750) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29032: // Malar Bravehorn
- if (CAST_PLR(player)->GetQuestStatus(12739) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12739) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29068: // Goby Blastenheimer
- if (CAST_PLR(player)->GetQuestStatus(12745) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12745) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29073: // Iggy Darktusk
- if (CAST_PLR(player)->GetQuestStatus(12749) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12749) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29074: // Lady Eonys
- if (CAST_PLR(player)->GetQuestStatus(12747) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12747) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29070: // Valok the Righteous
- if (CAST_PLR(player)->GetQuestStatus(12746) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(12746) == QUEST_STATUS_INCOMPLETE)
return true;
break;
}
@@ -681,7 +681,7 @@ class npc_a_special_surprise : public CreatureScript
if (PlayerGUID || who->GetTypeId() != TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE))
return;
- if (MeetQuestCondition(who))
+ if (MeetQuestCondition(who->ToPlayer()))
PlayerGUID = who->GetGUID();
}
@@ -348,7 +348,7 @@ class mob_head : public CreatureScript
if (wait <= diff)
{
die = false;
- if (Unit* body = Unit::GetUnit((*me), bodyGUID))
+ if (Unit* body = Unit::GetUnit(*me, bodyGUID))
body->Kill(body);
me->Kill(me);
}
@@ -475,7 +475,7 @@ class boss_headless_horseman : public CreatureScript
wp_reached = false;
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
SaySound(SAY_ENTRANCE);
- if (Unit* player = Unit::GetUnit((*me), PlayerGUID))
+ if (Unit* player = Unit::GetUnit(*me, PlayerGUID))
DoStartMovement(player);
break;
}
@@ -586,7 +586,7 @@ class boss_headless_horseman : public CreatureScript
std::list<HostileReference*>::const_iterator itr;
for (itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr)
{
- Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid());
+ Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (unit && unit->isAlive() && unit != caster)
me->AddThreat(unit, caster->getThreatManager().getThreat(unit));
}
@@ -606,7 +606,7 @@ class boss_headless_horseman : public CreatureScript
if (!headGUID)
headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6), 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0)->GetGUID();
- Unit* Head = Unit::GetUnit((*me), headGUID);
+ Unit* Head = Unit::GetUnit(*me, headGUID);
if (Head && Head->isAlive())
{
Head->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -817,7 +817,7 @@ class mob_pulsing_pumpkin : public CreatureScript
if (!debuffGUID)
return;
- Unit* debuff = Unit::GetUnit((*me), debuffGUID);
+ Unit* debuff = Unit::GetUnit(*me, debuffGUID);
if (debuff)
{
debuff->SetVisible(false);
@@ -132,7 +132,7 @@ class boss_scarlet_commander_mograine : public CreatureScript
return;
//On first death, fake death and open door, as well as initiate whitemane if exist
- if (Unit* Whitemane = Unit::GetUnit((*me), instance->GetData64(DATA_WHITEMANE)))
+ if (Unit* Whitemane = Unit::GetUnit(*me, instance->GetData64(DATA_WHITEMANE)))
{
instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS);
@@ -181,7 +181,7 @@ class boss_scarlet_commander_mograine : public CreatureScript
if (_bHasDied && !_bHeal && instance && instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == SPECIAL)
{
//On ressurection, stop fake death and heal whitemane and resume fight
- if (Unit* Whitemane = Unit::GetUnit((*me), instance->GetData64(DATA_WHITEMANE)))
+ if (Unit* Whitemane = Unit::GetUnit(*me, instance->GetData64(DATA_WHITEMANE)))
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetStandState(UNIT_STAND_STATE_STAND);
@@ -292,7 +292,7 @@ class boss_high_inquisitor_whitemane : public CreatureScript
//When casting resuruction make sure to delay so on rez when reinstate battle deepsleep runs out
if (instance && Wait_Timer <= diff)
{
- if (Unit* Mograine = Unit::GetUnit((*me), instance->GetData64(DATA_MOGRAINE)))
+ if (Unit* Mograine = Unit::GetUnit(*me, instance->GetData64(DATA_MOGRAINE)))
{
DoCast(Mograine, SPELL_SCARLETRESURRECTION);
DoScriptText(SAY_WH_RESSURECT, me);
Oops, something went wrong.

0 comments on commit f66087c

Please sign in to comment.