From d55a9e8494c63d73b8eea3107fc2340cd4eef029 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Sun, 2 Aug 2020 09:52:11 +0200
Subject: [PATCH] Add more assertions to prevent segfaults.

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

diff --git a/src/Battling/Models/Creature.cpp b/src/Battling/Models/Creature.cpp
index 116d5ff..5cd4e4a 100644
--- a/src/Battling/Models/Creature.cpp
+++ b/src/Battling/Models/Creature.cpp
@@ -122,6 +122,8 @@ const ArbUt::BorrowedPtr<CreatureLib::Battling::BattleSide>& Battling::Creature:
 bool Battling::Creature::IsFainted() const noexcept { return this->_currentHealth == 0; }
 
 void Battling::Creature::OnFaint() {
+    AssertNotNull(_battle)
+    AssertNotNull(_side)
     // HOOK: On Faint
     if (_battle != nullptr) {
         _battle->TriggerEventListener<FaintEvent>(this);
@@ -148,7 +150,7 @@ void Battling::Creature::Damage(uint32_t damage, Battling::DamageSource source)
     }
     _currentHealth = newHealth;
 
-    if (IsFainted() && damage > 0) {
+    if (IsFainted() && damage > 0 && battle != nullptr) {
         OnFaint();
     }
 }