Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts: src/server/game/Globals/ObjectMgr.cpp src/server/game/Maps/Map.cpp src/server/game/Quests/QuestDef.cpp
2014-05-11 23:08:54 +02:00
parent 37d2777f27 668ed58847
commit cfe644b457
24 changed files with 3667 additions and 2453 deletions
@@ -478,10 +478,7 @@ void BossAI::_JustDied()
    events.Reset();
    summons.DespawnAll();
    if (instance)
-    {
        instance->SetBossState(_bossId, DONE);
-        instance->SaveToDB();
-    }
 }

 void BossAI::_EnterCombat()