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

Fixed wilderness teleblock bug

Browse Source
This commit is contained in:
Ceikry
2023-08-03 13:36:07 +00:00
committed by Ryan
parent 4098f2bf0b
commit 0ca2b8d99c
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/skill/magic/ancient/AncientTeleportPlugin.java
+1 -1
View File
@@ -51,7 +51,7 @@ public final class AncientTeleportPlugin extends MagicSpell {
@Override @Override
public boolean cast(Entity entity, Node target) { public boolean cast(Entity entity, Node target) {
if (entity.getLocks().isTeleportLocked() || !super.meetsRequirements(entity, true, false)) { if (entity.isTeleBlocked() || !super.meetsRequirements(entity, true, false)) {
return false; return false;
} }
if (entity.getTeleporter().send(location.transform(0, RandomFunction.random(3), 0), getSpellId() == 28 ? TeleportType.HOME : TeleportType.ANCIENT)) { if (entity.getTeleporter().send(location.transform(0, RandomFunction.random(3), 0), getSpellId() == 28 ? TeleportType.HOME : TeleportType.ANCIENT)) {
Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
+1 -5
View File
@@ -347,10 +347,6 @@ class LunarListeners : SpellListener("lunar"), Commands {
} }
private fun sendTeleport(player: Player, xp: Double, loc: Location){ private fun sendTeleport(player: Player, xp: Double, loc: Location){
if(player.locks.isTeleportLocked){
player.sendMessage("A magical force prevents you from teleporting.")
return
}
if(player.teleporter.send(loc,TeleportManager.TeleportType.LUNAR)) { if(player.teleporter.send(loc,TeleportManager.TeleportType.LUNAR)) {
addXP(player, xp) addXP(player, xp)
removeRunes(player) removeRunes(player)
@@ -361,7 +357,7 @@ class LunarListeners : SpellListener("lunar"), Commands {
private fun sendGroupTeleport(player: Player, xp: Double, destName: String, loc: Location){ private fun sendGroupTeleport(player: Player, xp: Double, destName: String, loc: Location){
RegionManager.getLocalPlayers(player,1).forEach { RegionManager.getLocalPlayers(player,1).forEach {
if(it == player) return@forEach if(it == player) return@forEach
if(it.locks.isTeleportLocked) return@forEach if(it.isTeleBlocked()) return@forEach
if(!it.isActive) return@forEach if(!it.isActive) return@forEach
if(!it.settings.isAcceptAid) return@forEach if(!it.settings.isAcceptAid) return@forEach
if(it.ironmanManager.isIronman) return@forEach if(it.ironmanManager.isIronman) return@forEach
Server/src/main/core/game/node/entity/Entity.java
+1 -1
View File
@@ -927,7 +927,7 @@ public abstract class Entity extends Node {
* @return {@code True} if so. * @return {@code True} if so.
*/ */
public boolean isTeleBlocked() { public boolean isTeleBlocked() {
return timers.getTimer("teleblock") != null; return timers.getTimer("teleblock") != null || getLocks().isTeleportLocked();
} }
/** /**
Server/src/main/core/game/node/entity/player/link/SkullManager.java
+6
View File
@@ -129,6 +129,12 @@ public final class SkullManager {
setDeepWilderness(true); setDeepWilderness(true);
else if (deepWilderness && level < 48) else if (deepWilderness && level < 48)
setDeepWilderness(false); setDeepWilderness(false);
if (level > 20)
player.getLocks().lockTeleport (1_000_000);
else
player.getLocks().unlockTeleport();
this.level = level; this.level = level;
} }