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

Core/Script: Fixed possible crash when medivh is spawned outside instance

Browse Source
This commit is contained in:
Yehonal
2016-09-15 22:04:01 +02:00
parent ca510dfd8d
commit b618027b3b
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
+23 -14
View File
@@ -119,7 +119,9 @@ public:
void JustSummoned(Creature* summon) void JustSummoned(Creature* summon)
{ {
instance->SetData64(DATA_SUMMONED_NPC, summon->GetGUID()); if (instance)
instance->SetData64(DATA_SUMMONED_NPC, summon->GetGUID());
if (summon->GetEntry() == NPC_DP_CRYSTAL_STALKER) if (summon->GetEntry() == NPC_DP_CRYSTAL_STALKER)
{ {
summon->DespawnOrUnsummon(25000); summon->DespawnOrUnsummon(25000);
@@ -138,18 +140,21 @@ public:
void SummonedCreatureDespawn(Creature* summon) void SummonedCreatureDespawn(Creature* summon)
{ {
instance->SetData64(DATA_DELETED_NPC, summon->GetGUID()); if (instance)
instance->SetData64(DATA_DELETED_NPC, summon->GetGUID());
} }
void MoveInLineOfSight(Unit* who) void MoveInLineOfSight(Unit* who)
{ {
if (!events.Empty() || instance->GetData(TYPE_AEONUS) == DONE) if (!events.Empty() || (instance && instance->GetData(TYPE_AEONUS) == DONE))
return; return;
if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 20.0f)) if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 20.0f))
{ {
Talk(SAY_ENTER); Talk(SAY_ENTER);
instance->SetData(DATA_MEDIVH, 1); if (instance)
instance->SetData(DATA_MEDIVH, 1);
me->CastSpell(me, SPELL_MEDIVH_CHANNEL, false); me->CastSpell(me, SPELL_MEDIVH_CHANNEL, false);
events.ScheduleEvent(EVENT_CHECK_HEALTH_75, 500); events.ScheduleEvent(EVENT_CHECK_HEALTH_75, 500);
@@ -191,7 +196,7 @@ public:
case EVENT_CHECK_HEALTH_25: case EVENT_CHECK_HEALTH_25:
case EVENT_CHECK_HEALTH_50: case EVENT_CHECK_HEALTH_50:
case EVENT_CHECK_HEALTH_75: case EVENT_CHECK_HEALTH_75:
if (instance->GetData(DATA_SHIELD_PERCENT) <= eventId*25) if (instance && instance->GetData(DATA_SHIELD_PERCENT) <= eventId*25)
{ {
Talk(eventId-1); Talk(eventId-1);
break; break;
@@ -293,7 +298,7 @@ public:
void Reset() void Reset()
{ {
if (instance->GetData(DATA_RIFT_NUMBER) >= 18) if (instance && instance->GetData(DATA_RIFT_NUMBER) >= 18)
{ {
me->DespawnOrUnsummon(30000); me->DespawnOrUnsummon(30000);
return; return;
@@ -313,13 +318,15 @@ public:
Position pos; Position pos;
me->GetNearPosition(pos, 10.0f, 2*M_PI*rand_norm()); me->GetNearPosition(pos, 10.0f, 2*M_PI*rand_norm());
if (Creature* summon = me->SummonCreature(entry, pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000)) if (Creature* summon = me->SummonCreature(entry, pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 150000))
if (Unit* medivh = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_MEDIVH))) if (instance) {
{ if (Unit* medivh = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_MEDIVH)))
float o = medivh->GetAngle(summon)+frand(-1.0f, 1.0f); {
summon->SetHomePosition(medivh->GetPositionX() + 14.0f*cos(o), medivh->GetPositionY() + 14.0f*sin(o), medivh->GetPositionZ(), summon->GetAngle(medivh)); float o = medivh->GetAngle(summon) + frand(-1.0f, 1.0f);
summon->GetMotionMaster()->MoveTargetedHome(); summon->SetHomePosition(medivh->GetPositionX() + 14.0f*cos(o), medivh->GetPositionY() + 14.0f*sin(o), medivh->GetPositionZ(), summon->GetAngle(medivh));
summon->SetReactState(REACT_DEFENSIVE); summon->GetMotionMaster()->MoveTargetedHome();
summon->SetReactState(REACT_DEFENSIVE);
}
} }
} }
@@ -351,7 +358,9 @@ public:
Creature* riftKeeper = ObjectAccessor::GetCreature(*me, riftKeeperGUID); Creature* riftKeeper = ObjectAccessor::GetCreature(*me, riftKeeperGUID);
if (!riftKeeper || !riftKeeper->IsAlive()) if (!riftKeeper || !riftKeeper->IsAlive())
{ {
instance->SetData(DATA_RIFT_KILLED, 1); if (instance)
instance->SetData(DATA_RIFT_KILLED, 1);
me->DespawnOrUnsummon(0); me->DespawnOrUnsummon(0);
break; break;
} }