aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-06-09 19:53:25 -0500
committermegamage <none@none>2009-06-09 19:53:25 -0500
commita8e8bd1d288d645414324353628cea3d1395bfce (patch)
tree92c4770c20b155b0c5ee157705a7b9ed06b461fe /src/game/Unit.cpp
parent337772c433a4a031af152958d8d7b50944339459 (diff)
*Fix a crash caused by 3881. Please do not use any revs between this and 3881.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 391e726596f..f014448bdb5 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11682,7 +11682,8 @@ void Unit::AddToWorld()
{
WorldObject::AddToWorld();
m_Notified = false;
- assert(m_NotifyListPos < 0);
+ //assert(m_NotifyListPos < 0); instance : crash
+ m_NotifyListPos = -1;
SetToNotify();
}
}
@@ -13233,7 +13234,7 @@ bool Unit::HandleAuraRaidProcFromCharge( AuraEffect* triggeredByAura )
void Unit::SetToNotify()
{
// it is called somewhere when obj is not in world (crash when log in instance)
- if(m_NotifyListPos < 0 && IsInWorld())
+ if(m_NotifyListPos < 0)
GetMap()->AddUnitToNotify(this);
}