Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Should fix some Wintersgrasp crashes, some code by Spp. Refs #262

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-17 21:23:15 -08:00
parent 929df85572
commit 4eb608b478
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/Wintergrasp.cpp
View File

@@ -964,11 +964,11 @@ bool OPvPWintergrasp::UpdateCreatureInfo(Creature *creature)
bool OPvPWintergrasp::UpdateQuestGiverPosition(uint32 guid, Creature *creature)
{
assert(guid);
Position pos = m_qgPosMap[std::pair<uint32, bool>(guid, getDefenderTeam() == TEAM_HORDE)];
if (!pos.GetPositionX())
return false;
assert(pos);
if (creature)
if (creature && creature->IsInWorld())
{
// if not questgiver or position is the same, do nothing
if (creature->GetPositionX() == pos.GetPositionX() &&
@@ -976,7 +976,7 @@ bool OPvPWintergrasp::UpdateQuestGiverPosition(uint32 guid, Creature *creature)
creature->GetPositionZ() == pos.GetPositionZ())
return false;
if (creature->isInCombat())
if (creature->isAlive() && creature->isInCombat())
{
creature->CombatStop(true);
creature->getHostilRefManager().deleteReferences();
@@ -990,9 +990,8 @@ bool OPvPWintergrasp::UpdateQuestGiverPosition(uint32 guid, Creature *creature)
creature->Respawn(true);
}
else
{
objmgr.MoveCreData(guid, 571, pos);
}
return true;
}