josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Scripts: Fixed possible crashes in instance scripts (Icecrown Citadel and Naxxramas)

Browse Source 
Scripts/Sunwell Plateau: Fixed crash in Kil'jaeden
Scripts/Icecrown Citadel: Fixed crash in Blood-Queen Lana'thel

Closes issue #5051.
Closes issue #5050.
Closes issue #5035.

--HG--
branch : trunk
This commit is contained in:
Shauren
2010-12-08 17:24:31 +01:00
parent 611dc153b0
commit e4e048ed57
4 changed files with 74 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+8 -6
View File
@@ -724,8 +724,9 @@ public:
if (Speeches[speechCount].timer < SpeechTimer) if (Speeches[speechCount].timer < SpeechTimer)
{ {
SpeechTimer = 0; SpeechTimer = 0;
if (Creature* pSpeechCreature = Unit::GetCreature(*me, pInstance->GetData64(Speeches[speechCount].pCreature))) if (pInstance)
DoScriptText(Speeches[speechCount].textid, pSpeechCreature); if (Creature* pSpeechCreature = Unit::GetCreature(*me, pInstance->GetData64(Speeches[speechCount].pCreature)))
DoScriptText(Speeches[speechCount].textid, pSpeechCreature);
if (speechCount == 12) if (speechCount == 12)
if (Creature* pAnveena = Unit::GetCreature(*me, pInstance->GetData64(DATA_ANVEENA))) if (Creature* pAnveena = Unit::GetCreature(*me, pInstance->GetData64(DATA_ANVEENA)))
pAnveena->CastSpell(me, SPELL_SACRIFICE_OF_ANVEENA, false); pAnveena->CastSpell(me, SPELL_SACRIFICE_OF_ANVEENA, false);
@@ -826,18 +827,19 @@ public:
} }
break; break;
case TIMER_ORBS_EMPOWER: //Phase 3 case TIMER_ORBS_EMPOWER: //Phase 3
if (Creature* pKalec = Unit::GetCreature(*me, pInstance->GetData64(DATA_KALECGOS_KJ))) if (pInstance)
{ if (Creature* pKalec = Unit::GetCreature(*me, pInstance->GetData64(DATA_KALECGOS_KJ)))
switch (Phase)
{ {
switch (Phase)
{
case PHASE_SACRIFICE: case PHASE_SACRIFICE:
CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->EmpowerOrb(true); CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->EmpowerOrb(true);
break; break;
default: default:
CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->EmpowerOrb(false); CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->EmpowerOrb(false);
break; break;
}
} }
}
OrbActivated = true; OrbActivated = true;
TimerIsDeactivated[TIMER_ORBS_EMPOWER] = true; TimerIsDeactivated[TIMER_ORBS_EMPOWER] = true;
break; break;
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+2 -1
View File
@@ -307,6 +307,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
std::list<Player*> targets; std::list<Player*> targets;
SelectRandomTarget(false, &targets); SelectRandomTarget(false, &targets);
uint32 targetCount = 2; uint32 targetCount = 2;
// do not combine these checks! we want it incremented TWICE when both conditions are met
if (IsHeroic()) if (IsHeroic())
++targetCount; ++targetCount;
if (Is25ManRaid()) if (Is25ManRaid())
@@ -401,7 +402,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
} }
std::list<Player*>::iterator itr = tempTargets.begin(); std::list<Player*>::iterator itr = tempTargets.begin();
std::advance(itr, urand(1, tempTargets.size()-1)); std::advance(itr, urand(0, tempTargets.size()-1));
return *itr; return *itr;
} }
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+28
View File
@@ -255,6 +255,34 @@ class instance_icecrown_citadel : public InstanceMapScript
} }
} }
void OnGameObjectRemove(GameObject* go)
{
switch (go->GetEntry())
{
case GO_DOODAD_ICECROWN_ICEWALL02:
case GO_ICEWALL:
case GO_LORD_MARROWGAR_S_ENTRANCE:
case GO_ORATORY_OF_THE_DAMNED_ENTRANCE:
case GO_ORANGE_PLAGUE_MONSTER_ENTRANCE:
case GO_GREEN_PLAGUE_MONSTER_ENTRANCE:
case GO_SCIENTIST_ENTRANCE:
case GO_CRIMSON_HALL_DOOR:
case GO_BLOOD_ELF_COUNCIL_DOOR:
case GO_BLOOD_ELF_COUNCIL_DOOR_RIGHT:
case GO_DOODAD_ICECROWN_BLOODPRINCE_DOOR_01:
case GO_DOODAD_ICECROWN_GRATE_01:
case GO_GREEN_DRAGON_BOSS_ENTRANCE:
case GO_GREEN_DRAGON_BOSS_EXIT:
case GO_SINDRAGOSA_ENTRANCE_DOOR:
case GO_SINDRAGOSA_SHORTCUT_ENTRANCE_DOOR:
case GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR:
AddDoor(go, false);
break;
default:
break;
}
}
uint64 GetData64(uint32 type) uint64 GetData64(uint32 type)
{ {
switch (type) switch (type)
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+36 -15
View File
@@ -173,19 +173,35 @@ public:
return; return;
} }
switch(go->GetEntry()) switch (go->GetEntry())
{ {
case GO_GOTHIK_GATE: case GO_GOTHIK_GATE:
GothikGateGUID = go->GetGUID(); GothikGateGUID = go->GetGUID();
go->SetGoState(gothikDoorState); go->SetGoState(gothikDoorState);
break; break;
case GO_HORSEMEN_CHEST: HorsemenChestGUID = go->GetGUID(); break; case GO_HORSEMEN_CHEST:
case GO_HORSEMEN_CHEST_HERO: HorsemenChestGUID = go->GetGUID(); break; HorsemenChestGUID = go->GetGUID();
case GO_KELTHUZAD_PORTAL01: uiPortals[0] = go->GetGUID(); break; break;
case GO_KELTHUZAD_PORTAL02: uiPortals[1] = go->GetGUID(); break; case GO_HORSEMEN_CHEST_HERO:
case GO_KELTHUZAD_PORTAL03: uiPortals[2] = go->GetGUID(); break; HorsemenChestGUID = go->GetGUID();
case GO_KELTHUZAD_PORTAL04: uiPortals[3] = go->GetGUID(); break; break;
case GO_KELTHUZAD_TRIGGER: uiKelthuzadTrigger = go->GetGUID(); break; case GO_KELTHUZAD_PORTAL01:
uiPortals[0] = go->GetGUID();
break;
case GO_KELTHUZAD_PORTAL02:
uiPortals[1] = go->GetGUID();
break;
case GO_KELTHUZAD_PORTAL03:
uiPortals[2] = go->GetGUID();
break;
case GO_KELTHUZAD_PORTAL04:
uiPortals[3] = go->GetGUID();
break;
case GO_KELTHUZAD_TRIGGER:
uiKelthuzadTrigger = go->GetGUID();
break;
default:
break;
} }
AddDoor(go, true); AddDoor(go, true);
@@ -201,16 +217,21 @@ public:
return; return;
} }
switch(go->GetEntry()) switch (go->GetEntry())
{ {
case GO_BIRTH: case GO_BIRTH:
if (SapphironGUID) if (SapphironGUID)
{ {
if (Creature* pSapphiron = instance->GetCreature(SapphironGUID)) if (Creature* pSapphiron = instance->GetCreature(SapphironGUID))
pSapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); pSapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH);
return; return;
} }
break;
default:
break;
} }
AddDoor(go, false);
} }
void SetData(uint32 id, uint32 value) void SetData(uint32 id, uint32 value)