merge

--HG--
branch : trunk

src/game/BattleGround.cpp

@@ -1590,6 +1590,7 @@ Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, f
     Creature* pCreature = new Creature;
     if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, PHASEMASK_NORMAL, entry, 0, teamval, x, y, z, o))
     {
+        pCreature->CleanupsBeforeDelete();
         sLog.outError("Can't create creature entry: %u",entry);
         delete pCreature;
         return NULL;

src/game/Debugcmds.cpp

@@ -794,6 +794,7 @@ bool ChatHandler::HandleDebugSpawnVehicle(const char* args)
 
     if(!v->Create(objmgr.GenerateLowGuid(HIGHGUID_VEHICLE), map, m_session->GetPlayer()->GetPhaseMask(), entry, id, m_session->GetPlayer()->GetTeam(), x, y, z, o))
     {
+        v->CleanupsBeforeDelete();
         delete v;
         return false;
     }

src/game/GameEventMgr.cpp

@@ -1283,7 +1283,10 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
                 Creature* pCreature = new Creature;
                 //sLog.outDebug("Spawning creature %u",*itr);
                 if (!pCreature->LoadFromDB(*itr, map))
+                {
+                    pCreature->CleanupsBeforeDelete();
                     delete pCreature;
+                }
                 else
                     map->Add(pCreature);
             }

src/game/Level2.cpp

@@ -1014,6 +1014,7 @@ bool ChatHandler::HandleNpcAddCommand(const char* args)
     Creature* pCreature = new Creature;
     if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
     {
+        pCreature->CleanupsBeforeDelete();
         delete pCreature;
         return false;
     }
@@ -2830,6 +2831,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
                 Creature* wpCreature2 = new Creature;
                 if (!wpCreature2->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()))
                 {
+                    wpCreature2->CleanupsBeforeDelete();
                     PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, VISUAL_WAYPOINT);
                     delete wpCreature2;
                     return false;
@@ -3039,6 +3041,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             Creature* wpCreature = new Creature;
             if (!wpCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
             {
+                wpCreature->CleanupsBeforeDelete();
                 PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
                 delete wpCreature;
                 delete result;
@@ -3094,6 +3097,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
         Creature* pCreature = new Creature;
         if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
         {
+            pCreature->CleanupsBeforeDelete();
             PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
             delete pCreature;
             delete result;
@@ -3149,6 +3153,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
         Creature* pCreature = new Creature;
         if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
         {
+            pCreature->CleanupsBeforeDelete();
             PSendSysMessage(LANG_WAYPOINT_NOTCREATED, id);
             delete pCreature;
             delete result;

src/game/Object.cpp

@@ -1759,6 +1759,7 @@ TempSummon *Map::SummonCreature(uint32 entry, const Position &pos, SummonPropert
 
     if(!summon->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), this, phase, entry, vehId, team, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()))
     {
+        summon->CleanupsBeforeDelete();
         delete summon;
         return NULL;
     }

src/game/ObjectMgr.cpp

@@ -1470,6 +1470,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
             Creature *creature = new Creature;
             if(!creature->LoadFromDB(guid, map))
             {
+                creature->CleanupsBeforeDelete();
                 sLog.outError("AddCreature: cannot add creature entry %u to map", guid);
                 delete creature;
                 return false;
@@ -1521,6 +1522,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 team, uint32 mapId, float x, f
             Creature* creature = new Creature;
             if(!creature->LoadFromDB(guid, map))
             {
+                creature->CleanupsBeforeDelete();
                 sLog.outError("AddCreature: cannot add creature entry %u to map", entry);
                 delete creature;
                 return 0;

src/game/PoolHandler.cpp

@@ -255,6 +255,7 @@ bool PoolGroup<Creature>::Spawn1Object(uint32 guid)
             //sLog.outDebug("Spawning creature %u",guid);
             if (!pCreature->LoadFromDB(guid, map))
             {
+                pCreature->CleanupsBeforeDelete();
                 delete pCreature;
                 return false;
             }

src/game/SpellAuras.h

@@ -46,7 +46,7 @@ class AuraApplication
         AuraRemoveMode m_removeMode:8;                  // Store info for know remove aura reason
         bool m_needClientUpdate:1;
         bool m_isNeedManyNegativeEffects:1;
-        bool m_canBeRemoved:1;                            // used only in aura list update of AuraBase
+        bool m_canBeRemoved:1;                            // used only in aura list update of Aura
 
         explicit AuraApplication(Unit * target, Unit * caster, Aura * base);
         void _Remove();

src/game/SpellMgr.cpp

@@ -899,7 +899,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
                     // part of positive spell if casted at self
                     if(spellproto->EffectImplicitTargetA[effIndex] != TARGET_UNIT_CASTER)
                         return false;
-                    // but not this if this first effect (don't found batter check)
+                    // but not this if this first effect (didn't find batter check)
                     if(spellproto->Attributes & 0x4000000 && effIndex==0)
                         return false;
                     break;

src/game/Unit.cpp

@@ -182,6 +182,8 @@ Unit::Unit()
     // remove aurastates allowing special moves
     for (uint8 i = 0; i < MAX_REACTIVE; ++i)
         m_reactiveTimer[i] = 0;
+
+    m_cleanupDone = false;
 }
 
 Unit::~Unit()
@@ -205,6 +207,7 @@ Unit::~Unit()
     if (m_vehicleKit)
         delete m_vehicleKit;
 
+    assert(m_cleanupDone);
     assert(!m_attacking);
     assert(m_attackers.empty());
     assert(m_sharedVision.empty());
@@ -3234,8 +3237,7 @@ void Unit::_UpdateSpells( uint32 time )
         }
     }
 
-    // update auraBases
+    // m_auraUpdateIterator can be updated in indirect called code at aura remove to skip next planned to update but removed auras
-    // m_auraBaseUpdateIterator can be updated in indirect called code at aura remove to skip next planned to update but removed auras
     for (m_auraUpdateIterator = m_ownedAuras.begin(); m_auraUpdateIterator != m_ownedAuras.end();)
     {
         Aura * i_aura = m_auraUpdateIterator->second;
@@ -3529,6 +3531,7 @@ void Unit::DeMorph()
 
 void Unit::_AddAura(UnitAura * aura, Unit * caster)
 {
+    assert(!m_cleanupDone);
     m_ownedAuras.insert(AuraMap::value_type(aura->GetId(), aura));
 
     // passive and Incanter's Absorption and auras with different type can stack with themselves any number of times
@@ -3579,7 +3582,8 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster)
 
 AuraApplication * Unit::__ApplyAura(Aura * aura)
 {
-    // auraBase musn't be removed
+    assert(!m_cleanupDone);
+    // aura musn't be removed
     assert(!aura->IsRemoved());
 
     SpellEntry const* aurSpellInfo = aura->GetSpellProto();
@@ -12965,6 +12969,7 @@ void Unit::CleanupsBeforeDelete()
     //A unit may be in removelist and not in world, but it is still in grid
     //and may have some references during delete
     RemoveAllAuras();
+    m_cleanupDone = true;
     InterruptNonMeleeSpells(true);
     m_Events.KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
     CombatStop();

src/game/Unit.h

@@ -2069,6 +2069,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
 
         uint32 m_reducedThreatPercent;
         uint64 m_misdirectionTargetGUID;
+
+        bool m_cleanupDone;
 };
 
 namespace Trinity