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

[Hotfix] Fix issues where we're using the wrong database pointers

Browse Source
This commit is contained in:
Akkadius 2024-02-12 21:41:52 -06:00
parent 20cdc1e63d
commit c50100fcdb
8 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
## [22.44.5] - 2/12/2024
### Fixes
* [Hotfix] Fix issues where we're using the wrong database pointers @Akkadius
## [22.44.4] - 2/12/2024
### Fixes

14
common/guild_base.h
View File

@ -75,9 +75,18 @@ class BaseGuildManager
virtual ~BaseGuildManager();
//this must be called before doing anything else with this object
void SetDatabase(Database *db)
BaseGuildManager * SetDatabase(Database *db)
{
m_db = db;
return this;
}
BaseGuildManager * SetContentDatabase(Database *db)
{
m_content_db = db;
return this;
}
bool LoadGuilds();
@ -194,7 +203,8 @@ class BaseGuildManager
std::map<uint32, GuildInfo *> m_guilds; //we own the pointers in this map
void ClearGuilds(); //clears internal structure
Database *m_db; //we do not own this
Database *m_db;
Database *m_content_db;
bool _StoreGuildDB(uint32 guild_id);
GuildInfo* _CreateGuild(uint32 guild_id, std::string guild_name, uint32 leader_char_id, uint8 minstatus, std::string guild_motd, std::string motd_setter, std::string Channel, std::string URL, uint32 favour);

2
common/version.h
View File

@ -25,7 +25,7 @@
// Build variables
// these get injected during the build pipeline
#define CURRENT_VERSION "22.44.4-dev" // always append -dev to the current version for custom-builds
#define CURRENT_VERSION "22.44.5-dev" // always append -dev to the current version for custom-builds
#define LOGIN_VERSION "0.8.0"
#define COMPILE_DATE __DATE__
#define COMPILE_TIME __TIME__

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "eqemu-server",
"version": "22.44.4",
"version": "22.44.5",
"repository": {
"type": "git",
"url": "https://github.com/EQEmu/Server.git"

4
world/wguild_mgr.cpp
View File

@ -325,7 +325,7 @@ bool WorldGuildManager::LoadTributes()
tribute_list.clear();
auto tributes = TributesRepository::All(*m_db);
auto tributes = TributesRepository::All(*m_content_db);
for (auto const& t : tributes) {
td.name = t.name;
td.description = t.descr;
@ -336,7 +336,7 @@ bool WorldGuildManager::LoadTributes()
LogInfo("Loaded [{}] tributes", Strings::Commify(tributes.size()));
auto tribute_levels = TributeLevelsRepository::GetWhere(*m_db, "TRUE ORDER BY tribute_id, level");
auto tribute_levels = TributeLevelsRepository::GetWhere(*m_content_db, "TRUE ORDER BY tribute_id, level");
for (auto const& t : tribute_levels) {
uint32 id = t.tribute_id;

2
world/world_boot.cpp
View File

@ -264,7 +264,7 @@ bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
}
}
guild_mgr.SetDatabase(&database);
guild_mgr.SetDatabase(&database)->SetContentDatabase(&content_db);
LogInfo("Purging expired data buckets");
database.PurgeAllDeletedDataBuckets();

2
zone/main.cpp
View File

@ -318,7 +318,7 @@ int main(int argc, char **argv)
}
/* Guilds */
guild_mgr.SetDatabase(&database);
guild_mgr.SetDatabase(&database)->SetContentDatabase(&content_db);
GuildBanks = nullptr;
#ifdef _EQDEBUG

4
zone/spawn2.cpp
View File

@ -440,14 +440,14 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
std::unordered_map<uint32, uint32> spawn_times;
timeval tv;
timeval tv{};
gettimeofday(&tv, nullptr);
/* Bulk Load NPC Types Data into the cache */
content_db.LoadNPCTypesData(0, true);
const auto& l = RespawnTimesRepository::GetWhere(
*this,
database,
fmt::format(
"`instance_id` = {}",
zone->GetInstanceID()