Temp fix of crash caused by npc_brunnhildar_prisoner script. Solve #2825, #2880 and #2772.

This commit is contained in:
megamage
2011-09-12 13:00:01 -04:00
parent 2dbf64827a
commit 937d26e0fe
+23 -5
View File
@@ -558,7 +558,7 @@ public:
{ {
npc_brunnhildar_prisonerAI(Creature* creature) : ScriptedAI(creature) {} npc_brunnhildar_prisonerAI(Creature* creature) : ScriptedAI(creature) {}
Unit* drake; uint64 drakeGUID;
uint16 enter_timer; uint16 enter_timer;
bool hasEmptySeats; bool hasEmptySeats;
@@ -566,14 +566,25 @@ public:
{ {
me->CastSpell(me, SPELL_ICE_PRISON, true); me->CastSpell(me, SPELL_ICE_PRISON, true);
enter_timer = 0; enter_timer = 0;
drake = NULL; drakeGUID = 0;
hasEmptySeats = false; hasEmptySeats = false;
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
{ {
//TODO: not good script
if (!drakeGUID)
return;
Creature* drake = Unit::GetCreature(*me, drakeGUID);
if (!drake)
{
drakeGUID = 0;
return;
}
// drake unsummoned, passengers dropped // drake unsummoned, passengers dropped
if (drake && !me->IsOnVehicle(drake) && !hasEmptySeats) if (!me->IsOnVehicle(drake) && !hasEmptySeats)
me->ForcedDespawn(3000); me->ForcedDespawn(3000);
if (enter_timer <= 0) if (enter_timer <= 0)
@@ -593,9 +604,16 @@ public:
void MoveInLineOfSight(Unit* unit) void MoveInLineOfSight(Unit* unit)
{ {
if (!unit || !drake) if (!unit || !drakeGUID)
return; return;
Creature* drake = Unit::GetCreature(*me, drakeGUID);
if (!drake)
{
drakeGUID = 0;
return;
}
if (!me->IsOnVehicle(drake) && !me->HasAura(SPELL_ICE_PRISON)) if (!me->IsOnVehicle(drake) && !me->HasAura(SPELL_ICE_PRISON))
{ {
if (unit->IsVehicle() && me->IsWithinDist(unit, 25.0f, true) && unit->ToCreature() && unit->ToCreature()->GetEntry() == 29709) if (unit->IsVehicle() && me->IsWithinDist(unit, 25.0f, true) && unit->ToCreature() && unit->ToCreature()->GetEntry() == 29709)
@@ -651,7 +669,7 @@ public:
enter_timer = 500; enter_timer = 500;
if (hitter->IsVehicle()) if (hitter->IsVehicle())
drake = hitter; drakeGUID = hitter->GetGUID();
else else
return; return;