diff --git a/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java b/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java index d81bc9f42..eb20f613d 100644 --- a/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java +++ b/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java @@ -523,10 +523,15 @@ public class HouseServantDialogue extends DialoguePlugin { servant.setInvisible(true); servant.getLocks().lockMovement(100); GameWorld.getPulser().submit(new Pulse((int) (type.getTimer() / 0.6)) { - @Override public boolean pulse() { - if (player == null || player.getHouseManager().getHouseRegion() != player.getViewport().getRegion()) { //TODO: Check if in dungeon? + if (player == null) { + return true; + } + Region pr = player.getViewport().getRegion(); + Region hr = player.getHouseManager().getHouseRegion(); + Region dr = player.getHouseManager().getDungeonRegion(); + if (pr != hr && pr != dr) { return true; } int amt = player.getBank().getAmount(item.getId()); @@ -549,7 +554,6 @@ public class HouseServantDialogue extends DialoguePlugin { follow(player, servant); return true; } - }); }