diff --git a/src/Battling/Models/Creature.cpp b/src/Battling/Models/Creature.cpp index a12015a..d9d7820 100644 --- a/src/Battling/Models/Creature.cpp +++ b/src/Battling/Models/Creature.cpp @@ -147,7 +147,9 @@ void Battling::Creature::GetActiveScripts(std::vector& scripts) { scripts.emplace_back(&_activeTalent); scripts.emplace_back(&_status); scripts.emplace_back(&_volatile); - _side->GetActiveScripts(scripts); + if (_side != nullptr) { + _side->GetActiveScripts(scripts); + } } void Battling::Creature::ClearVolatileScripts() { _volatile.Clear(); } void Battling::Creature::AddExperience(uint32_t amount) { diff --git a/src/Battling/Models/ExecutingAttack.hpp b/src/Battling/Models/ExecutingAttack.hpp index 8712616..e83f0eb 100644 --- a/src/Battling/Models/ExecutingAttack.hpp +++ b/src/Battling/Models/ExecutingAttack.hpp @@ -82,7 +82,7 @@ namespace CreatureLib::Battling { protected: void GetActiveScripts(std::vector& scripts) override { scripts.emplace_back(&_script); - GetUser()->GetActiveScripts(scripts); + _user->GetActiveScripts(scripts); } }; }