diff --git a/src/Battling/Models/Creature.cpp b/src/Battling/Models/Creature.cpp index 2fca930..72759ec 100644 --- a/src/Battling/Models/Creature.cpp +++ b/src/Battling/Models/Creature.cpp @@ -101,7 +101,10 @@ void Battling::Creature::Damage(uint32_t damage, Battling::DamageSource source) } // HOOK: On Damage auto newHealth = _currentHealth - damage; - this->GetBattle()->TriggerEventListener(new DamageEvent(this, source, _currentHealth, newHealth)); + auto battle = this->GetBattle(); + if (battle != nullptr) { + battle->TriggerEventListener(new DamageEvent(this, source, _currentHealth, newHealth)); + } _currentHealth = newHealth; if (IsFainted() && damage > 0) {