pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-26 13:42:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed spawn2 and ground spawn issue

Browse Source
This commit is contained in:
Xackery 2019-01-31 04:34:42 -08:00
parent d545e1ba04
commit 0eb7667779
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/object.cpp
View File

@ -699,7 +699,7 @@ Ground_Spawns* ZoneDatabase::LoadGroundSpawns(uint32 zone_id, int16 version, Gro
"min_x, min_y, heading, name, " "min_x, min_y, heading, name, "
"item, max_allowed, respawn_timer " "item, max_allowed, respawn_timer "
"FROM ground_spawns " "FROM ground_spawns "
"WHERE zoneid = %i AND (version = %u OR version = -1) AND min_expansion <= %i AND max_expansion >= %i" "WHERE zoneid = %i AND (version = %u OR version = -1) AND min_expansion <= %i AND max_expansion >= %i "
"LIMIT 50", zone_id, version, latest_expansion, latest_expansion); "LIMIT 50", zone_id, version, latest_expansion, latest_expansion);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {

9
zone/spawn2.cpp
View File

@ -575,6 +575,7 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
} }
const char *zone_name = database.GetZoneName(zoneid); const char *zone_name = database.GetZoneName(zoneid);
auto latest_expansion = EQEmu::expansions::ConvertExpansionMaskToLatestExpansion(RuleI(World, ExpansionSettings));
std::string query = StringFormat( std::string query = StringFormat(
"SELECT " "SELECT "
"id, " "id, "
@ -592,11 +593,15 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
"animation " "animation "
"FROM " "FROM "
"spawn2 " "spawn2 "
"WHERE zone = '%s' AND (version = %u OR version = -1)", "WHERE zone = '%s' AND (version = %u OR version = -1) AND min_expansion <= %i AND max_expansion >= %i",
zone_name, zone_name,
version version,
latest_expansion,
latest_expansion
); );
results = QueryDatabase(query); results = QueryDatabase(query);
Log(Logs::General, Logs::Status, "%s", query.c_str());
if (!results.Success()) { if (!results.Success()) {
return false; return false;