Browse Source

BETA: Removed some redundant/custom checks for teleport/escape skills, no longer needed with [DP9223].

MELERIX 12 years ago
parent
commit
3bade2f6a4

+ 1 - 13
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -15086,18 +15086,6 @@ public final class L2PcInstance extends L2Playable
 			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_TO_REACH_THIS_AREA);
 			return false;
 		}
-		else if (isInBoat() || isInAirShip() || isInJail() || isInsideZone(ZoneId.NO_SUMMON_FRIEND))
-		{
-			if (type == 0)
-			{
-				sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_IN_THIS_AREA);
-			}
-			else if (type == 1)
-			{
-				sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_TO_REACH_THIS_AREA);
-			}
-			return false;
-		}
 		else if (isInWater())
 		{
 			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_UNDERWATER);
@@ -15108,7 +15096,7 @@ public final class L2PcInstance extends L2Playable
 			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_TO_REACH_THIS_AREA);
 			return false;
 		}
-		else if (isInsideZone(ZoneId.NO_BOOKMARK))
+		else if (isInsideZone(ZoneId.NO_BOOKMARK) || isInBoat() || isInAirShip())
 		{
 			if (type == 0)
 			{

+ 0 - 14
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillTeleport.java

@@ -100,20 +100,6 @@ public class L2SkillTeleport extends L2Skill
 				{
 					L2PcInstance targetChar = target.getActingPlayer();
 					
-					// Check to see if the current player target is in a festival.
-					if (targetChar.isFestivalParticipant())
-					{
-						targetChar.sendMessage("You may not use an escape skill in a festival.");
-						continue;
-					}
-					
-					// Check to see if player is in jail
-					if (targetChar.isInJail())
-					{
-						targetChar.sendMessage("You can not escape from jail.");
-						continue;
-					}
-					
 					// Check to see if player is in a duel
 					if (targetChar.isInDuel())
 					{