From 65a126fb1af16a29c81777ae6885292124713633 Mon Sep 17 00:00:00 2001
From: haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 19 Feb 2009 11:40:35 +0000
Subject: Don't allow monsters to walk into you and continue playing innocent.
 Fixes [2021213].

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9128 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/monstuff.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'crawl-ref/source/monstuff.cc')

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 81d2c0cd67..c0fdc05ec8 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -7322,6 +7322,10 @@ static void _handle_monster_move(monsters *monster)
 
                 if (!mons_friendly(monster))
                 {
+                    // If it steps into you, cancel other targets.
+                    monster->foe = MHITYOU;
+                    monster->target = you.pos();
+
                     monster_attack(monster);
 
                     if (mons_is_batty(monster))
-- 
cgit v1.2.3-54-g00ecf