yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rune consumption when teleblocked

Browse Source
This commit is contained in:
Zerken
2023-10-20 06:56:54 +00:00
committed by Ryan
parent e2a13465b6
commit 2bcb05ee6c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
+2 -2
View File
@@ -271,7 +271,7 @@ class ModernListeners : SpellListener("modern"){
} }
private fun sendTeleport(player: Player, xp: Double, location: Location){ private fun sendTeleport(player: Player, xp: Double, location: Location){
if(player.locks.isTeleportLocked){ if(player.isTeleBlocked){
player.removeAttribute("spell:runes") player.removeAttribute("spell:runes")
player.sendMessage("A magical force prevents you from teleporting.") player.sendMessage("A magical force prevents you from teleporting.")
return return
@@ -289,7 +289,7 @@ class ModernListeners : SpellListener("modern"){
} }
private fun attemptHouseTeleport(player: Player){ private fun attemptHouseTeleport(player: Player){
if(player.locks.isTeleportLocked){ if(player.isTeleBlocked){
player.removeAttribute("spell:runes") player.removeAttribute("spell:runes")
player.sendMessage("A magical force prevents you from teleporting.") player.sendMessage("A magical force prevents you from teleporting.")
return return
Server/src/main/content/global/skill/magic/modern/TeleotherSpells.java
+1 -1
View File
@@ -75,7 +75,7 @@ public final class TeleotherSpells extends MagicSpell {
return false; return false;
} }
Player o = (Player) target; 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."); p.getPacketDispatch().sendMessage("The other player is currently busy.");
return false; return false;
} }