From bb1059eaa1ffc077faf7fb84fc41774db051d3cd Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 5 Mar 2008 21:27:55 +0000
Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D13?=
 =?UTF-8?q?64=20"Wechsel=20von=20Astralraum=20in=20den=20Realraum=20m?=
 =?UTF-8?q?=C3=B6glich,=20obwohl=20Der=20Kontakt=20zur=20Realist=C3=A4t=20?=
 =?UTF-8?q?verhindert=20ist."=20-=20was=20checking=20the=20wrong=20region.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/spells/spells.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 5c5052075..138a4ec11 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -5761,11 +5761,6 @@ sp_fetchastral(castorder *co)
     return 0;
   }
 
-  if (is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) {
-    ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_distance", ""));
-    return 0;
-  }
-
   /* für jede Einheit in der Kommandozeile */
   for (n=0; n!=pa->length; ++n) {
     unit * u2, * u = pa->param[n]->data.u;
@@ -5796,8 +5791,8 @@ sp_fetchastral(castorder *co)
       ro = u->region;
     }
 
-    if (is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) {
-      ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_distance", ""));
+    if (is_cursed(ro->attribs, C_ASTRALBLOCK, 0)) {
+      ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_astralblock", ""));
       continue;
     }
 
@@ -5969,18 +5964,16 @@ sp_viewreality(castorder *co)
     return 0;
   }
 
-  if (is_cursed(r->attribs, C_ASTRALBLOCK, 0)) {
-    ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_astralblock", ""));
-    return 0;
-  }
-
   rl = astralregions(r, NULL);
 
   /* Irgendwann mal auf Curses u/o Attribut umstellen. */
   for (rl2=rl; rl2; rl2=rl2->next) {
-    u = create_unit(rl2->data, mage->faction, RS_FARVISION, new_race[RC_SPELL], 0, "spell/viewreality", NULL);
-    set_level(u, SK_OBSERVATION, co->level/2);
-    u->age = 2;
+    region * rt = rl2->data;
+    if (!is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) {
+      u = create_unit(rt, mage->faction, RS_FARVISION, new_race[RC_SPELL], 0, "spell/viewreality", NULL);
+      set_level(u, SK_OBSERVATION, co->level/2);
+      u->age = 2;
+    }
   }
 
   free_regionlist(rl);