From fc5826edb1d164a261a33aebb164af7df8ab7ef4 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Sun, 2 Feb 2020 12:34:02 +0100
Subject: [PATCH] Check whether a battle has been set when calling Damage
 function.

---
 src/Battling/Models/Creature.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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) {