*Fix build.

*Fix the bug that janalai summons too many adds.

--HG--
branch : trunk

src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp

@@ -328,7 +328,7 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI
 
     void Reset()
     {
-        m_creature->SetNoCallAssistence(true);              //we don't want any assistance (WE R HEROZ!)
+        m_creature->SetNoCallAssistance(true);              //we don't want any assistance (WE R HEROZ!)
         Hemorrhage_Timer = 3000;
     }
 

src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp

@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
             {
                 if (!c->isInCombat())
                 {
-                    c->SetNoCallAssistence(true);
+                    c->SetNoCallAssistance(true);
                     if(c->AI())
                         c->AI()->AttackStart(who);
                 }

src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp

@@ -117,6 +117,13 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
     { 
         pInstance =((ScriptedInstance*)c->GetInstanceData());
         Reset();
+
+        SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_HATCH_EGG);
+        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
+        {
+            TempSpell->EffectImplicitTargetA[0] = 1;
+            TempSpell->EffectImplicitTargetB[0] = 0;
+        }
     }
 
     ScriptedInstance *pInstance;

src/game/DynamicObject.cpp

@@ -140,7 +140,13 @@ void DynamicObject::Delete()
     // are switched to world container on creation and they are also set to active
     if (isActive())
     {
-        GetMap()->SwitchGridContainers(this, false);
+        Map* map = GetMap();
+        if(!map)
+        {
+            sLog.outError("DynamicObject (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());
+            return;
+        }
+        map->SwitchGridContainers(this, false);
         setActive(false);
     }
     SendObjectDeSpawnAnim(GetGUID());

src/game/Unit.cpp

@@ -4155,6 +4155,7 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
     }
 
     sLog.outDebug("Aura %u now is remove mode %d",Aur->GetModifier()->m_auraname, mode);
+    assert(!Aur->IsInUse());
     Aur->ApplyModifier(false,true);
     Aur->_RemoveAura();
     delete Aur;