*Add unit to notify when unit is add to world (including load grid case).

*Add some check in remove object function.

--HG--
branch : trunk

1 files changed, 10 insertions, 5 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index fb0aee82654..beabc0e8668 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -66,11 +66,6 @@ float baseMoveSpeed[MAX_MOVE_TYPE] =
 
 void InitTriggerAuraData();
 
-void Unit::AddToWorld()
-{
-       WorldObject::AddToWorld();
-}
-
 // auraTypes contains attacker auras capable of proc'ing cast auras
 static Unit::AuraTypeSet GenerateAttakerProcCastAuraTypes()
 {
@@ -10853,6 +10848,16 @@ uint32 Unit::GetCreatePowers( Powers power ) const
     return 0;
 }
 
+void Unit::AddToWorld()
+{
+    if(!IsInWorld())
+    {
+        m_Notified = false;
+        m_IsInNotifyList = false;
+        SetToNotify();
+    }
+}
+
 void Unit::RemoveFromWorld()
 {
     // cleanup