diff options
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_trig.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/dat/clua/lm_trig.lua b/crawl-ref/source/dat/clua/lm_trig.lua index 65faafb3ea..11d47607f8 100644 --- a/crawl-ref/source/dat/clua/lm_trig.lua +++ b/crawl-ref/source/dat/clua/lm_trig.lua @@ -296,8 +296,11 @@ function Triggerable:do_trigger(triggerer, marker, ev) if dgn.point(slave_marker:pos()) == master_pos then -- The master marker shouldn't be removed until the end, so - -- simply stop being slaved. + -- simply stop being slaved to itself. self.props.slaved_to = nil + if self:property("listen_to_slaves") ~= "" then + triggerer:remove(self, slave_marker) + end else triggerer:remove(self, slave_marker) dgn.remove_marker(slave_marker) |