From c73c7d4cfdeafc58cf307bcc9bfa984e8109498f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Sun, 12 Feb 2017 20:15:54 +0100
Subject: [PATCH 1/2] remove bad extra spaces in build script

---
 s/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s/build b/s/build
index f471229b8..acd338c4a 100755
--- a/s/build
+++ b/s/build
@@ -35,7 +35,7 @@ git submodule update
 echo "build eressea"
 cd $ROOT/$BUILD
 BRANCH=$(git status -s -b | head -1 | cut -d\  -f 2 | sed 's/\..*//')
-if [ "$BRANCH" == "master" ] ; then
+if [ "$BRANCH"=="master" ] ; then
 VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//')
 cmake -DERESSEA_VERSION="$VERSION" ..
 else

From 5796f60f16b69acdd4d5d72a64d5e465c5e4aa70 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Sat, 18 Feb 2017 22:00:48 +0100
Subject: [PATCH 2/2] spells will always resist magic

---
 src/magic.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/magic.c b/src/magic.c
index 2299e6523..15dc14307 100644
--- a/src/magic.c
+++ b/src/magic.c
@@ -1240,6 +1240,9 @@ target_resists_magic(unit * magician, void *obj, int objtyp, int t_bonus)
         skill *sv;
         unit *u = (unit *)obj;
 
+        if (u_race(u)==get_race(RC_SPELL)) {
+            return true;
+        }
         at = effskill(magician, SK_MAGIC, 0);
 
         for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) {