diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java index 9aea450682..42b6d7891f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; @@ -78,6 +79,13 @@ public class ExRequestTeleport implements IClientIncomingPacket return; } + // Cannot escape effect. + if (player.isAffected(EffectFlag.CANNOT_ESCAPE)) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW); + return; + } + if (!Config.TELEPORT_WHILE_SIEGE_IN_PROGRESS) { final Castle castle = CastleManager.getInstance().getCastle(teleport.getX(), teleport.getY(), teleport.getZ()); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index b975ab0b8c..84faa6af40 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; @@ -79,6 +80,13 @@ public class ExRequestTeleport implements IClientIncomingPacket return; } + // Cannot escape effect. + if (player.isAffected(EffectFlag.CANNOT_ESCAPE)) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW); + return; + } + if (!Config.TELEPORT_WHILE_SIEGE_IN_PROGRESS) { final Castle castle = CastleManager.getInstance().getCastle(teleport.getX(), teleport.getY(), teleport.getZ()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java index 52fbe37d13..e2b92d4703 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; @@ -78,6 +79,13 @@ public class ExRequestTeleport implements IClientIncomingPacket return; } + // Cannot escape effect. + if (player.isAffected(EffectFlag.CANNOT_ESCAPE)) + { + player.sendMessage("You cannot teleport right now."); + return; + } + if (!Config.TELEPORT_WHILE_SIEGE_IN_PROGRESS) { final Castle castle = CastleManager.getInstance().getCastle(teleport.getX(), teleport.getY(), teleport.getZ()); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index 781b95627f..8d89858a95 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -22,6 +22,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.CommonSkill; @@ -82,6 +83,13 @@ public class ExRequestTeleport implements IClientIncomingPacket return; } + // Cannot escape effect. + if (player.isAffected(EffectFlag.CANNOT_ESCAPE)) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW); + return; + } + if (!Config.TELEPORT_WHILE_SIEGE_IN_PROGRESS) { final Castle castle = CastleManager.getInstance().getCastle(teleport.getX(), teleport.getY(), teleport.getZ());