Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Scripts: prevent some runtime errors

Browse Source
This commit is contained in:
joschiwald committed 2013-12-01 01:48:31 +01:00
1 parent 9015fee022
commit b375106ed1
5 files changed
+12 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+2 -35
View File
@@ -270,7 +270,7 @@ public:
return true;
}
void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE
void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) OVERRIDE
{
switch (eventId)
{
@@ -313,102 +313,71 @@ public:
{
case DATA_HIGHLORD_OMOKK:
return HighlordOmokk;
break;
case DATA_SHADOW_HUNTER_VOSHGAJIN:
return ShadowHunterVoshgajin;
break;
case DATA_WARMASTER_VOONE:
return WarMasterVoone;
break;
case DATA_MOTHER_SMOLDERWEB:
return MotherSmolderweb;
break;
case DATA_UROK_DOOMHOWL:
return UrokDoomhowl;
break;
case DATA_QUARTERMASTER_ZIGRIS:
return QuartermasterZigris;
break;
case DATA_GIZRUL_THE_SLAVENER:
return GizrultheSlavener;
break;
case DATA_HALYCON:
return Halycon;
break;
case DATA_OVERLORD_WYRMTHALAK:
return OverlordWyrmthalak;
break;
case DATA_PYROGAURD_EMBERSEER:
return PyroguardEmberseer;
break;
case DATA_WARCHIEF_REND_BLACKHAND:
return WarchiefRendBlackhand;
break;
case DATA_GYTH:
return Gyth;
break;
case DATA_THE_BEAST:
return TheBeast;
break;
case DATA_GENERAL_DRAKKISATH:
return GeneralDrakkisath;
break;
case GO_EMBERSEER_IN:
return go_emberseerin;
break;
case GO_DOORS:
return go_doors;
break;
case GO_EMBERSEER_OUT:
return go_emberseerout;
break;
case GO_HALL_RUNE_1:
return go_roomrunes[0];
break;
case GO_HALL_RUNE_2:
return go_roomrunes[1];
break;
case GO_HALL_RUNE_3:
return go_roomrunes[2];
break;
case GO_HALL_RUNE_4:
return go_roomrunes[3];
break;
case GO_HALL_RUNE_5:
return go_roomrunes[4];
break;
case GO_HALL_RUNE_6:
return go_roomrunes[5];
break;
case GO_HALL_RUNE_7:
return go_roomrunes[6];
break;
case GO_EMBERSEER_RUNE_1:
return go_emberseerrunes[0];
break;
case GO_EMBERSEER_RUNE_2:
return go_emberseerrunes[1];
break;
case GO_EMBERSEER_RUNE_3:
return go_emberseerrunes[2];
break;
case GO_EMBERSEER_RUNE_4:
return go_emberseerrunes[3];
break;
case GO_EMBERSEER_RUNE_5:
return go_emberseerrunes[4];
break;
case GO_EMBERSEER_RUNE_6:
return go_emberseerrunes[5];
break;
case GO_EMBERSEER_RUNE_7:
return go_emberseerrunes[6];
break;
case GO_PORTCULLIS_ACTIVE:
return go_portcullis_active;
break;
case GO_PORTCULLIS_TOBOSSROOMS:
return go_portcullis_tobossrooms;
default:
break;
}
return 0;
@@ -577,8 +546,6 @@ public:
protected:
EventMap Events;
uint32 encounter[EncounterCount];
std::string m_strInstData;
uint64 HighlordOmokk;
uint64 ShadowHunterVoshgajin;
uint64 WarMasterVoone;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
-1
View File
@@ -264,7 +264,6 @@ public:
if (Unit* player = me->SelectNearestPlayer(60.0f))
{
me->SetInFront(player);
me->SendMovementFlagUpdate();
Talk(SAY_SUCCESS);
if (GameObject* portcullis1 = me->FindNearestGameObject(GO_PORTCULLIS_ACTIVE, 65.0f))
portcullis1->SetGoState(GO_STATE_ACTIVE);
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+7 -4
View File
@@ -110,10 +110,13 @@ public:
void OnCreatureCreate(Creature* creature) OVERRIDE
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
_teamInInstance = player->GetTeam();
if (!_teamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
_teamInInstance = player->GetTeam();
}
switch (creature->GetEntry())
{
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+2 -2
View File
@@ -187,7 +187,7 @@ class boss_garfrost : public CreatureScript
switch (eventId)
{
case EVENT_THROW_SARONITE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
Talk(SAY_THROW_SARONITE, target->GetGUID());
DoCast(target, SPELL_THROW_SARONITE);
@@ -199,7 +199,7 @@ class boss_garfrost : public CreatureScript
events.ScheduleEvent(EVENT_CHILLING_WAVE, 40000, 0, PHASE_TWO);
break;
case EVENT_DEEP_FREEZE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
Talk(SAY_CAST_DEEP_FREEZE, target->GetGUID());
DoCast(target, SPELL_DEEP_FREEZE);
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ class instance_pit_of_saron : public InstanceMapScript
{
if (!_teamInInstance)
{
Map::PlayerList const &players = instance->GetPlayers();
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
_teamInInstance = player->GetTeam();