Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2991 from megamage/master

Browse Source 
Core/Entities: Do not call AddObjectToRemoveList(Pet*) in Map::MoveAllCreaturesInMoveList() - Closes #2892.
Scripts: Fix a crash in npc_brunnhildar_prisoner script. Closes #2825.
This commit is contained in:
QAston
2011-09-14 14:27:21 -07:00
parent bca9545fbe 76488854d8
commit decb20f079
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/game/Maps/Map.cpp
View File

@@ -832,7 +832,16 @@ void Map::MoveAllCreaturesInMoveList()
#ifdef TRINITY_DEBUG
sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) cannot be move to unloaded respawn grid.", c->GetGUIDLow(), c->GetEntry());
#endif
AddObjectToRemoveList(c);
//AddObjectToRemoveList(Pet*) should only be called in Pet::Remove
//This may happen when a player just logs in and a pet moves to a nearby unloaded cell
//To avoid this, we can load nearby cells when player log in
//But this check is always needed to ensure safety
//TODO: pets will disappear if this is outside CreatureRespawnRelocation
//need to check why pet is frequently relocated to an unloaded cell
if (c->isPet())
((Pet*)c)->Remove(PET_SAVE_NOT_IN_SLOT, true);
else
AddObjectToRemoveList(c);
}
}
@@ -925,8 +934,8 @@ bool Map::CreatureRespawnRelocation(Creature *c)
c->UpdateObjectVisibility(false);
return true;
}
else
return false;
return false;
}
bool Map::UnloadGrid(const uint32 x, const uint32 y, bool unloadAll)

28
src/server/scripts/Northrend/storm_peaks.cpp
View File

@@ -558,7 +558,7 @@ public:
{
npc_brunnhildar_prisonerAI(Creature* creature) : ScriptedAI(creature) {}
Unit* drake;
uint64 drakeGUID;
uint16 enter_timer;
bool hasEmptySeats;
@@ -566,14 +566,25 @@ public:
{
me->CastSpell(me, SPELL_ICE_PRISON, true);
enter_timer = 0;
drake = NULL;
drakeGUID = 0;
hasEmptySeats = false;
}
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
if (drake && !me->IsOnVehicle(drake) && !hasEmptySeats)
if (!me->IsOnVehicle(drake) && !hasEmptySeats)
me->ForcedDespawn(3000);
if (enter_timer <= 0)
@@ -593,9 +604,16 @@ public:
void MoveInLineOfSight(Unit* unit)
{
if (!unit || !drake)
if (!unit || !drakeGUID)
return;
Creature* drake = Unit::GetCreature(*me, drakeGUID);
if (!drake)
{
drakeGUID = 0;
return;
}
if (!me->IsOnVehicle(drake) && !me->HasAura(SPELL_ICE_PRISON))
{
if (unit->IsVehicle() && me->IsWithinDist(unit, 25.0f, true) && unit->ToCreature() && unit->ToCreature()->GetEntry() == 29709)
@@ -651,7 +669,7 @@ public:
enter_timer = 500;
if (hitter->IsVehicle())
drake = hitter;
drakeGUID = hitter->GetGUID();
else
return;