pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 07:21:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Spawn2] Fix edge case with instances not copying disabled spawn state (#3688)

Browse Source 
* [Spawn2] Fix edge case with instances not copying disabled spawn state

* Update spawn2.cpp
This commit is contained in:
Chris Miles 2023-11-11 21:00:50 -06:00 committed by GitHub
parent 853739b538
commit a20d333f9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zone/spawn2.cpp
View File

@ -485,12 +485,15 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
spawn2_ids.push_back(s.id); spawn2_ids.push_back(s.id);
} }
// we load spawn2_disabled entries for this zone
// if there are more specific entries for an instance of this zone, we load those instead
// if there are no entries for this zone, we load the default entries
std::vector<Spawn2DisabledRepository::Spawn2Disabled> disabled_spawns = {}; std::vector<Spawn2DisabledRepository::Spawn2Disabled> disabled_spawns = {};
if (!spawn2_ids.empty()) { if (!spawn2_ids.empty()) {
disabled_spawns = Spawn2DisabledRepository::GetWhere( disabled_spawns = Spawn2DisabledRepository::GetWhere(
database, database,
fmt::format( fmt::format(
"spawn2_id IN ({}) and instance_id = {}", "spawn2_id IN ({}) and (instance_id = {} OR instance_id = 0) ORDER BY instance_id",
Strings::Join(spawn2_ids, ","), Strings::Join(spawn2_ids, ","),
zone->GetInstanceID() zone->GetInstanceID()
) )
@ -505,11 +508,11 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
// load from spawn2_disabled // load from spawn2_disabled
bool spawn_enabled = true; bool spawn_enabled = true;
// check if spawn is disabled // check if spawn is disabled
for (auto &ds: disabled_spawns) { for (auto &ds: disabled_spawns) {
if (ds.spawn2_id == s.id) { if (ds.spawn2_id == s.id) {
spawn_enabled = false; spawn_enabled = !ds.disabled;
break;
} }
} }