summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 69db2e76e9..6244ecea12 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3263,7 +3263,7 @@ static int _affect_player( bolt &beam, item_def *item )
&& beam.flavour != BEAM_HEALING
&& beam.flavour != BEAM_POLYMORPH
&& beam.flavour != BEAM_DISPEL_UNDEAD
- && ((beam.flavour != BEAM_TELEPORT && beam.flavour != BEAM_BANISH)
+ && (beam.flavour != BEAM_TELEPORT && beam.flavour != BEAM_BANISH
|| !beam.aimed_at_feet)
&& you_resist_magic( beam.ench_power ))
{
@@ -3389,6 +3389,11 @@ static int _affect_player( bolt &beam, item_def *item )
break; // enslavement - confusion?
case BEAM_BANISH:
+ if (YOU_KILL(beam.thrower))
+ {
+ mpr("This spell isn't strong enough to banish yourself.");
+ break;
+ }
if (you.level_type == LEVEL_ABYSS)
{
mpr("You feel trapped.");