From 17552c33ca03cc714241a20438d46190a82b4fed Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Mon, 17 Feb 2020 09:57:15 +0100
Subject: [PATCH] Only get active scripts from side if side exists.

---
 src/Battling/Models/Creature.cpp        | 4 +++-
 src/Battling/Models/ExecutingAttack.hpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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<ScriptWrapper>& 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<ScriptWrapper>& scripts) override {
             scripts.emplace_back(&_script);
-            GetUser()->GetActiveScripts(scripts);
+            _user->GetActiveScripts(scripts);
         }
     };
 }