From 2bcb05ee6ca132e63012857de190f55e0a7b4c7f Mon Sep 17 00:00:00 2001 From: Zerken Date: Fri, 20 Oct 2023 06:56:54 +0000 Subject: [PATCH] Fixed rune consumption when teleblocked --- .../main/content/global/skill/magic/modern/ModernListeners.kt | 4 ++-- .../content/global/skill/magic/modern/TeleotherSpells.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt b/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt index 4c35f4a12..f0076c83f 100644 --- a/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt +++ b/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt @@ -271,7 +271,7 @@ class ModernListeners : SpellListener("modern"){ } private fun sendTeleport(player: Player, xp: Double, location: Location){ - if(player.locks.isTeleportLocked){ + if(player.isTeleBlocked){ player.removeAttribute("spell:runes") player.sendMessage("A magical force prevents you from teleporting.") return @@ -289,7 +289,7 @@ class ModernListeners : SpellListener("modern"){ } private fun attemptHouseTeleport(player: Player){ - if(player.locks.isTeleportLocked){ + if(player.isTeleBlocked){ player.removeAttribute("spell:runes") player.sendMessage("A magical force prevents you from teleporting.") return diff --git a/Server/src/main/content/global/skill/magic/modern/TeleotherSpells.java b/Server/src/main/content/global/skill/magic/modern/TeleotherSpells.java index de09618a8..9219295f4 100644 --- a/Server/src/main/content/global/skill/magic/modern/TeleotherSpells.java +++ b/Server/src/main/content/global/skill/magic/modern/TeleotherSpells.java @@ -75,7 +75,7 @@ public final class TeleotherSpells extends MagicSpell { return false; } Player o = (Player) target; - if (!o.isActive() || o.getLocks().isTeleportLocked() || o.getInterfaceManager().isOpened()) { + if (!o.isActive() || o.isTeleBlocked() || o.getInterfaceManager().isOpened()) { p.getPacketDispatch().sendMessage("The other player is currently busy."); return false; }