From 4fb5d417ec7bb6374ccf881f9e74c944f9c3aac8 Mon Sep 17 00:00:00 2001 From: ceikry Date: Fri, 25 Jun 2021 19:11:22 -0500 Subject: [PATCH] Fixed wilderness teleport bug --- .../rs09/game/node/entity/skill/magic/LunarListeners.kt | 9 +++++---- .../rs09/game/node/entity/skill/magic/ModernListeners.kt | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt index 9856c94b8..783e86836 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt @@ -232,10 +232,11 @@ class LunarListeners : SpellListener("lunar") { player.sendMessage("A magical force prevents you from teleporting.") return } - player.teleporter.send(loc,TeleportManager.TeleportType.LUNAR) - addXP(player,xp) - removeRunes(player) - setDelay(player,true) + if(player.teleporter.send(loc,TeleportManager.TeleportType.LUNAR)) { + addXP(player, xp) + removeRunes(player) + setDelay(player, true) + } } fun sendGroupTeleport(player: Player,xp: Double,destName: String,loc: Location){ diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/ModernListeners.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/ModernListeners.kt index aaecd3b68..5cd662e4a 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/ModernListeners.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/ModernListeners.kt @@ -247,10 +247,11 @@ class ModernListeners : SpellListener("modern"){ player.sendMessage("A magical force prevents you from teleporting.") return } - player.teleporter.send(location,TeleportManager.TeleportType.NORMAL) - removeRunes(player) - addXP(player,xp) - setDelay(player,true) + if(player.teleporter.send(location,TeleportManager.TeleportType.NORMAL)) { + removeRunes(player) + addXP(player, xp) + setDelay(player, true) + } } private fun attemptHouseTeleport(player: Player){