2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages 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

4
Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
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

2
Server/src/main/content/global/skill/magic/modern/TeleotherSpells.java
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;
} }