diff options
| author | reaverb <reaverb.Crawl@gmail.com> | 2014-06-22 14:19:37 -0400 |
|---|---|---|
| committer | reaverb <reaverb.Crawl@gmail.com> | 2014-06-22 14:31:57 -0400 |
| commit | e0dfef650ba4eabae18c5620cdca6c4f92c649df (patch) | |
| tree | 20014719113ae08abcbfae78502c3990eceac587 /crawl-ref/source/mon-act.cc | |
| parent | a5a37449bca395bfd71116991be277af13e6d91b (diff) | |
| download | crawl-ref-e0dfef650ba4eabae18c5620cdca6c4f92c649df.tar.gz crawl-ref-e0dfef650ba4eabae18c5620cdca6c4f92c649df.zip | |
Fix monsters reaching or throwing things while in nets (#8724)
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
| -rw-r--r-- | crawl-ref/source/mon-act.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 62bb334da3..7344e56f2b 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -877,6 +877,9 @@ static bool _handle_reaching(monster* mons) const reach_type range = mons->reach_range(); actor *foe = mons->get_foe(); + if (mons->caught()) + return false; + if (!foe || range <= REACH_NONE) return false; @@ -1500,7 +1503,8 @@ bool handle_throw(monster* mons, bolt & beem, bool teleport, bool check_only) { // Yes, there is a logic to this ordering {dlb}: if (mons->incapacitated() - || mons->submerged()) + || mons->submerged() + || mons->caught()) { return false; } |