No cookie for banishing the royal jelly: teleport control and wall change will not happen if it is banished, but you can track it down in the Abyss and kill it to enable TC on Slime:6 :)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4027 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 13 insertions, 8 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 39651da8f0..bbdb9b8dcd 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -649,14 +649,19 @@ static void _fire_monster_death_event(monsters *monster,
                                       killer_type killer,
                                       int i)
 {
-    dungeon_events.fire_event(
-        dgn_event(DET_MONSTER_DIED, monster->pos(), 0,
-                  monster_index(monster), killer));
-
-    if (monster->type == MONS_ROYAL_JELLY)
-        apply_to_level( level_id(BRANCH_SLIME_PITS, 6),
-                        true,
-                        _slime_pit_enable_teleport_control );
+    // Banished monsters aren't technically dead, so no death event
+    // for them.
+    if (killer != KILL_RESET)
+    {
+        dungeon_events.fire_event(
+            dgn_event(DET_MONSTER_DIED, monster->pos(), 0,
+                      monster_index(monster), killer));
+
+        if (monster->type == MONS_ROYAL_JELLY)
+            apply_to_level( level_id(BRANCH_SLIME_PITS, 6),
+                            true,
+                            _slime_pit_enable_teleport_control );
+    }
 }
 
 void monster_die(monsters *monster, killer_type killer, int i, bool silent)