public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-07 07:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Maps): port spawn system/dynamic spawns from TrinityCore (#25206)

Browse Source 
Co-authored-by: r00ty-tc <r00ty-tc@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Andrew
2026-04-12 17:52:01 -03:00
committed by GitHub
parent a8d327f21c
commit f5c4de92eb
33 changed files with 1456 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -40,6 +40,7 @@
#include "ObjectAccessor.h"
#include "Pet.h"
#include "Player.h"
#include "PoolMgr.h"
#include "Realm.h"
#include "ScriptMgr.h"
#include "SpellAuras.h"
@@ -2474,10 +2475,52 @@ public:
{
Player* player = handler->GetSession()->GetPlayer();
// Phase 1: respawn creatures/GOs that still have corpses in the grid
Acore::RespawnDo u_do;
Acore::WorldObjectWorker<Acore::RespawnDo> worker(player, u_do);
Cell::VisitObjects(player, worker, player->GetGridActivationRange());
// Phase 2: force-respawn creatures/GOs that were fully removed (non-compat mode)
// by setting their respawn times to now so ProcessRespawns() picks them up
Map* map = player->GetMap();
uint32 gridId = Acore::ComputeGridCoord(player->GetPositionX(), player->GetPositionY()).GetId();
time_t now = GameTime::GetGameTime().count();
std::vector<ObjectGuid::LowType> creaturesToRespawn;
for (auto const& pair : map->GetCreatureRespawnTimes())
{
CreatureData const* data = sObjectMgr->GetCreatureData(pair.first);
if (!data || Acore::ComputeGridCoord(data->posX, data->posY).GetId() != gridId)
continue;
// Skip pooled spawns — Phase 1 already triggered pool rotation via
// Creature::Respawn() -> PoolMgr::UpdatePool(). Forcing a respawn time
// here would cause ProcessRespawns() to call UpdatePool() again,
// spawning duplicates beyond the pool's max_limit.
if (sPoolMgr->IsPartOfAPool<Creature>(pair.first))
continue;
creaturesToRespawn.push_back(pair.first);
}
for (ObjectGuid::LowType spawnId : creaturesToRespawn)
map->SaveCreatureRespawnTime(spawnId, now);
std::vector<ObjectGuid::LowType> goesToRespawn;
for (auto const& pair : map->GetGORespawnTimes())
{
GameObjectData const* data = sObjectMgr->GetGameObjectData(pair.first);
if (!data || Acore::ComputeGridCoord(data->posX, data->posY).GetId() != gridId)
continue;
// Skip pooled spawns — same reason as creatures above.
if (sPoolMgr->IsPartOfAPool<GameObject>(pair.first))
continue;
goesToRespawn.push_back(pair.first);
}
for (ObjectGuid::LowType spawnId : goesToRespawn)
map->SaveGORespawnTime(spawnId, now);
return true;
}