summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-20 21:05:21 -0400
committerNeil Moore <neil@s-z.org>2014-07-20 21:05:21 -0400
commitd487d614c421230ae864615c87ead6f8649b1491 (patch)
treeb179801aa5a3f9da1784efa2b1f913b2a43fe831 /crawl-ref/source/beam.cc
parentea910f6305337dd87b4e082b571e326ead60ae9d (diff)
downloadcrawl-ref-d487d614c421230ae864615c87ead6f8649b1491.tar.gz
crawl-ref-d487d614c421230ae864615c87ead6f8649b1491.zip
Don't let blinkbolts hit the caster (#8791)
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 89a6d560d2..1b3d6d5996 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -470,6 +470,9 @@ void zappy(zap_type z_type, int power, bolt &pbolt)
bool bolt::can_affect_actor(const actor *act) const
{
+ // Blinkbolt doesn't hit its caster, since they are the bolt.
+ if (origin_spell == SPELL_BLINKBOLT && act->mindex() == beam_source)
+ return false;
map<mid_t, int>::const_iterator cnt = hit_count.find(act->mid);
if (cnt != hit_count.end() && cnt->second >= 2)
{