pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Zone State] Load New Spawn2 Data When Present (#4889)

Browse Source
This commit is contained in:
Chris Miles 2025-05-16 13:39:16 -05:00 committed by GitHub
parent ec31fddbae
commit c82266790a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
zone/zone_save_state.cpp
View File

@ -6,6 +6,7 @@
#include "zone.h" #include "zone.h"
#include "zone_save_state.h" #include "zone_save_state.h"
#include "../common/repositories/spawn2_repository.h" #include "../common/repositories/spawn2_repository.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
// IsZoneStateValid checks if the zone state is valid // IsZoneStateValid checks if the zone state is valid
// if these fields are all empty or zero value for an entire zone state, it's considered invalid // if these fields are all empty or zero value for an entire zone state, it's considered invalid
@ -531,6 +532,69 @@ bool Zone::LoadZoneState(
} }
} }
// compare state spawns to spawn2 list, if there are any missing, we need to add them
// this is to cover the rare case where a spawn2 is created in the database but not in the zone state
auto zone_spawns = Spawn2Repository::GetWhere(
content_db, fmt::format(
"TRUE {} AND zone = '{}' AND (version = {} OR version = -1) ",
ContentFilterCriteria::apply(),
zone->GetShortName(),
zone->GetInstanceVersion()
)
);
for (auto &s: zone_spawns) {
bool found = false;
for (auto &ss: spawn_states) {
if (ss.spawn2_id == 0 || ss.spawngroup_id == 0 || ss.is_corpse || ss.is_zone) {
continue;
}
if (s.id == ss.spawn2_id) {
found = true;
break;
}
}
if (!found) {
bool spawn_enabled = true;
for (auto &ds: disabled_spawns) {
if (ds.spawn2_id == s.id) {
spawn_enabled = !ds.disabled;
}
}
LogZoneState("Missing spawn2 [{}] in zone state, this NPC spawn was newly created", s.id);
uint32 spawn_time_left = 0;
if (spawn_times.count(s.id) != 0) {
spawn_time_left = spawn_times[s.id];
LogInfo("Spawn2 [{}] Respawn time left [{}]", s.id, spawn_time_left);
}
auto new_spawn = new Spawn2(
s.id,
s.spawngroupID,
s.x,
s.y,
s.z,
s.heading,
s.respawntime,
s.variance,
spawn_time_left,
s.pathgrid,
(bool) s.path_when_zone_idle,
s._condition,
(int16) s.cond_value,
spawn_enabled,
(EmuAppearance) s.animation
);
new_spawn->SetStoredLocation(glm::vec4(s.x, s.y, s.z, s.heading));
spawn2_list.Insert(new_spawn);
new_spawn->Process();
}
}
// dynamic spawns, quest spawns, triggers etc. // dynamic spawns, quest spawns, triggers etc.
for (auto &s: spawn_states) { for (auto &s: spawn_states) {
if (s.spawngroup_id > 0 || s.is_zone) { if (s.spawngroup_id > 0 || s.is_zone) {