Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-02 02:43:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: read set_faction the way the client does

Browse Source 
Level files set factions with set_faction, and most of the string-typed
values have a trailing space ("13:6 ", "13:-1 ") or hold several
factions separated by spaces ("13:4 6"). The server split only on ';'
and TryParse rejects trailing characters, so about 1,500 placed objects
(smashable lanterns, fences, candles, treasure chest spawners and so on)
silently kept their component faction instead.

LWODestroyableComponent::LoadConfigData in the 1.10.64 client reads
set_faction as a string, splits it on both ';' and ' ', and replaces its
faction list with the result. The server now does the same: split on
both, skip empty pieces, and replace the factions (SetFaction for the
first, AddFaction for the rest). This also removes the TODO about
splitting on spaces, and the faction list from the destructible table
no longer uses std::stoi on a token that TryParse already parsed.

Values in the shipped maps were counted with a scan of the .lvl files.
Needs an in-game check that objects placed with set_faction (for example
the AG Survival buff stations and NT treasure chests) are still targeted
or ignored as expected; this may also affect #1301.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 18:42:13 -05:00
parent 363e02e963
commit 536c36227c
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dGame/Entity.cpp
View File

@@ -474,24 +474,26 @@ void Entity::Initialize() {
const auto tokenInt = GeneralUtils::TryParse<int32_t>(token); const auto tokenInt = GeneralUtils::TryParse<int32_t>(token);
if (tokenInt == destCompData[0].faction) continue; if (tokenInt == destCompData[0].faction) continue;
if (!token.empty()) { if (tokenInt) comp->AddFaction(tokenInt.value());
comp->AddFaction(std::stoi(token));
}
} }
} }
// override the factions if needed. // Level files can replace the factions with set_faction. The client splits the value on
// both ';' and ' ' and replaces its faction list with the result
// (LWODestroyableComponent::LoadConfigData), and many values have a trailing space ("13:6 ").
const auto setFaction = GetVarAsString(u"set_faction"); const auto setFaction = GetVarAsString(u"set_faction");
if (!setFaction.empty()) { std::vector<int32_t> factionsToSet;
// TODO also split on space here however we do not have a general util for splitting on multiple characters yet. for (const auto& semicolonSplit : GeneralUtils::SplitString(setFaction, ';')) {
const auto factionsToAdd = GeneralUtils::SplitString(setFaction, ';'); for (const auto& faction : GeneralUtils::SplitString(semicolonSplit, ' ')) {
for (const auto& faction : factionsToAdd) {
const auto factionToAdd = GeneralUtils::TryParse<int32_t>(faction); const auto factionToAdd = GeneralUtils::TryParse<int32_t>(faction);
if (factionToAdd) { if (factionToAdd) factionsToSet.push_back(factionToAdd.value());
comp->AddFaction(factionToAdd.value(), true);
}
} }
} }
if (!factionsToSet.empty()) {
comp->SetFaction(factionsToSet.front(), true);
for (const auto faction : factionsToSet | std::views::drop(1)) comp->AddFaction(faction, true);
}
} }
const auto characterID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::CHARACTER); const auto characterID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::CHARACTER);