[pull] development from vmangos:development

src/game/Maps/Map.cpp

@@ -3740,3 +3740,40 @@ Creature* Map::LoadCreatureSpawnWithGroup(uint32 leaderDbGuid, bool delaySpawn)
 
     return pLeader;
 }
+
+GameObject* Map::LoadGameObjectSpawn(uint32 dbGuid, bool delaySpawn)
+{
+    GameObjectData const* pSpawnData = sObjectMgr.GetGOData(dbGuid);
+    if (!pSpawnData)
+        return nullptr;
+
+    if (GetId() != pSpawnData->position.mapId)
+    {
+        sLog.Out(LOG_SCRIPTS, LOG_LVL_ERROR, "Attempt to load gameobject spawn guid %u on wrong map %u.", dbGuid, GetId());
+        return nullptr;
+    }
+
+    GameObject* pGameObject;
+    if (pGameObject = GetGameObject(ObjectGuid(HIGHGUID_GAMEOBJECT, pSpawnData->id, dbGuid)))
+        return pGameObject;
+
+    if (!IsLoaded(pSpawnData->position.x, pSpawnData->position.y))
+        return nullptr;
+
+    pGameObject = GameObject::CreateGameObject(pSpawnData->id);
+    if (!pGameObject->LoadFromDB(dbGuid, this, true))
+    {
+        delete pGameObject;
+        return nullptr;
+    }
+
+    if (delaySpawn)
+    {
+        pGameObject->SetRespawnTime(pGameObject->GetRespawnDelay());
+        if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
+            pGameObject->SaveRespawnTime();
+    }
+
+    Add(pGameObject);
+    return pGameObject;
+}

src/game/Maps/Map.h

@@ -500,6 +500,7 @@ class Map : public GridRefManager<NGridType>
         Creature* SummonCreature(uint32 entry, float x, float y, float z, float ang, TempSummonType spwtype = TEMPSUMMON_DEAD_DESPAWN, uint32 despwtime = 25000, bool asActiveObject = false);
         Creature* LoadCreatureSpawn(uint32 dbGuid, bool delaySpawn = false);
         Creature* LoadCreatureSpawnWithGroup(uint32 leaderDbGuid, bool delaySpawn = false);
+        GameObject* LoadGameObjectSpawn(uint32 dbGuid, bool delaySpawn = false);
 
         Player* GetPlayer(ObjectGuid guid);
         GameObject* GetGameObject(ObjectGuid const& guid) { return GetObject<GameObject>(guid); }

src/game/Maps/ScriptCommands.cpp

@@ -2314,22 +2314,8 @@ bool Map::ScriptCommand_DespawnGameObject(ScriptInfo const& script, WorldObject*
 // SCRIPT_COMMAND_LOAD_GAMEOBJECT_SPAWN (82)
 bool Map::ScriptCommand_LoadGameObject(ScriptInfo const& script, WorldObject* source, WorldObject* target)
 {
-    GameObjectData const* pGameObjectData = sObjectMgr.GetGOData(script.loadGo.goGuid);
-
-    if (GetId() != pGameObjectData->position.mapId)
-    {
-        sLog.Out(LOG_SCRIPTS, LOG_LVL_ERROR, "SCRIPT_COMMAND_LOAD_GAMEOBJECT_SPAWN (script id %u) tried to spawn guid %u on wrong map %u.", script.id, script.loadGo.goGuid, GetId());
+    if (!LoadGameObjectSpawn(script.loadGo.goGuid))
         return ShouldAbortScript(script);
-    }
-
-    if (GetGameObject(ObjectGuid(HIGHGUID_GAMEOBJECT, pGameObjectData->id, script.loadGo.goGuid)))
-        return ShouldAbortScript(script); // already spawned
-
-    GameObject* pGameobject = GameObject::CreateGameObject(pGameObjectData->id);
-    if (!pGameobject->LoadFromDB(script.loadGo.goGuid, this, true))
-        delete pGameobject;
-    else
-        Add(pGameobject);
 
     return false;
 }

src/game/OutdoorPvP/OutdoorPvPSI.cpp

@@ -88,6 +88,51 @@ void OutdoorPvPSI::OnPlayerLeave(Player* plr)
     OutdoorPvP::OnPlayerLeave(plr);
 }
 
+static std::vector<uint32> const sAllianceDustBags = { 9496, 9497, 9498, 9499, 9500, 9501, 9502, 9503, 9504, 9507, 9508 };
+static std::vector<uint32> const sHordeDustBags = { 13566, 13567, 13568, 13582, 13583, 13584, 13585, 13587, 13588, 13589, 13590, 13591 };
+
+void OutdoorPvPSI::SpawnDustBags(uint32 resource, std::vector<uint32> const& allBags, std::set<uint32>& spawnedBags)
+{
+    uint32 neededBags = resource / 15;
+    if (neededBags > spawnedBags.size())
+    {
+        for (auto const& dbGuid : allBags)
+        {
+            if (spawnedBags.find(dbGuid) == spawnedBags.end())
+            {
+                if (GetMap()->LoadGameObjectSpawn(dbGuid))
+                {
+                    spawnedBags.insert(dbGuid);
+                    if (spawnedBags.size() >= neededBags)
+                        break;
+                }
+            }
+        }
+    }
+}
+
+void OutdoorPvPSI::ResetResourceCount()
+{
+    m_Gathered_A = 0;
+    m_Gathered_H = 0;
+
+    for (auto const& dbGuid : m_allianceDustBags)
+    {
+        ObjectGuid guid = ObjectGuid(HIGHGUID_GAMEOBJECT, SI_DUST_BAG, dbGuid);
+        if (GameObject* pGo = GetMap()->GetGameObject(guid))
+            pGo->AddObjectToRemoveList();
+    }
+    m_allianceDustBags.clear();
+
+    for (auto const& dbGuid : m_hordeDustBags)
+    {
+        ObjectGuid guid = ObjectGuid(HIGHGUID_GAMEOBJECT, SI_DUST_BAG, dbGuid);
+        if (GameObject* pGo = GetMap()->GetGameObject(guid))
+            pGo->AddObjectToRemoveList();
+    }
+    m_hordeDustBags.clear();
+}
+
 bool OutdoorPvPSI::HandleAreaTrigger(Player* plr, uint32 trigger)
 {
     /** If the player doesn't have a silithyst */
@@ -109,12 +154,15 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player* plr, uint32 trigger)
                     TeamApplyBuff(TEAM_ALLIANCE, SI_CENARION_FAVOR);
                     sWorld.SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr.GetMangosStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A));
                     m_LastController = ALLIANCE;
-                    m_Gathered_A = 0;
-                    m_Gathered_H = 0;
+                    ResetResourceCount();
                     sLog.Out(LOG_BG, LOG_LVL_DETAIL, "[Silithus] Under Alliance control");
                     //sGameEventMgr.SetSilithusPVPEventCompleted(true);
                     //sGameEventMgr.UpdateSilithusPVP();
                 }
+                else
+                {
+                    SpawnDustBags(m_Gathered_A, sAllianceDustBags, m_allianceDustBags);
+                }
                 // complete quest
                 plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A, ObjectGuid());
             }
@@ -130,12 +178,15 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player* plr, uint32 trigger)
                     TeamApplyBuff(TEAM_HORDE, SI_CENARION_FAVOR);
                     sWorld.SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr.GetMangosStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H));
                     m_LastController = HORDE;
-                    m_Gathered_A = 0;
-                    m_Gathered_H = 0;
+                    ResetResourceCount();
                     sLog.Out(LOG_BG, LOG_LVL_DETAIL, "[Silithus] Under Horde control");
                     //sGameEventMgr.SetSilithusPVPEventCompleted(true);
                     //sGameEventMgr.UpdateSilithusPVP();
                 }
+                else
+                {
+                    SpawnDustBags(m_Gathered_H, sHordeDustBags, m_hordeDustBags);
+                }
                 // complete quest
                 plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H, ObjectGuid());
             }

src/game/OutdoorPvP/OutdoorPvPSI.h

@@ -46,6 +46,7 @@ uint32 const SI_TURNIN_QUEST_CM_A   = 17090;
 uint32 const SI_TURNIN_QUEST_CM_H   = 18199;
 uint32 const SI_SILITHYST_MOUND     = 181597;
 uint32 const SI_SILITHYST_GEYSER    = 181598;
+uint32 const SI_DUST_BAG            = 181962;
 
 class OutdoorPvPSI : public OutdoorPvP
 {
@@ -70,12 +71,16 @@ class OutdoorPvPSI : public OutdoorPvP
 
         void UpdateWorldState();
 
-    private:
+        void ResetResourceCount();
+
+        void SpawnDustBags(uint32 resource, std::vector<uint32> const& allBags, std::set<uint32>& spawnedBags);
 
+    private:
+        std::set<uint32> m_allianceDustBags;
+        std::set<uint32> m_hordeDustBags;
         uint32 m_Gathered_A;
         uint32 m_Gathered_H;
         uint32 m_MaxRessources;
-
         uint32 m_LastController;
 };
 

src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/instance_naxxramas.cpp

@@ -565,7 +565,6 @@ void instance_naxxramas::OnObjectCreate(GameObject* pGo)
         case GO_PLAG_HEIG_ENTRY_DOOR:
             UpdateAutomaticBossEntranceDoor(pGo, m_auiEncounter[TYPE_HEIGAN]);
             break;
-        case GO_PLAG_HEIG_EXIT_DOOR:
         case GO_PLAG_HEIG_OLD_EXIT_DOOR:
         case GO_PLAG_LOAT_DOOR:
             UpdateBossGate(pGo, m_auiEncounter[TYPE_HEIGAN]);

src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/naxxramas.h

@@ -166,7 +166,7 @@ enum NaxxGOs : uint32
     GO_ARAC_ANUB_DOOR           = 181126,   //encounter door - open on click after click auto open/close on encounter pull/kill/reset
     GO_ARAC_ANUB_GATE           = 181195,   //open after boss is dead
     GO_ARAC_FAER_WEB            = 181235,   //encounter door
-    GO_ARAC_FAER_DOOR           = 194022,   //after faerlina, to outer ring
+    GO_ARAC_FAER_DOOR           = 181167,   //after faerlina, to outer ring
     GO_ARAC_MAEX_INNER_DOOR     = 181197,   //encounter door
     GO_ARAC_MAEX_OUTER_DOOR     = 181209,   //right before maex