From 7d7842b849acfa941fa9fcfd7017ab0fbe523b00 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 3 May 2021 20:15:23 +0200
Subject: [PATCH] do_combatspell didn't check that the unit was a mage.

---
 src/battle.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/battle.c b/src/battle.c
index 09a786597..828c2eda1 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -1781,8 +1781,12 @@ static void do_combatspell(troop at)
     int fumblechance = 0;
     struct sc_mage *mage = get_mage(u);
 
+    if (!mage) {
+        fi->magic = 0;              /* Hat keinen Kampfzauber, kaempft nichtmagisch weiter */
+        return;
+    }
     sp = mage_get_combatspell(mage, 1, &sl);
-    if (sl <= 0 || sp == NULL || !u_hasspell(u, sp)) {
+    if (sp == NULL || sl <= 0 || !u_hasspell(u, sp)) {
         fi->magic = 0;              /* Hat keinen Kampfzauber, kaempft nichtmagisch weiter */
         return;
     }