From 7fda06ccb769813cbec39dc8b96bf97eadf1953c Mon Sep 17 00:00:00 2001
From: Alexander Morse <sakeran@gmail.com>
Date: Sun, 18 Aug 2019 16:08:23 -0400
Subject: [PATCH] make MobManager#removeMob act on sourceRoom

---
 src/MobManager.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/MobManager.js b/src/MobManager.js
index 2420f13b..999295a6 100644
--- a/src/MobManager.js
+++ b/src/MobManager.js
@@ -21,10 +21,14 @@ class MobManager {
    */
   removeMob(mob) {
     mob.effects.clear();
+    const sourceRoom = mob.sourceRoom;
+    if (sourceRoom) {
+      sourceRoom.area.removeNpc(mob);
+      sourceRoom.removeNpc(mob, true);
+    }
     const room = mob.room;
-    if (room) {
-      room.area.removeNpc(mob);
-      room.removeNpc(mob, true);
+    if (room && room !== sourceRoom) {
+      room.removeNpc(mob);
     }
     mob.__pruned = true;
     mob.removeAllListeners();