*Cleanup in single target auras (thanks to JuliuSZS some useable debug info)

*Add ToInstanceMap() and ToMapInstanced() typecast functions and CAST_INST macro to use in scripts.

--HG--
branch : trunk

src/server/game/AI/ScriptedAI/ScriptedCreature.h

@@ -21,6 +21,7 @@
 #define CAST_SUM(a)     (SCRIPT_CAST_TYPE<TempSummon*>(a))
 #define CAST_PET(a)     (SCRIPT_CAST_TYPE<Pet*>(a))
 #define CAST_AI(a,b)    (SCRIPT_CAST_TYPE<a*>(b))
+#define CAST_INST(a,b)  (SCRIPT_CAST_TYPE<a*>(b))
 
 #define GET_SPELL(a)    (const_cast<SpellEntry*>(GetSpellStore()->LookupEntry(a)))
 

src/server/game/Accounts/AccountMgr.cpp

@@ -72,7 +72,7 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
             uint64 guid = MAKE_NEW_GUID(guidlo, 0, HIGHGUID_PLAYER);
 
             // kick if player currently
-            if (Player* p = ObjectAccessor::GetObjectInWorld(guid, (Player*)NULL))
+            if (Player* p = ObjectAccessor::FindPlayer(guid))
             {
                 WorldSession* s = p->GetSession();
                 s->KickPlayer();                            // mark session to remove at next session list update

src/server/game/Entities/Unit/Unit.cpp

@@ -3616,23 +3616,17 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster)
         // register single target aura
         caster->GetSingleCastAuras().push_back(aura);
         // remove other single target auras
-        for (;;)
+        Unit::AuraList& scAuras = caster->GetSingleCastAuras();
+        for (Unit::AuraList::iterator itr = scAuras.begin(); itr != scAuras.end();)
         {
-            bool restart = false;
-            Unit::AuraList& scAuras = caster->GetSingleCastAuras();
-            for (Unit::AuraList::iterator itr = scAuras.begin(); itr != scAuras.end(); ++itr)
+            if ((*itr) != aura &&
+                IsSingleTargetSpells((*itr)->GetSpellProto(), aura->GetSpellProto()))
             {
-                if ((*itr) != aura &&
-                    IsSingleTargetSpells((*itr)->GetSpellProto(), aura->GetSpellProto()))
-                {
-                    (*itr)->Remove();
-                    restart = true;
-                    break;
-                }
+                (*itr)->Remove();
+                itr = scAuras.begin();
             }
-
-            if (!restart)
-                break;
+            else
+                ++itr;
         }
     }
 }
@@ -4266,7 +4260,7 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
         AuraApplication const * aurApp = iter->second;
         Aura const * aura = aurApp->GetBase();
 
-        if (aura->GetCasterGUID() !=GetGUID() && IsSingleTargetSpell(aura->GetSpellProto()))
+        if (aura->GetCasterGUID() != GetGUID() && IsSingleTargetSpell(aura->GetSpellProto()))
         {
             if (!newPhase)
                 RemoveAura(iter);
@@ -4288,14 +4282,13 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
     for (AuraList::iterator iter = scAuras.begin(); iter != scAuras.end();)
     {
         Aura * aura = *iter;
-        ++iter;
         if (aura->GetUnitOwner() != this && !aura->GetUnitOwner()->InSamePhase(newPhase))
         {
-            uint32 removedAuras = m_removedAurasCount;
             aura->Remove();
-            if (m_removedAurasCount > removedAuras + 1)
-                iter = scAuras.begin();
+            iter = scAuras.begin();
         }
+        else
+            ++iter;
     }
 }
 

src/server/game/Maps/Map.h

@@ -51,6 +51,8 @@ struct ScriptInfo;
 struct ScriptAction;
 struct Position;
 class BattleGround;
+class MapInstanced;
+class InstanceMap;
 
 //******************************************
 // Map file format defines
@@ -446,6 +448,12 @@ class Map : public GridRefManager<NGridType>
         Creature* GetCreature(uint64 guid);
         GameObject* GetGameObject(uint64 guid);
         DynamicObject* GetDynamicObject(uint64 guid);
+
+        MapInstanced* ToMapInstanced(){ if (Instanceable())  return reinterpret_cast<MapInstanced*>(this); else return NULL;  }
+        const MapInstanced* ToMapInstanced() const { if (Instanceable())  return (const MapInstanced*)((MapInstanced*)this); else return NULL;  }
+
+        InstanceMap* ToInstanceMap(){ if (IsDungeon())  return reinterpret_cast<InstanceMap*>(this); else return NULL;  }
+        const InstanceMap* ToInstanceMap() const { if (IsDungeon())  return (const InstanceMap*)((InstanceMap*)this); else return NULL;  }
     private:
         void LoadMapAndVMap(int gx, int gy);
         void LoadVMap(int gx, int gy);