pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 07:18:37 +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
5 changed files with 26 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/trap.cpp
+3 -3
View File
@@ -459,8 +459,8 @@ bool ZoneDatabase::LoadTraps(const std::string& zone_short_name, int16 instance_
}
for (const auto& e : l) {
if (e.group) {
if (entity_list.IsTrapGroupSpawned(e.id, e.group)) {
if (e.group_) {
if (entity_list.IsTrapGroupSpawned(e.id, e.group_)) {
// If a member of our group is already spawned skip loading this trap.
continue;
}
@@ -482,7 +482,7 @@ bool ZoneDatabase::LoadTraps(const std::string& zone_short_name, int16 instance_
t->respawn_time = e.respawn_time;
t->respawn_var = e.respawn_var;
t->level = e.level;
t->group = e.group;
t->group = e.group_;
t->triggered_number = e.triggered_number;
t->despawn_when_triggered = e.despawn_when_triggered;
t->undetectable = e.undetectable;