pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-19 16:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #36 from Valorith/fix/buff-suppression-persistence

Browse Source 
Fix: Persist buff suppression state across zones
This commit is contained in:
Vayle 2026-01-30 22:43:28 -05:00 committed by GitHub
commit 3ec73a8924
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/repositories/base/base_character_buffs_repository.h
View File

@ -36,6 +36,7 @@ public:
int32_t caston_z;
int32_t ExtraDIChance;
int32_t instrument_mod;
uint8_t suppressed;
};
static std::string PrimaryKey()
@ -63,6 +64,7 @@ public:
"caston_z",
"ExtraDIChance",
"instrument_mod",
"suppressed",
};
}
@ -86,6 +88,7 @@ public:
"caston_z",
"ExtraDIChance",
"instrument_mod",
"suppressed",
};
}
@ -143,6 +146,7 @@ public:
e.caston_z = 0;
e.ExtraDIChance = 0;
e.instrument_mod = 10;
e.suppressed = 0;
return e;
}
@ -196,6 +200,7 @@ public:
e.caston_z = row[14] ? static_cast<int32_t>(atoi(row[14])) : 0;
e.ExtraDIChance = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
e.instrument_mod = row[16] ? static_cast<int32_t>(atoi(row[16])) : 10;
e.suppressed = row[17] ? static_cast<uint8_t>(strtoul(row[17], nullptr, 10)) : 0;
return e;
}
@ -246,6 +251,7 @@ public:
v.push_back(columns[14] + " = " + std::to_string(e.caston_z));
v.push_back(columns[15] + " = " + std::to_string(e.ExtraDIChance));
v.push_back(columns[16] + " = " + std::to_string(e.instrument_mod));
v.push_back(columns[17] + " = " + std::to_string(e.suppressed));
auto results = db.QueryDatabase(
fmt::format(
@ -284,6 +290,7 @@ public:
v.push_back(std::to_string(e.caston_z));
v.push_back(std::to_string(e.ExtraDIChance));
v.push_back(std::to_string(e.instrument_mod));
v.push_back(std::to_string(e.suppressed));
auto results = db.QueryDatabase(
fmt::format(
@ -330,6 +337,7 @@ public:
v.push_back(std::to_string(e.caston_z));
v.push_back(std::to_string(e.ExtraDIChance));
v.push_back(std::to_string(e.instrument_mod));
v.push_back(std::to_string(e.suppressed));
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
}
@ -380,6 +388,7 @@ public:
e.caston_z = row[14] ? static_cast<int32_t>(atoi(row[14])) : 0;
e.ExtraDIChance = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
e.instrument_mod = row[16] ? static_cast<int32_t>(atoi(row[16])) : 10;
e.suppressed = row[17] ? static_cast<uint8_t>(strtoul(row[17], nullptr, 10)) : 0;
all_entries.push_back(e);
}
@ -421,6 +430,7 @@ public:
e.caston_z = row[14] ? static_cast<int32_t>(atoi(row[14])) : 0;
e.ExtraDIChance = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
e.instrument_mod = row[16] ? static_cast<int32_t>(atoi(row[16])) : 10;
e.suppressed = row[17] ? static_cast<uint8_t>(strtoul(row[17], nullptr, 10)) : 0;
all_entries.push_back(e);
}
@ -512,6 +522,7 @@ public:
v.push_back(std::to_string(e.caston_z));
v.push_back(std::to_string(e.ExtraDIChance));
v.push_back(std::to_string(e.instrument_mod));
v.push_back(std::to_string(e.suppressed));
auto results = db.QueryDatabase(
fmt::format(
@ -551,6 +562,7 @@ public:
v.push_back(std::to_string(e.caston_z));
v.push_back(std::to_string(e.ExtraDIChance));
v.push_back(std::to_string(e.instrument_mod));
v.push_back(std::to_string(e.suppressed));
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
}

2
utils/sql/git/optional/2025_06_27_add_suppressed_to_character_buffs.sql Normal file
View File

@ -0,0 +1,2 @@
-- Add suppressed column to character_buffs to persist buff suppression state across zones
ALTER TABLE `character_buffs` ADD COLUMN `suppressed` tinyint(1) unsigned NOT NULL DEFAULT 0 AFTER `instrument_mod`;

13
zone/zonedb.cpp
View File

@ -2928,6 +2928,7 @@ void ZoneDatabase::SaveBuffs(Client *client)
e.caston_z = buffs[slot_id].caston_z;
e.ExtraDIChance = buffs[slot_id].ExtraDIChance;
e.instrument_mod = buffs[slot_id].instrument_mod;
e.suppressed = suppressed ? 1 : 0;
v.emplace_back(e);
}
@ -2999,14 +3000,26 @@ void ZoneDatabase::LoadBuffs(Client *client)
buffs[e.slot_id].virus_spread_time = 0;
buffs[e.slot_id].UpdateClient = false;
buffs[e.slot_id].instrument_mod = e.instrument_mod;
if (e.suppressed) {
buffs[e.slot_id].suppressedid = e.spell_id;
buffs[e.slot_id].suppressedticsremaining = e.ticsremaining;
buffs[e.slot_id].spellid = SPELL_SUPPRESSED;
buffs[e.slot_id].ticsremaining = 0;
} else {
buffs[e.slot_id].suppressedid = 0;
buffs[e.slot_id].suppressedticsremaining = -1;
}
}
// We load up to the most our client supports
max_buff_slots = EQ::spells::StaticLookup(client->ClientVersion())->LongBuffs;
for (int slot_id = 0; slot_id < max_buff_slots; ++slot_id) {
if (buffs[slot_id].spellid == SPELL_SUPPRESSED) {
continue;
}
if (!IsValidSpell(buffs[slot_id].spellid)) {
continue;
}