pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 15:00:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Respawns] Convert Respawn Times to Repositories (#3949)

Browse Source 
* [Respawns] Convert Respawn Times to Repositories

- Convert `respawn_times` based methods to repositories.

* Missed some.

* Comments
This commit is contained in:
Alex King
2024-01-12 23:38:31 -05:00
committed by GitHub
parent 818f833d04
commit 71f78b757e
7 changed files with 108 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spawn2.cpp
+17 -22
View File
@@ -29,6 +29,7 @@
#include "../common/repositories/criteria/content_filter_criteria.h"
#include "../common/repositories/spawn2_repository.h"
#include "../common/repositories/spawn2_disabled_repository.h"
#include "../common/repositories/respawn_times_repository.h"
extern EntityList entity_list;
extern Zone* zone;
@@ -442,32 +443,26 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
/* Bulk Load NPC Types Data into the cache */
content_db.LoadNPCTypesData(0, true);
std::string spawn_query = StringFormat(
"SELECT "
"respawn_times.id, "
"respawn_times.`start`, "
"respawn_times.duration "
"FROM "
"respawn_times "
"WHERE instance_id = %u",
zone->GetInstanceID()
const auto& l = RespawnTimesRepository::GetWhere(
*this,
fmt::format(
"`instance_id` = {}",
zone->GetInstanceID()
)
);
auto results = database.QueryDatabase(spawn_query);
for (auto row = results.begin(); row != results.end(); ++row) {
uint32 start_duration = Strings::ToInt(row[1]) > 0 ? Strings::ToInt(row[1]) : 0;
uint32 end_duration = Strings::ToInt(row[2]) > 0 ? Strings::ToInt(row[2]) : 0;
/* Our current time was expired */
if ((start_duration + end_duration) <= tv.tv_sec) {
spawn_times[Strings::ToInt(row[0])] = 0;
}
/* We still have time left on this timer */
else {
spawn_times[Strings::ToInt(row[0])] = ((start_duration + end_duration) - tv.tv_sec) * 1000;
for (const auto& e : l) {
int start = e.start > 0 ? e.start : 0;
int duration = e.duration > 0 ? e.duration : 0;
if ((start + duration) <= tv.tv_sec) { // Our current time was expired
spawn_times[e.id] = 0;
} else { // We still have time left on this timer
spawn_times[e.id] = ((start + duration) - tv.tv_sec) * 1000;
}
}
LogInfo("Loaded [{}] respawn timer(s)", Strings::Commify(results.RowCount()));
LogInfo("Loaded [{}] respawn timer(s)", Strings::Commify(l.size()));
const char *zone_name = ZoneName(zoneid);
@@ -537,7 +532,7 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
spawn2_list.Insert(new_spawn);
}
LogInfo("Loaded [{}] spawn2 entries", Strings::Commify(results.RowCount()));
LogInfo("Loaded [{}] spawn2 entries", Strings::Commify(l.size()));
NPC::SpawnZoneController();