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

[Hotfix] Fix database loading routines (#4030)

Browse Source
This commit is contained in:
Chris Miles 2024-01-29 00:14:33 -06:00 committed by GitHub
parent 2e0ed82986
commit bc59882a65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 26 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/repositories/base/base_traps_repository.h
View File

@ -37,7 +37,7 @@ public:
uint32_t respawn_time; uint32_t respawn_time;
uint32_t respawn_var; uint32_t respawn_var;
int8_t triggered_number; int8_t triggered_number;
int8_t group; int8_t group_;
int8_t despawn_when_triggered; int8_t despawn_when_triggered;
int8_t undetectable; int8_t undetectable;
int8_t min_expansion; int8_t min_expansion;
@ -72,7 +72,7 @@ public:
"respawn_time", "respawn_time",
"respawn_var", "respawn_var",
"triggered_number", "triggered_number",
"group", "`group`",
"despawn_when_triggered", "despawn_when_triggered",
"undetectable", "undetectable",
"min_expansion", "min_expansion",
@ -103,7 +103,7 @@ public:
"respawn_time", "respawn_time",
"respawn_var", "respawn_var",
"triggered_number", "triggered_number",
"group", "`group`",
"despawn_when_triggered", "despawn_when_triggered",
"undetectable", "undetectable",
"min_expansion", "min_expansion",
@ -168,7 +168,7 @@ public:
e.respawn_time = 60; e.respawn_time = 60;
e.respawn_var = 0; e.respawn_var = 0;
e.triggered_number = 0; e.triggered_number = 0;
e.group = 0; e.group_ = 0;
e.despawn_when_triggered = 0; e.despawn_when_triggered = 0;
e.undetectable = 0; e.undetectable = 0;
e.min_expansion = -1; e.min_expansion = -1;
@ -229,7 +229,7 @@ public:
e.respawn_time = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 60; e.respawn_time = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 60;
e.respawn_var = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0; e.respawn_var = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0;
e.triggered_number = row[17] ? static_cast<int8_t>(atoi(row[17])) : 0; e.triggered_number = row[17] ? static_cast<int8_t>(atoi(row[17])) : 0;
e.group = row[18] ? static_cast<int8_t>(atoi(row[18])) : 0; e.group_ = row[18] ? static_cast<int8_t>(atoi(row[18])) : 0;
e.despawn_when_triggered = row[19] ? static_cast<int8_t>(atoi(row[19])) : 0; e.despawn_when_triggered = row[19] ? static_cast<int8_t>(atoi(row[19])) : 0;
e.undetectable = row[20] ? static_cast<int8_t>(atoi(row[20])) : 0; e.undetectable = row[20] ? static_cast<int8_t>(atoi(row[20])) : 0;
e.min_expansion = row[21] ? static_cast<int8_t>(atoi(row[21])) : -1; e.min_expansion = row[21] ? static_cast<int8_t>(atoi(row[21])) : -1;
@ -286,7 +286,7 @@ public:
v.push_back(columns[15] + " = " + std::to_string(e.respawn_time)); v.push_back(columns[15] + " = " + std::to_string(e.respawn_time));
v.push_back(columns[16] + " = " + std::to_string(e.respawn_var)); v.push_back(columns[16] + " = " + std::to_string(e.respawn_var));
v.push_back(columns[17] + " = " + std::to_string(e.triggered_number)); v.push_back(columns[17] + " = " + std::to_string(e.triggered_number));
v.push_back(columns[18] + " = " + std::to_string(e.group)); v.push_back(columns[18] + " = " + std::to_string(e.group_));
v.push_back(columns[19] + " = " + std::to_string(e.despawn_when_triggered)); v.push_back(columns[19] + " = " + std::to_string(e.despawn_when_triggered));
v.push_back(columns[20] + " = " + std::to_string(e.undetectable)); v.push_back(columns[20] + " = " + std::to_string(e.undetectable));
v.push_back(columns[21] + " = " + std::to_string(e.min_expansion)); v.push_back(columns[21] + " = " + std::to_string(e.min_expansion));
@ -332,7 +332,7 @@ public:
v.push_back(std::to_string(e.respawn_time)); v.push_back(std::to_string(e.respawn_time));
v.push_back(std::to_string(e.respawn_var)); v.push_back(std::to_string(e.respawn_var));
v.push_back(std::to_string(e.triggered_number)); v.push_back(std::to_string(e.triggered_number));
v.push_back(std::to_string(e.group)); v.push_back(std::to_string(e.group_));
v.push_back(std::to_string(e.despawn_when_triggered)); v.push_back(std::to_string(e.despawn_when_triggered));
v.push_back(std::to_string(e.undetectable)); v.push_back(std::to_string(e.undetectable));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));
@ -386,7 +386,7 @@ public:
v.push_back(std::to_string(e.respawn_time)); v.push_back(std::to_string(e.respawn_time));
v.push_back(std::to_string(e.respawn_var)); v.push_back(std::to_string(e.respawn_var));
v.push_back(std::to_string(e.triggered_number)); v.push_back(std::to_string(e.triggered_number));
v.push_back(std::to_string(e.group)); v.push_back(std::to_string(e.group_));
v.push_back(std::to_string(e.despawn_when_triggered)); v.push_back(std::to_string(e.despawn_when_triggered));
v.push_back(std::to_string(e.undetectable)); v.push_back(std::to_string(e.undetectable));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));
@ -444,7 +444,7 @@ public:
e.respawn_time = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 60; e.respawn_time = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 60;
e.respawn_var = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0; e.respawn_var = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0;
e.triggered_number = row[17] ? static_cast<int8_t>(atoi(row[17])) : 0; e.triggered_number = row[17] ? static_cast<int8_t>(atoi(row[17])) : 0;
e.group = row[18] ? static_cast<int8_t>(atoi(row[18])) : 0; e.group_ = row[18] ? static_cast<int8_t>(atoi(row[18])) : 0;
e.despawn_when_triggered = row[19] ? static_cast<int8_t>(atoi(row[19])) : 0; e.despawn_when_triggered = row[19] ? static_cast<int8_t>(atoi(row[19])) : 0;
e.undetectable = row[20] ? static_cast<int8_t>(atoi(row[20])) : 0; e.undetectable = row[20] ? static_cast<int8_t>(atoi(row[20])) : 0;
e.min_expansion = row[21] ? static_cast<int8_t>(atoi(row[21])) : -1; e.min_expansion = row[21] ? static_cast<int8_t>(atoi(row[21])) : -1;
@ -493,7 +493,7 @@ public:
e.respawn_time = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 60; e.respawn_time = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 60;
e.respawn_var = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0; e.respawn_var = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0;
e.triggered_number = row[17] ? static_cast<int8_t>(atoi(row[17])) : 0; e.triggered_number = row[17] ? static_cast<int8_t>(atoi(row[17])) : 0;
e.group = row[18] ? static_cast<int8_t>(atoi(row[18])) : 0; e.group_ = row[18] ? static_cast<int8_t>(atoi(row[18])) : 0;
e.despawn_when_triggered = row[19] ? static_cast<int8_t>(atoi(row[19])) : 0; e.despawn_when_triggered = row[19] ? static_cast<int8_t>(atoi(row[19])) : 0;
e.undetectable = row[20] ? static_cast<int8_t>(atoi(row[20])) : 0; e.undetectable = row[20] ? static_cast<int8_t>(atoi(row[20])) : 0;
e.min_expansion = row[21] ? static_cast<int8_t>(atoi(row[21])) : -1; e.min_expansion = row[21] ? static_cast<int8_t>(atoi(row[21])) : -1;
@ -592,7 +592,7 @@ public:
v.push_back(std::to_string(e.respawn_time)); v.push_back(std::to_string(e.respawn_time));
v.push_back(std::to_string(e.respawn_var)); v.push_back(std::to_string(e.respawn_var));
v.push_back(std::to_string(e.triggered_number)); v.push_back(std::to_string(e.triggered_number));
v.push_back(std::to_string(e.group)); v.push_back(std::to_string(e.group_));
v.push_back(std::to_string(e.despawn_when_triggered)); v.push_back(std::to_string(e.despawn_when_triggered));
v.push_back(std::to_string(e.undetectable)); v.push_back(std::to_string(e.undetectable));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));
@ -639,7 +639,7 @@ public:
v.push_back(std::to_string(e.respawn_time)); v.push_back(std::to_string(e.respawn_time));
v.push_back(std::to_string(e.respawn_var)); v.push_back(std::to_string(e.respawn_var));
v.push_back(std::to_string(e.triggered_number)); v.push_back(std::to_string(e.triggered_number));
v.push_back(std::to_string(e.group)); v.push_back(std::to_string(e.group_));
v.push_back(std::to_string(e.despawn_when_triggered)); v.push_back(std::to_string(e.despawn_when_triggered));
v.push_back(std::to_string(e.undetectable)); v.push_back(std::to_string(e.undetectable));
v.push_back(std::to_string(e.min_expansion)); v.push_back(std::to_string(e.min_expansion));

3
utils/scripts/generators/repository-generator.pl
View File

@ -607,7 +607,8 @@ sub get_reserved_cpp_variable_names
"key", "key",
"rank", "rank",
"range", "range",
"interval" "interval",
"group"
); );
} }

11
zone/spawn2.cpp
View File

@ -887,10 +887,6 @@ bool SpawnConditionManager::LoadSpawnConditions(const std::string& zone_short_na
) )
); );
if (conditions.empty()) {
return false;
}
for (const auto& e : conditions) { for (const auto& e : conditions) {
SpawnCondition c; SpawnCondition c;
@ -919,10 +915,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const std::string& zone_short_na
) )
); );
if (condition_values.empty()) {
spawn_conditions.clear(); spawn_conditions.clear();
return false;
}
for (const auto& e : condition_values) { for (const auto& e : condition_values) {
auto i = spawn_conditions.find(e.id); auto i = spawn_conditions.find(e.id);
@ -939,10 +932,6 @@ bool SpawnConditionManager::LoadSpawnConditions(const std::string& zone_short_na
) )
); );
if (events.empty()) {
return false;
}
LogInfo("Loaded [{}] spawn_events", Strings::Commify(std::to_string(events.size()))); LogInfo("Loaded [{}] spawn_events", Strings::Commify(std::to_string(events.size())));
for (const auto& e : events) { for (const auto& e : events) {

6
zone/trap.cpp
View File

@ -459,8 +459,8 @@ bool ZoneDatabase::LoadTraps(const std::string& zone_short_name, int16 instance_
} }
for (const auto& e : l) { for (const auto& e : l) {
if (e.group) { if (e.group_) {
if (entity_list.IsTrapGroupSpawned(e.id, e.group)) { if (entity_list.IsTrapGroupSpawned(e.id, e.group_)) {
// If a member of our group is already spawned skip loading this trap. // If a member of our group is already spawned skip loading this trap.
continue; continue;
} }
@ -482,7 +482,7 @@ bool ZoneDatabase::LoadTraps(const std::string& zone_short_name, int16 instance_
t->respawn_time = e.respawn_time; t->respawn_time = e.respawn_time;
t->respawn_var = e.respawn_var; t->respawn_var = e.respawn_var;
t->level = e.level; t->level = e.level;
t->group = e.group; t->group = e.group_;
t->triggered_number = e.triggered_number; t->triggered_number = e.triggered_number;
t->despawn_when_triggered = e.despawn_when_triggered; t->despawn_when_triggered = e.despawn_when_triggered;
t->undetectable = e.undetectable; t->undetectable = e.undetectable;

42
zone/zone.cpp
View File

@ -1123,49 +1123,25 @@ bool Zone::Init(bool is_static) {
watermap = WaterMap::LoadWaterMapfile(map_name); watermap = WaterMap::LoadWaterMapfile(map_name);
pathing = IPathfinder::Load(map_name); pathing = IPathfinder::Load(map_name);
if(!spawn_conditions.LoadSpawnConditions(short_name, instanceid)) { spawn_conditions.LoadSpawnConditions(short_name, instanceid);
LogError("Loading spawn conditions failed, continuing without them");
}
if (!content_db.LoadStaticZonePoints(&zone_point_list, short_name, GetInstanceVersion())) { content_db.LoadStaticZonePoints(&zone_point_list, short_name, GetInstanceVersion());
LogError("Loading static zone points failed");
return false;
}
if (!content_db.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) { if (!content_db.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) {
LogError("Loading spawn groups failed"); LogError("Loading spawn groups failed");
return false; return false;
} }
if (!content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion())) content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion());
{ database.LoadCharacterCorpses(zoneid, instanceid);
LogError("Loading spawn2 points failed");
return false;
}
if (!database.LoadCharacterCorpses(zoneid, instanceid)) { content_db.LoadTraps(short_name, GetInstanceVersion());
LogError("Loading player corpses failed");
return false;
}
if (!content_db.LoadTraps(short_name, GetInstanceVersion()))
{
LogError("Loading traps failed");
return false;
}
LogInfo("Loading adventure flavor text"); LogInfo("Loading adventure flavor text");
LoadAdventureFlavor(); LoadAdventureFlavor();
if (!LoadGroundSpawns()) LoadGroundSpawns();
{ LoadZoneObjects();
LogError("Loading ground spawns failed. continuing");
}
if (!LoadZoneObjects())
{
LogError("Loading World Objects failed. continuing");
}
RespawnTimesRepository::ClearExpiredRespawnTimers(database); RespawnTimesRepository::ClearExpiredRespawnTimers(database);
@ -1923,9 +1899,7 @@ void Zone::Repop()
LogError("Loading spawn groups failed"); LogError("Loading spawn groups failed");
} }
if (!spawn_conditions.LoadSpawnConditions(short_name, instanceid)) { spawn_conditions.LoadSpawnConditions(short_name, instanceid);
LogError("Loading spawn conditions failed, continuing without them");
}
if (!content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion())) { if (!content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion())) {
LogDebug("Error in Zone::Repop: database.PopulateZoneSpawnList failed"); LogDebug("Error in Zone::Repop: database.PopulateZoneSpawnList failed");