diff --git a/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt b/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt index c945d2f6e..4ae677997 100644 --- a/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt +++ b/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt @@ -40,8 +40,7 @@ class EvilChickenNPC(override var loot: WeightBasedTable? = null) : RandomEventN sendMessage(player, "The Evil Chicken realises you're out of range and vanishes.") sentMessage = true terminate() - } - if (getWorldTicks() % 10 == 0) { + } else if (getWorldTicks() % 10 == 0) { sendChat(phrases.random().replace("@name", player.username.capitalize())) } } diff --git a/Server/src/main/content/region/morytania/handlers/MortMyreGhastNPC.kt b/Server/src/main/content/region/morytania/handlers/MortMyreGhastNPC.kt index bd94c1de3..8aeac41fd 100644 --- a/Server/src/main/content/region/morytania/handlers/MortMyreGhastNPC.kt +++ b/Server/src/main/content/region/morytania/handlers/MortMyreGhastNPC.kt @@ -38,7 +38,7 @@ class MortMyreGhastNPC : AbstractNPC { super.handleTickActions() if(id == ids[0] && RandomFunction.roll(35)){ val players = RegionManager.getLocalPlayers(location, 5).filter { - return@filter it.inCombat() + return@filter !it.inCombat() } if(players.isNotEmpty()){ val player = players.random() @@ -106,4 +106,4 @@ class MortMyreGhastNPC : AbstractNPC { } } } -} \ No newline at end of file +}