Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-24 06:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

crash and log fix (#1382)

Browse Source
This commit is contained in:
David Markowitz 2024-01-02 22:52:11 -08:00 committed by GitHub
parent bb79528c0e
commit a84ca1f00d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dCommon/Logger.cpp
View File

@ -16,7 +16,7 @@ Writer::~Writer() {
} }
void Writer::Log(const char* time, const char* message) { void Writer::Log(const char* time, const char* message) {
if (!m_Outfile) return; if (!m_Outfile || !m_Enabled) return;
fputs(time, m_Outfile); fputs(time, m_Outfile);
fputs(message, m_Outfile); fputs(message, m_Outfile);

12
dGame/dComponents/BuffComponent.cpp
View File

@ -95,10 +95,16 @@ void BuffComponent::Update(float deltaTime) {
if (buff.second.time <= 0.0f) { if (buff.second.time <= 0.0f) {
RemoveBuff(buff.first); RemoveBuff(buff.first);
}
}
break; if (m_BuffsToRemove.empty()) return;
}
for (const auto& buff : m_BuffsToRemove) {
m_Buffs.erase(buff);
} }
m_BuffsToRemove.clear();
} }
const std::string& GetFxName(const std::string& buffname) { const std::string& GetFxName(const std::string& buffname) {
@ -216,7 +222,7 @@ void BuffComponent::RemoveBuff(int32_t id, bool fromUnEquip, bool removeImmunity
GameMessages::SendRemoveBuff(m_Parent, fromUnEquip, removeImmunity, id); GameMessages::SendRemoveBuff(m_Parent, fromUnEquip, removeImmunity, id);
m_Buffs.erase(iter); m_BuffsToRemove.push_back(id);
RemoveBuffEffect(id); RemoveBuffEffect(id);
} }

3
dGame/dComponents/BuffComponent.h
View File

@ -140,6 +140,9 @@ private:
*/ */
std::map<int32_t, Buff> m_Buffs; std::map<int32_t, Buff> m_Buffs;
// Buffs to remove at the end of the update frame.
std::vector<int32_t> m_BuffsToRemove;
/** /**
* Parameters (=effects) for each buff * Parameters (=effects) for each buff
*/ */