BETA: Moving Zone Ids out of L2Character:

	* Unhardcoded zone Ids count.
	* Declared dummy isInsideZone(..) method in L2Object to avoid useless casting.
	* Removed ZONE_ prefix from zone Ids.
	* Removed "<BR><BR>" in !JavaDocs in L2PcInstance.
	* Removed "this" qualifier in L2PcInstance where is not required.

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -55,6 +55,7 @@ import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
@@ -264,7 +265,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			
 			// depending on config, do not allow mobs to attack _new_ players in peacezones,
 			// unless they are already following those players from outside the peacezone.
-			if (!Config.ALT_MOB_AGRO_IN_PEACEZONE && target.isInsideZone(L2Character.ZONE_PEACE))
+			if (!Config.ALT_MOB_AGRO_IN_PEACEZONE && target.isInsideZone(ZoneId.PEACE))
 				return false;
 			
 			if (me.isChampion() && Config.L2JMOD_CHAMPION_PASSIVE)

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2PlayableAI.java

@@ -19,6 +19,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Character.AIAccessor;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -43,10 +44,6 @@ public abstract class L2PlayableAI extends L2CharacterAI
 		super(accessor);
 	}
 	
-	
-	/**
-	 * @see com.l2jserver.gameserver.ai.L2CharacterAI#onIntentionAttack(com.l2jserver.gameserver.model.actor.L2Character)
-	 */
 	@Override
 	protected void onIntentionAttack(L2Character target)
 	{
@@ -55,7 +52,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 			if (target.getActingPlayer().getProtectionBlessing()
 					&& (_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10
 					&& _actor.getActingPlayer().getKarma() > 0
-					&& !(target.isInsideZone(L2Character.ZONE_PVP)))
+					&& !(target.isInsideZone(ZoneId.PVP)))
 			{
 				// If attacker have karma and have level >= 10 than his target and target have
 				// Newbie Protection Buff,
@@ -67,7 +64,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 			if (_actor.getActingPlayer().getProtectionBlessing()
 					&& (target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10
 					&& target.getActingPlayer().getKarma() > 0
-					&& !(target.isInsideZone(L2Character.ZONE_PVP)))
+					&& !(target.isInsideZone(ZoneId.PVP)))
 			{
 				// If target have karma and have level >= 10 than his target and actor have
 				// Newbie Protection Buff,
@@ -96,9 +93,6 @@ public abstract class L2PlayableAI extends L2CharacterAI
 		super.onIntentionAttack(target);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.ai.L2CharacterAI#onIntentionCast(com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object)
-	 */
 	@Override
 	protected void onIntentionCast(L2Skill skill, L2Object target)
 	{
@@ -107,7 +101,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 			if (target.getActingPlayer().getProtectionBlessing()
 					&& (_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10
 					&& _actor.getActingPlayer().getKarma() > 0
-					&& !(((L2Playable) target).isInsideZone(L2Character.ZONE_PVP)))
+					&& !target.isInsideZone(ZoneId.PVP))
 			{
 				// If attacker have karma and have level >= 10 than his target and target have
 				// Newbie Protection Buff,
@@ -120,7 +114,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 			if (_actor.getActingPlayer().getProtectionBlessing()
 					&& (target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10
 					&& target.getActingPlayer().getKarma() > 0
-					&& !(((L2Playable) target).isInsideZone(L2Character.ZONE_PVP)))
+					&& !target.isInsideZone(ZoneId.PVP))
 			{
 				// If target have karma and have level >= 10 than his target and actor have
 				// Newbie Protection Buff,

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -21,12 +21,12 @@ import java.util.Map;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.BlockCheckerEngine;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExCubeGameAddPlayer;
 import com.l2jserver.gameserver.network.serverpackets.ExCubeGameChangeTeam;
@@ -342,7 +342,7 @@ public final class HandysBlockCheckerManager
 				long count = inv.getInventoryItemCount(13788, 0);
 				inv.destroyItemByItemId("Handys Block Checker", 13788, count, player, player);
 			}
-			player.setInsideZone(L2Character.ZONE_PVP, false);
+			player.setInsideZone(ZoneId.PVP, false);
 			// Teleport Back
 			player.teleToLocation(-57478, -60367, -2370);
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -133,9 +133,6 @@ public class RaidBossSpawnManager
 			bossId = npcId;
 		}
 		
-		/* (non-Javadoc)
-		 * @see java.lang.Runnable#run()
-		 */
 		@Override
 		public void run()
 		{
@@ -215,7 +212,6 @@ public class RaidBossSpawnManager
 			info.set("currentMP", boss.getCurrentMp());
 			info.set("respawnTime", 0L);
 		}
-		
 		_storedInfo.put(boss.getNpcId(), info);
 	}
 	
@@ -358,7 +354,7 @@ public class RaidBossSpawnManager
 	}
 	
 	/**
-	 * Update db.
+	 * Update database.
 	 */
 	private void updateDb()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -39,11 +39,11 @@ import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.ClanWarehouse;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.communityserver.CommunityServerThread;
 import com.l2jserver.gameserver.network.communityserver.writepackets.WorldInfo;
@@ -2274,7 +2274,7 @@ public class L2Clan
 				return false;
 			}
 		}
-		if (activeChar.isInsideZone(L2Character.ZONE_SIEGE) && target.isInsideZone(L2Character.ZONE_SIEGE))
+		if (activeChar.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.SIEGE))
 		{
 			activeChar.sendPacket(SystemMessageId.OPPOSING_CLAN_IS_PARTICIPATING_IN_SIEGE);
 			return false;
@@ -2412,7 +2412,7 @@ public class L2Clan
 			player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);
 			return;
 		}
-		if (player.isInsideZone(L2Character.ZONE_SIEGE))
+		if (player.isInsideZone(ZoneId.SIEGE))
 		{
 			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_ALLY_WHILE_IN_SIEGE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList;
 import com.l2jserver.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jserver.gameserver.model.actor.position.ObjectPosition;
 import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExSendUIEvent;
@@ -802,4 +803,14 @@ public abstract class L2Object
 	{
 		return true;
 	}
+	
+	/**
+	 * Check if the object is in the given zone Id.
+	 * @param zone the zone Id to check
+	 * @return {code true} if the object is in that zone Id
+	 */
+	public boolean isInsideZone(ZoneId zone)
+	{
+		return false;
+	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -97,6 +97,7 @@ import com.l2jserver.gameserver.model.stats.BaseStats;
 import com.l2jserver.gameserver.model.stats.Calculator;
 import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -208,32 +209,7 @@ public abstract class L2Character extends L2Object
 	/** Current force buff this caster is casting to a target */
 	protected FusionSkill _fusionSkill;
 	
-	/** Zone system */
-	public static final byte ZONE_PVP = 0;
-	public static final byte ZONE_PEACE = 1;
-	public static final byte ZONE_SIEGE = 2;
-	public static final byte ZONE_MOTHERTREE = 3;
-	public static final byte ZONE_CLANHALL = 4;
-	public static final byte ZONE_LANDING = 5;
-	public static final byte ZONE_NOLANDING = 6;
-	public static final byte ZONE_WATER = 7;
-	public static final byte ZONE_JAIL = 8;
-	public static final byte ZONE_MONSTERTRACK = 9;
-	public static final byte ZONE_CASTLE = 10;
-	public static final byte ZONE_SWAMP = 11;
-	public static final byte ZONE_NOSUMMONFRIEND = 12;
-	public static final byte ZONE_FORT = 13;
-	public static final byte ZONE_NOSTORE = 14;
-	public static final byte ZONE_TOWN = 15;
-	public static final byte ZONE_SCRIPT = 16;
-	public static final byte ZONE_HQ = 17;
-	public static final byte ZONE_DANGERAREA = 18;
-	public static final byte ZONE_ALTERED = 19;
-	public static final byte ZONE_NOBOOKMARK = 20;
-	public static final byte ZONE_NOITEMDROP = 21;
-	public static final byte ZONE_NORESTART = 22;
-	
-	private final byte[] _zones = new byte[23];
+	private final byte[] _zones = new byte[ZoneId.getZoneCount()];
 	protected byte _zoneValidateCounter = 4;
 	
 	private L2Character _debugger = null;
@@ -306,24 +282,25 @@ public abstract class L2Character extends L2Object
 	}
 	
 	/**
-	 * 
-	 * @param zone
-	 * @return
+	 * Check if the character is in the given zone Id.
+	 * @param zone the zone Id to check
+	 * @return {code true} if the character is in that zone
 	 */
-	public final boolean isInsideZone(final byte zone)
+	@Override
+	public final boolean isInsideZone(ZoneId zone)
 	{
 		Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
 		switch (zone)
 		{
-			case ZONE_PVP:
+			case PVP:
 				if (instance != null && instance.isPvPInstance())
 					return true;
-				return _zones[ZONE_PVP] > 0 && _zones[ZONE_PEACE] == 0;
-			case ZONE_PEACE:
+				return _zones[ZoneId.PVP.getId()] > 0 && _zones[ZoneId.PEACE.getId()] == 0;
+			case PEACE:
 				if (instance != null && instance.isPvPInstance())
 					return false;
 		}
-		return _zones[zone] > 0;
+		return _zones[zone.getId()] > 0;
 	}
 	
 	/**
@@ -331,15 +308,15 @@ public abstract class L2Character extends L2Object
 	 * @param zone
 	 * @param state
 	 */
-	public final void setInsideZone(final byte zone, final boolean state)
+	public final void setInsideZone(ZoneId zone, final boolean state)
 	{
 		if (state)
-			_zones[zone]++;
+			_zones[zone.getId()]++;
 		else
 		{
-			_zones[zone]--;
-			if (_zones[zone] < 0)
-				_zones[zone] = 0;
+			_zones[zone.getId()]--;
+			if (_zones[zone.getId()] < 0)
+				_zones[zone.getId()] = 0;
 		}
 	}
 	
@@ -859,7 +836,7 @@ public abstract class L2Character extends L2Object
 				return;
 			}
 			
-			else if (target.getActingPlayer() != null && getActingPlayer().getSiegeState() > 0 && isInsideZone(L2Character.ZONE_SIEGE) && target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState() && target.getActingPlayer() != this && target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())
+			else if (target.getActingPlayer() != null && getActingPlayer().getSiegeState() > 0 && isInsideZone(ZoneId.SIEGE) && target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState() && target.getActingPlayer() != this && target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())
 			{
 				if (TerritoryWarManager.getInstance().isTWInProgress())
 					sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_A_MEMBER_OF_THE_SAME_TERRITORY);
@@ -4506,7 +4483,7 @@ public abstract class L2Character extends L2Object
 			dy = m._yDestination - m._yAccurate;
 		}
 		
-		final boolean isFloating = isFlying() || isInsideZone(L2Character.ZONE_WATER);
+		final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER);
 		
 		// Z coordinate will follow geodata or client values
 		if (Config.GEODATA > 0 && Config.COORD_SYNCHRONIZE == 2 && !isFloating && !m.disregardingGeodata && GameTimeController.getGameTicks() % 10 == 0 // once a second to reduce possible cpu load
@@ -4747,7 +4724,7 @@ public abstract class L2Character extends L2Object
 		
 		// make water move short and use no geodata checks for swimming chars
 		// distance in a click can easily be over 3000
-		if (Config.GEODATA > 0 && isInsideZone(ZONE_WATER) && distance > 700)
+		if (Config.GEODATA > 0 && isInsideZone(ZoneId.WATER) && distance > 700)
 		{
 			double divider = 700 / distance;
 			x = curX + (int) (divider * dx);
@@ -4814,7 +4791,7 @@ public abstract class L2Character extends L2Object
 		m.disregardingGeodata = false;
 		
 		if (Config.GEODATA > 0 && !isFlying() // flying chars not checked - even canSeeTarget doesn't work yet
-				&& (!isInsideZone(ZONE_WATER) || isInsideZone(ZONE_SIEGE)) // swimming also not checked unless in siege zone - but distance is limited
+				&& (!isInsideZone(ZoneId.WATER) || isInsideZone(ZoneId.SIEGE)) // swimming also not checked unless in siege zone - but distance is limited
 				&& !(this instanceof L2NpcWalkerInstance)) // npc walkers not checked
 		{
 			final boolean isInVehicle = isPlayer() && getActingPlayer().getVehicle() != null;
@@ -4952,7 +4929,7 @@ public abstract class L2Character extends L2Object
 		}
 		
 		// Apply Z distance for flying or swimming for correct timing calculations
-		if ((isFlying() || isInsideZone(ZONE_WATER)) && !verticalMovementOnly)
+		if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly)
 			distance = Math.sqrt(distance * distance + dz * dz);
 		
 		// Caclulate the Nb of ticks between the current position and the destination
@@ -5785,21 +5762,21 @@ public abstract class L2Character extends L2Object
 			
 			if (attacker instanceof L2Character && target instanceof L2Character)
 			{
-				return (((L2Character) target).isInsideZone(ZONE_PEACE) || ((L2Character) attacker).isInsideZone(ZONE_PEACE));
+				return (target.isInsideZone(ZoneId.PEACE) || attacker.isInsideZone(ZoneId.PEACE));
 			}
 			if (attacker instanceof L2Character)
 			{
-				return (TownManager.getTown(target.getX(), target.getY(), target.getZ()) != null || ((L2Character) attacker).isInsideZone(ZONE_PEACE));
+				return (TownManager.getTown(target.getX(), target.getY(), target.getZ()) != null || attacker.isInsideZone(ZoneId.PEACE));
 			}
 		}
 		
 		if (attacker instanceof L2Character && target instanceof L2Character)
 		{
-			return (((L2Character) target).isInsideZone(ZONE_PEACE) || ((L2Character) attacker).isInsideZone(ZONE_PEACE));
+			return (target.isInsideZone(ZoneId.PEACE) || attacker.isInsideZone(ZoneId.PEACE));
 		}
 		if (attacker instanceof L2Character)
 		{
-			return (TownManager.getTown(target.getX(), target.getY(), target.getZ()) != null || ((L2Character) attacker).isInsideZone(ZONE_PEACE));
+			return (TownManager.getTown(target.getX(), target.getY(), target.getZ()) != null || attacker.isInsideZone(ZoneId.PEACE));
 		}
 		return (TownManager.getTown(target.getX(), target.getY(), target.getZ()) != null || TownManager.getTown(attacker.getX(), attacker.getY(), attacker.getZ()) != null);
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -44,6 +44,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -678,7 +679,7 @@ public abstract class L2Summon extends L2Playable
 				return false;
 			}
 			
-			if (target.getActingPlayer() != null && this.getOwner().getSiegeState() > 0 && this.getOwner().isInsideZone(L2Character.ZONE_SIEGE) && target.getActingPlayer().getSiegeState() == this.getOwner().getSiegeState() && target.getActingPlayer() != this.getOwner() && target.getActingPlayer().getSiegeSide() == this.getOwner().getSiegeSide())
+			if (target.getActingPlayer() != null && getOwner().getSiegeState() > 0 && getOwner().isInsideZone(ZoneId.SIEGE) && target.getActingPlayer().getSiegeState() == getOwner().getSiegeState() && target.getActingPlayer() != getOwner() && target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())
 			{
 				//
 				if (TerritoryWarManager.getInstance().isTWInProgress())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleMagicianInstance.java

@@ -24,11 +24,11 @@ import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.L2SquadTrainer;
 import com.l2jserver.gameserver.model.PcCondOverride;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.base.AcquireSkillType;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -459,7 +459,7 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 			return false;
 		}
 		
-		if (clanLeader.isInsideZone(L2Character.ZONE_NOSUMMONFRIEND))
+		if (clanLeader.isInsideZone(ZoneId.NO_SUMMON_FRIEND))
 		{
 			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java

@@ -41,6 +41,7 @@ import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDrain;
 import com.l2jserver.gameserver.model.stats.BaseStats;
 import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
@@ -411,8 +412,8 @@ public final class L2CubicInstance
 				// get target in pvp or in siege
 				L2PcInstance enemy = null;
 				
-				if ((_owner.getPvpFlag() > 0 && !_owner.isInsideZone(L2Character.ZONE_PEACE))
-						|| _owner.isInsideZone(L2Character.ZONE_PVP))
+				if ((_owner.getPvpFlag() > 0 && !_owner.isInsideZone(ZoneId.PEACE))
+						|| _owner.isInsideZone(ZoneId.PVP))
 				{
 					if (!((L2Character) ownerTarget).isDead())
 						enemy = ownerTarget.getActingPlayer();
@@ -431,7 +432,7 @@ public final class L2CubicInstance
 									targetIt = false;
 							}
 						}
-						if (_owner.getClan() != null && !_owner.isInsideZone(L2Character.ZONE_PVP))
+						if (_owner.getClan() != null && !_owner.isInsideZone(ZoneId.PVP))
 						{
 							if (_owner.getClan().isMember(enemy.getObjectId()))
 								targetIt = false;
@@ -441,9 +442,9 @@ public final class L2CubicInstance
 									targetIt = false;
 							}
 						}
-						if (enemy.getPvpFlag() == 0 && !enemy.isInsideZone(L2Character.ZONE_PVP))
+						if (enemy.getPvpFlag() == 0 && !enemy.isInsideZone(ZoneId.PVP))
 							targetIt = false;
-						if (enemy.isInsideZone(L2Character.ZONE_PEACE))
+						if (enemy.isInsideZone(ZoneId.PEACE))
 							targetIt = false;
 						if (_owner.getSiegeState() > 0
 								&& _owner.getSiegeState() == enemy.getSiegeState())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -59,6 +59,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
@@ -691,7 +692,7 @@ public class L2PetInstance extends L2Summon
 		DecayTaskManager.getInstance().addDecayTask(this, PET_DECAY_DELAY);
 		// do not decrease exp if is in duel, arena
 		L2PcInstance owner = getOwner();
-		if ((owner != null) && !owner.isInDuel() && (!isInsideZone(ZONE_PVP) || isInsideZone(ZONE_SIEGE)))
+		if ((owner != null) && !owner.isInDuel() && (!isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE)))
 		{
 			deathPenalty();
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeSummonInstance.java

@@ -14,9 +14,9 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 public class L2SiegeSummonInstance extends L2ServitorInstance
 {
@@ -34,7 +34,7 @@ public class L2SiegeSummonInstance extends L2ServitorInstance
 	public void onSpawn()
 	{
 		super.onSpawn();
-		if (!getOwner().isGM() && !this.isInsideZone(L2Character.ZONE_SIEGE))
+		if (!getOwner().isGM() && !isInsideZone(ZoneId.SIEGE))
 		{
 			unSummon(getOwner());
 			getOwner().sendMessage("Summon was unsummoned because it exited siege zone");

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java

@@ -24,18 +24,15 @@ import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
 import com.l2jserver.gameserver.instancemanager.TownManager;
 import com.l2jserver.gameserver.model.L2TeleportLocation;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 
-
 /**
  * @author NightMarez
- * @version $Revision: 1.3.2.2.2.5 $ $Date: 2005/03/27 15:29:32 $
- *
  */
 public final class L2TeleporterInstance extends L2Npc
 {
@@ -229,7 +226,7 @@ public final class L2TeleporterInstance extends L2Npc
 				return;
 			}
 			else if (TownManager.townHasCastleInSiege(list.getLocX(), list.getLocY())
-					&& isInsideZone(L2Character.ZONE_TOWN))
+					&& isInsideZone(ZoneId.TOWN))
 			{
 				player.sendPacket(SystemMessageId.NO_PORT_THAT_IS_IN_SIGE);
 				return;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.Quest.TrapAction;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
@@ -92,7 +93,7 @@ public class L2TrapInstance extends L2Trap
 	public void onSpawn()
 	{
 		super.onSpawn();
-		_isInArena = isInsideZone(ZONE_PVP) && !isInsideZone(ZONE_SIEGE);
+		_isInArena = isInsideZone(ZoneId.PVP) && !isInsideZone(ZoneId.SIEGE);
 		_playersWhoDetectedMe.clear();
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -33,7 +33,6 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Clan.SubPledge;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2SkillLearn;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.base.AcquireSkillType;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -43,6 +42,7 @@ import com.l2jserver.gameserver.model.base.SubClass;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.Fort;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -828,7 +828,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 			}
 		}
 		
-		if (player.isInsideZone(L2Character.ZONE_SIEGE))
+		if (player.isInsideZone(ZoneId.SIEGE))
 		{
 			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_IN_SIEGE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.entity.RecoBonus;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExVitalityPointInfo;
@@ -73,7 +74,7 @@ public class PcStat extends PlayableStat
 			return false;
 		
 		// Set new karma
-		if (!activeChar.isCursedWeaponEquipped() && activeChar.getKarma() > 0 && (activeChar.isGM() || !activeChar.isInsideZone(L2Character.ZONE_PVP)))
+		if (!activeChar.isCursedWeaponEquipped() && activeChar.getKarma() > 0 && (activeChar.isGM() || !activeChar.isInsideZone(ZoneId.PVP)))
 		{
 			int karmaLost = activeChar.calculateKarmaLost(value);
 			if (karmaLost > 0)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java

@@ -20,15 +20,14 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.datatables.PetDataTable;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.model.zone.type.L2SwampZone;
 import com.l2jserver.gameserver.network.communityserver.CommunityServerThread;
 import com.l2jserver.gameserver.network.communityserver.writepackets.WorldInfo;
 
-
 public class PlayableStat extends CharStat
 {
 	protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName());
@@ -182,10 +181,10 @@ public class PlayableStat extends CharStat
 	public int getRunSpeed()
 	{
 		int val = super.getRunSpeed();
-		if (getActiveChar().isInsideZone(L2Character.ZONE_WATER))
+		if (getActiveChar().isInsideZone(ZoneId.WATER))
 			val /= 2;
 		
-		if (getActiveChar().isInsideZone(L2Character.ZONE_SWAMP))
+		if (getActiveChar().isInsideZone(ZoneId.SWAMP))
 		{
 			L2SwampZone zone = ZoneManager.getInstance().getZone(getActiveChar(), L2SwampZone.class);
 			int bonus = zone == null ? 0 : zone.getMoveBonus();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLandingZone.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.model.conditions;
 
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * The Class ConditionPlayerLandingZone.
@@ -38,6 +38,6 @@ public class ConditionPlayerLandingZone extends Condition
 	@Override
 	public boolean testImpl(Env env)
 	{
-		return env.getCharacter().isInsideZone(L2Character.ZONE_LANDING) == _val;
+		return env.getCharacter().isInsideZone(ZoneId.LANDING) == _val;
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java

@@ -31,13 +31,13 @@ import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
 import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
@@ -403,7 +403,7 @@ public final class BlockCheckerEngine
 				}
 				// Set the current player arena
 				player.setBlockCheckerArena((byte) _arena);
-				player.setInsideZone(L2Character.ZONE_PVP, true);
+				player.setInsideZone(ZoneId.PVP, true);
 				// Send needed packets
 				player.sendPacket(initialPoints);
 				player.sendPacket(_closeUserInterface);
@@ -760,7 +760,7 @@ public final class BlockCheckerEngine
 				broadcastRelationChanged(player);
 				// Teleport Back
 				player.teleToLocation(-57478, -60367, -2370);
-				player.setInsideZone(L2Character.ZONE_PVP, false);
+				player.setInsideZone(ZoneId.PVP, false);
 				// Send end packet
 				player.sendPacket(end);
 				player.broadcastUserInfo();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Duel.java

@@ -23,9 +23,9 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.instancemanager.DuelManager;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExDuelEnd;
@@ -887,7 +887,7 @@ public class Duel
 			}
 			
 			// is one of the players in a Siege, Peace or PvP zone?
-			if (_playerA.isInsideZone(L2Character.ZONE_PEACE) || _playerB.isInsideZone(L2Character.ZONE_PEACE) || _playerA.isInsideZone(L2Character.ZONE_SIEGE) || _playerB.isInsideZone(L2Character.ZONE_SIEGE) || _playerA.isInsideZone(L2Character.ZONE_PVP) || _playerB.isInsideZone(L2Character.ZONE_PVP))
+			if (_playerA.isInsideZone(ZoneId.PEACE) || _playerB.isInsideZone(ZoneId.PEACE) || _playerA.isInsideZone(ZoneId.SIEGE) || _playerB.isInsideZone(ZoneId.SIEGE) || _playerA.isInsideZone(ZoneId.PVP) || _playerB.isInsideZone(ZoneId.PVP))
 			{
 				return DuelResultEnum.Canceled;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -59,6 +59,7 @@ import com.l2jserver.gameserver.model.stats.BaseStats;
 import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Util;
@@ -1437,12 +1438,12 @@ public abstract class L2Skill implements IChanceSkillTrigger
 				if (targetPlayer.inObserverMode())
 					return false;
 				
-				if (skill.isOffensive() && player.getSiegeState() > 0 && player.isInsideZone(L2Character.ZONE_SIEGE)
+				if (skill.isOffensive() && player.getSiegeState() > 0 && player.isInsideZone(ZoneId.SIEGE)
 						&& player.getSiegeState() == targetPlayer.getSiegeState()
 						&& player.getSiegeSide() == targetPlayer.getSiegeSide())
 					return false;
 				
-				if (skill.isOffensive() && target.isInsideZone(L2Character.ZONE_PEACE))
+				if (skill.isOffensive() && target.isInsideZone(ZoneId.PEACE))
 					return false;
 				
 				if (player.isInParty() && targetPlayer.isInParty())
@@ -1460,7 +1461,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 				if (!TvTEvent.checkForTvTSkill(player, targetPlayer, skill))
 					return false;
 				
-				if (!sourceInArena && !(targetPlayer.isInsideZone(L2Character.ZONE_PVP) && !targetPlayer.isInsideZone(L2Character.ZONE_SIEGE)))
+				if (!sourceInArena && !(targetPlayer.isInsideZone(ZoneId.PVP) && !targetPlayer.isInsideZone(ZoneId.SIEGE)))
 				{
 					if (player.getAllyId() != 0 && player.getAllyId() == targetPlayer.getAllyId())
 						return false;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSiegeFlag.java

@@ -34,6 +34,7 @@ import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.Fort;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 public class L2SkillSiegeFlag extends L2Skill
@@ -166,7 +167,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			text = "You must be a clan leader to place a flag.";
 		else if (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())
 			text = "You have already placed the maximum number of flags possible.";
-		else if (!player.isInsideZone(L2Character.ZONE_HQ))
+		else if (!player.isInsideZone(ZoneId.HQ))
 			player.sendPacket(SystemMessageId.NOT_SET_UP_BASE_HERE);
 		else
 			return true;
@@ -202,7 +203,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			text = "You must be a clan leader to place a flag.";
 		else if (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount())
 			text = "You have already placed the maximum number of flags possible.";
-		else if (!player.isInsideZone(L2Character.ZONE_HQ))
+		else if (!player.isInsideZone(ZoneId.HQ))
 			player.sendPacket(SystemMessageId.NOT_SET_UP_BASE_HERE);
 		else
 			return true;
@@ -239,7 +240,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			text = "You must be an attacker to place a flag.";
 		else if (hall.getSiege().getAttackerClan(player.getClan()).getNumFlags() > Config.CHS_MAX_FLAGS_PER_CLAN)
 			text = "You have already placed the maximum number of flags possible.";
-		else if (!player.isInsideZone(L2Character.ZONE_HQ))
+		else if (!player.isInsideZone(ZoneId.HQ))
 			player.sendPacket(SystemMessageId.NOT_SET_UP_BASE_HERE);
 		else if(!hall.getSiege().canPlantFlag())
 			text = "You cannot place a flag on this siege.";
@@ -279,7 +280,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			player.sendPacket(SystemMessageId.NOT_ANOTHER_HEADQUARTERS);
 		else if (TerritoryWarManager.getInstance().getFlagForClan(player.getClan()) != null && !isOutPost)
 			player.sendPacket(SystemMessageId.A_FLAG_IS_ALREADY_BEING_DISPLAYED_ANOTHER_FLAG_CANNOT_BE_DISPLAYED);
-		else if (!player.isInsideZone(L2Character.ZONE_HQ))
+		else if (!player.isInsideZone(ZoneId.HQ))
 			player.sendPacket(SystemMessageId.NOT_SET_UP_BASE_HERE);
 		else
 			return true;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -69,6 +69,7 @@ import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncMoveSpeed;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncPAtkMod;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncPAtkSpeed;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncPDefMod;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.model.zone.type.L2CastleZone;
 import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
 import com.l2jserver.gameserver.model.zone.type.L2FortZone;
@@ -299,7 +300,7 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CLANHALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0))
+			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0))
 			{
 				L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class);
 				int posChIndex = zone == null ? -1 : zone.getClanHallId();
@@ -317,7 +318,7 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0))
+			if (player.isInsideZone(ZoneId.CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0))
 			{
 				L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class);
 				int posCastleIndex = zone == null ? -1 : zone.getCastleId();
@@ -335,7 +336,7 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0))
+			if (player.isInsideZone(ZoneId.FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0))
 			{
 				L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class);
 				int posFortIndex = zone == null ? -1 : zone.getFortId();
@@ -354,7 +355,7 @@ public final class Formulas
 			}
 			
 			// Mother Tree effect is calculated at last
-			if (player.isInsideZone(L2Character.ZONE_MOTHERTREE))
+			if (player.isInsideZone(ZoneId.MOTHER_TREE))
 			{
 				L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class);
 				int hpBonus = zone == null ? 0 : zone.getHpRegenBonus();
@@ -416,14 +417,14 @@ public final class Formulas
 			}
 			
 			// Mother Tree effect is calculated at last'
-			if (player.isInsideZone(L2Character.ZONE_MOTHERTREE))
+			if (player.isInsideZone(ZoneId.MOTHER_TREE))
 			{
 				L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class);
 				int mpBonus = zone == null ? 0 : zone.getMpRegenBonus();
 				mpRegenBonus += mpBonus;
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CLANHALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0))
+			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0))
 			{
 				L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class);
 				int posChIndex = zone == null ? -1 : zone.getClanHallId();
@@ -441,7 +442,7 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0))
+			if (player.isInsideZone(ZoneId.CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0))
 			{
 				L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class);
 				int posCastleIndex = zone == null ? -1 : zone.getCastleId();
@@ -459,7 +460,7 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0))
+			if (player.isInsideZone(ZoneId.FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0))
 			{
 				L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class);
 				int posFortIndex = zone == null ? -1 : zone.getFortId();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/ZoneId.java

@@ -0,0 +1,63 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone;
+
+/**
+ * Zone Ids.
+ * @author Zoey76
+ */
+public enum ZoneId
+{
+	PVP(0),
+	PEACE(1),
+	SIEGE(2),
+	MOTHER_TREE(3),
+	CLAN_HALL(4),
+	LANDING(5),
+	NO_LANDING(6),
+	WATER(7),
+	JAIL(8),
+	MONSTER_TRACK(9),
+	CASTLE(10),
+	SWAMP(11),
+	NO_SUMMON_FRIEND(12),
+	FORT(13),
+	NO_STORE(14),
+	TOWN(15),
+	SCRIPT(16),
+	HQ(17),
+	DANGER_AREA(18),
+	ALTERED(19),
+	NO_BOOKMARK(20),
+	NO_ITEM_DROP(21),
+	NO_RESTART(22);
+	
+	private final int _id;
+	
+	private ZoneId(int id)
+	{
+		_id = id;
+	}
+	
+	public int getId()
+	{
+		return _id;
+	}
+	
+	public static int getZoneCount()
+	{
+		return values().length;
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2ArenaZone.java

@@ -17,6 +17,7 @@ package com.l2jserver.gameserver.model.zone.type;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -35,13 +36,13 @@ public class L2ArenaZone extends L2ZoneType
 	{
 		if (character instanceof L2PcInstance)
 		{
-			if (!character.isInsideZone(L2Character.ZONE_PVP))
+			if (!character.isInsideZone(ZoneId.PVP))
 			{
 				character.sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE);
 			}
 		}
 		
-		character.setInsideZone(L2Character.ZONE_PVP, true);
+		character.setInsideZone(ZoneId.PVP, true);
 	}
 	
 	@Override
@@ -49,13 +50,13 @@ public class L2ArenaZone extends L2ZoneType
 	{
 		if (character instanceof L2PcInstance)
 		{
-			if (!character.isInsideZone(L2Character.ZONE_PVP))
+			if (!character.isInsideZone(ZoneId.PVP))
 			{
 				character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
 			}
 		}
 		
-		character.setInsideZone(L2Character.ZONE_PVP, false);
+		character.setInsideZone(ZoneId.PVP, false);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2CastleZone.java

@@ -20,6 +20,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A castle zone
@@ -49,7 +50,7 @@ public class L2CastleZone extends L2ZoneRespawn
 	{
 		if (getCastle() != null)
 		{
-			character.setInsideZone(L2Character.ZONE_CASTLE, true);
+			character.setInsideZone(ZoneId.CASTLE, true);
 		}
 	}
 	
@@ -58,7 +59,7 @@ public class L2CastleZone extends L2ZoneRespawn
 	{
 		if (getCastle() != null)
 		{
-			character.setInsideZone(L2Character.ZONE_CASTLE, false);
+			character.setInsideZone(ZoneId.CASTLE, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java

@@ -21,6 +21,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.ClanHall;
 import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall;
 import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.AgitDecoInfo;
 
 /**
@@ -59,7 +60,7 @@ public class L2ClanHallZone extends L2ZoneRespawn
 		if (character.isPlayer())
 		{
 			// Set as in clan hall
-			character.setInsideZone(L2Character.ZONE_CLANHALL, true);
+			character.setInsideZone(ZoneId.CLAN_HALL, true);
 			
 			AuctionableHall clanHall = ClanHallManager.getInstance().getAuctionableHallById(_clanHallId);
 			if (clanHall == null)
@@ -77,7 +78,7 @@ public class L2ClanHallZone extends L2ZoneRespawn
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_CLANHALL, false);
+			character.setInsideZone(ZoneId.CLAN_HALL, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2ConditionZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * @author UnAfraid
@@ -54,11 +55,11 @@ public class L2ConditionZone extends L2ZoneType
 		{
 			if (NO_BOOKMARK)
 			{
-				character.setInsideZone(L2Character.ZONE_NOBOOKMARK, true);
+				character.setInsideZone(ZoneId.NO_BOOKMARK, true);
 			}
 			if (NO_ITEM_DROP)
 			{
-				character.setInsideZone(L2Character.ZONE_NOITEMDROP, true);
+				character.setInsideZone(ZoneId.NO_ITEM_DROP, true);
 			}
 		}
 	}
@@ -70,11 +71,11 @@ public class L2ConditionZone extends L2ZoneType
 		{
 			if (NO_BOOKMARK)
 			{
-				character.setInsideZone(L2Character.ZONE_NOBOOKMARK, false);
+				character.setInsideZone(ZoneId.NO_BOOKMARK, false);
 			}
 			if (NO_ITEM_DROP)
 			{
-				character.setInsideZone(L2Character.ZONE_NOITEMDROP, false);
+				character.setInsideZone(ZoneId.NO_ITEM_DROP, false);
 			}
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2DerbyTrackZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * The Monster Derby Track Zone
@@ -33,7 +34,7 @@ public class L2DerbyTrackZone extends L2ZoneType
 	{
 		if (character.isPlayable())
 		{
-			character.setInsideZone(L2Character.ZONE_MONSTERTRACK, true);
+			character.setInsideZone(ZoneId.MONSTER_TRACK, true);
 		}
 	}
 	
@@ -42,7 +43,7 @@ public class L2DerbyTrackZone extends L2ZoneType
 	{
 		if (character.isPlayable())
 		{
-			character.setInsideZone(L2Character.ZONE_MONSTERTRACK, false);
+			character.setInsideZone(ZoneId.MONSTER_TRACK, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.TaskZoneSettings;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.StringUtil;
@@ -146,10 +147,10 @@ public class L2EffectZone extends L2ZoneType
 		}
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_ALTERED, true);
+			character.setInsideZone(ZoneId.ALTERED, true);
 			if (_isShowDangerIcon)
 			{
-				character.setInsideZone(L2Character.ZONE_DANGERAREA, true);
+				character.setInsideZone(ZoneId.DANGER_AREA, true);
 				character.sendPacket(new EtcStatusUpdate(character.getActingPlayer()));
 			}
 		}
@@ -160,11 +161,11 @@ public class L2EffectZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_ALTERED, false);
+			character.setInsideZone(ZoneId.ALTERED, false);
 			if (_isShowDangerIcon)
 			{
-				character.setInsideZone(L2Character.ZONE_DANGERAREA, false);
-				if (!character.isInsideZone(L2Character.ZONE_DANGERAREA))
+				character.setInsideZone(ZoneId.DANGER_AREA, false);
+				if (!character.isInsideZone(ZoneId.DANGER_AREA))
 					character.sendPacket(new EtcStatusUpdate(character.getActingPlayer()));
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2FortZone.java

@@ -18,6 +18,7 @@ import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereTy
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A castle zone
@@ -48,13 +49,13 @@ public class L2FortZone extends L2ZoneRespawn
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_FORT, true);
+		character.setInsideZone(ZoneId.FORT, true);
 	}
 	
 	@Override
 	protected void onExit(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_FORT, false);
+		character.setInsideZone(ZoneId.FORT, false);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2HqZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * Zone where 'Build Headquarters' is allowed.
@@ -59,7 +60,7 @@ public class L2HqZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_HQ, true);
+			character.setInsideZone(ZoneId.HQ, true);
 		}
 	}
 	
@@ -68,7 +69,7 @@ public class L2HqZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_HQ, false);
+			character.setInsideZone(ZoneId.HQ, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2JailZone.java

@@ -18,6 +18,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -36,15 +37,15 @@ public class L2JailZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_JAIL, true);
+			character.setInsideZone(ZoneId.JAIL, true);
 			if (Config.JAIL_IS_PVP)
 			{
-				character.setInsideZone(L2Character.ZONE_PVP, true);
+				character.setInsideZone(ZoneId.PVP, true);
 				character.sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE);
 			}
 			if (Config.JAIL_DISABLE_TRANSACTION)
 			{
-				character.setInsideZone(L2Character.ZONE_NOSTORE, true);
+				character.setInsideZone(ZoneId.NO_STORE, true);
 			}
 		}
 	}
@@ -54,10 +55,10 @@ public class L2JailZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_JAIL, false);
+			character.setInsideZone(ZoneId.JAIL, false);
 			if (Config.JAIL_IS_PVP)
 			{
-				character.setInsideZone(L2Character.ZONE_PVP, false);
+				character.setInsideZone(ZoneId.PVP, false);
 				character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
 			}
 			if (character.getActingPlayer().isInJail())
@@ -68,7 +69,7 @@ public class L2JailZone extends L2ZoneType
 			}
 			if (Config.JAIL_DISABLE_TRANSACTION)
 			{
-				character.setInsideZone(L2Character.ZONE_NOSTORE, false);
+				character.setInsideZone(ZoneId.NO_STORE, false);
 			}
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2LandingZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A landing zone
@@ -33,7 +34,7 @@ public class L2LandingZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_LANDING, true);
+			character.setInsideZone(ZoneId.LANDING, true);
 		}
 	}
 	
@@ -42,7 +43,7 @@ public class L2LandingZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_LANDING, false);
+			character.setInsideZone(ZoneId.LANDING, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java

@@ -17,6 +17,7 @@ package com.l2jserver.gameserver.model.zone.type;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
@@ -66,7 +67,7 @@ public class L2MotherTreeZone extends L2ZoneType
 		if (character.isPlayer())
 		{
 			L2PcInstance player = character.getActingPlayer();
-			character.setInsideZone(L2Character.ZONE_MOTHERTREE, true);
+			character.setInsideZone(ZoneId.MOTHER_TREE, true);
 			if (_enterMsg != 0)
 			{
 				player.sendPacket(SystemMessage.getSystemMessage(_enterMsg));
@@ -80,7 +81,7 @@ public class L2MotherTreeZone extends L2ZoneType
 		if (character.isPlayer())
 		{
 			L2PcInstance player = character.getActingPlayer();
-			player.setInsideZone(L2Character.ZONE_MOTHERTREE, false);
+			player.setInsideZone(ZoneId.MOTHER_TREE, false);
 			if (_leaveMsg != 0)
 			{
 				player.sendPacket(SystemMessage.getSystemMessage(_leaveMsg));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2NoLandingZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -47,7 +48,7 @@ public class L2NoLandingZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_NOLANDING, true);
+			character.setInsideZone(ZoneId.NO_LANDING, true);
 			if (character.getActingPlayer().getMountType() == 2)
 			{
 				character.sendPacket(SystemMessageId.AREA_CANNOT_BE_ENTERED_WHILE_MOUNTED_WYVERN);
@@ -61,7 +62,7 @@ public class L2NoLandingZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_NOLANDING, false);
+			character.setInsideZone(ZoneId.NO_LANDING, false);
 			if (character.getActingPlayer().getMountType() == 2)
 			{
 				character.getActingPlayer().exitedNoLanding();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2NoRestartZone.java

@@ -19,6 +19,7 @@ import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A simple no restart zone
@@ -69,7 +70,7 @@ public class L2NoRestartZone extends L2ZoneType
 		
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_NORESTART, true);
+			character.setInsideZone(ZoneId.NO_RESTART, true);
 			L2PcInstance player = (L2PcInstance) character;
 			
 			if ((player.getZoneRestartLimitTime() > 0) && (player.getZoneRestartLimitTime() < System.currentTimeMillis()))
@@ -90,7 +91,7 @@ public class L2NoRestartZone extends L2ZoneType
 		
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_NORESTART, false);
+			character.setInsideZone(ZoneId.NO_RESTART, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2NoStoreZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * Zone where store is not allowed.
@@ -33,7 +34,7 @@ public class L2NoStoreZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_NOSTORE, true);
+			character.setInsideZone(ZoneId.NO_STORE, true);
 		}
 	}
 	
@@ -42,7 +43,7 @@ public class L2NoStoreZone extends L2ZoneType
 	{
 		if (character.isPlayer())
 		{
-			character.setInsideZone(L2Character.ZONE_NOSTORE, false);
+			character.setInsideZone(ZoneId.NO_STORE, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2NoSummonFriendZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A simple no summon zone
@@ -32,13 +33,13 @@ public class L2NoSummonFriendZone extends L2ZoneType
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_NOSUMMONFRIEND, true);
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true);
 	}
 	
 	@Override
 	protected void onExit(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_NOSUMMONFRIEND, false);
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2OlympiadStadiumZone.java

@@ -31,6 +31,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
 import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
 import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMatchEnd;
 import com.l2jserver.gameserver.network.serverpackets.ExOlympiadUserInfo;
@@ -170,7 +171,7 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn
 		{
 			if (getSettings().getOlympiadTask().isBattleStarted())
 			{
-				character.setInsideZone(L2Character.ZONE_PVP, true);
+				character.setInsideZone(ZoneId.PVP, true);
 				if (character.isPlayer())
 				{
 					character.sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE);
@@ -208,7 +209,7 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn
 		{
 			if (getSettings().getOlympiadTask().isBattleStarted())
 			{
-				character.setInsideZone(L2Character.ZONE_PVP, false);
+				character.setInsideZone(ZoneId.PVP, false);
 				if (character.isPlayer())
 				{
 					character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
@@ -237,13 +238,13 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn
 			
 			if (battleStarted)
 			{
-				character.setInsideZone(L2Character.ZONE_PVP, true);
+				character.setInsideZone(ZoneId.PVP, true);
 				if (character.isPlayer())
 					character.sendPacket(sm);
 			}
 			else
 			{
-				character.setInsideZone(L2Character.ZONE_PVP, false);
+				character.setInsideZone(ZoneId.PVP, false);
 				if (character.isPlayer())
 				{
 					character.sendPacket(sm);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java

@@ -19,6 +19,7 @@ import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A Peace Zone
@@ -52,12 +53,12 @@ public class L2PeaceZone extends L2ZoneType
 		
 		if (Config.PEACE_ZONE_MODE != 2)
 		{
-			character.setInsideZone(L2Character.ZONE_PEACE, true);
+			character.setInsideZone(ZoneId.PEACE, true);
 		}
 		
 		if (!getAllowStore())
 		{
-			character.setInsideZone(L2Character.ZONE_NOSTORE, true);
+			character.setInsideZone(ZoneId.NO_STORE, true);
 		}
 	}
 	
@@ -66,12 +67,12 @@ public class L2PeaceZone extends L2ZoneType
 	{
 		if (Config.PEACE_ZONE_MODE != 2)
 		{
-			character.setInsideZone(L2Character.ZONE_PEACE, false);
+			character.setInsideZone(ZoneId.PEACE, false);
 		}
 		
 		if (!getAllowStore())
 		{
-			character.setInsideZone(L2Character.ZONE_NOSTORE, false);
+			character.setInsideZone(ZoneId.NO_STORE, false);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceTeleportZone.java

@@ -17,6 +17,7 @@ package com.l2jserver.gameserver.model.zone.type;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * based on Kerberos work for custom L2CastleTeleportZone
@@ -47,13 +48,13 @@ public class L2ResidenceTeleportZone extends L2ZoneRespawn
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_NOSUMMONFRIEND, true); // FIXME: Custom ?
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true); // FIXME: Custom ?
 	}
 	
 	@Override
 	protected void onExit(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_NOSUMMONFRIEND, false); // FIXME: Custom ?
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false); // FIXME: Custom ?
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2ScriptZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A scripted zone... Creation of such a zone should require somekind of jython script reference which can handle onEnter() / onExit()
@@ -31,13 +32,13 @@ public class L2ScriptZone extends L2ZoneType
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_SCRIPT, true);
+		character.setInsideZone(ZoneId.SCRIPT, true);
 	}
 	
 	@Override
 	protected void onExit(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_SCRIPT, false);
+		character.setInsideZone(ZoneId.SCRIPT, false);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java

@@ -32,6 +32,7 @@ import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -156,9 +157,9 @@ public class L2SiegeZone extends L2ZoneType
 	{
 		if (getSettings().isActiveSiege())
 		{
-			character.setInsideZone(L2Character.ZONE_PVP, true);
-			character.setInsideZone(L2Character.ZONE_SIEGE, true);
-			character.setInsideZone(L2Character.ZONE_NOSUMMONFRIEND, true); // FIXME: Custom ?
+			character.setInsideZone(ZoneId.PVP, true);
+			character.setInsideZone(ZoneId.SIEGE, true);
+			character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true); // FIXME: Custom ?
 			
 			if (character.isPlayer())
 			{
@@ -185,9 +186,9 @@ public class L2SiegeZone extends L2ZoneType
 	@Override
 	protected void onExit(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_PVP, false);
-		character.setInsideZone(L2Character.ZONE_SIEGE, false);
-		character.setInsideZone(L2Character.ZONE_NOSUMMONFRIEND, false); // FIXME: Custom ?
+		character.setInsideZone(ZoneId.PVP, false);
+		character.setInsideZone(ZoneId.SIEGE, false);
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false); // FIXME: Custom ?
 		if (getSettings().isActiveSiege())
 		{
 			if (character.isPlayer())
@@ -279,9 +280,9 @@ public class L2SiegeZone extends L2ZoneType
 				if (character == null)
 					continue;
 				
-				character.setInsideZone(L2Character.ZONE_PVP, false);
-				character.setInsideZone(L2Character.ZONE_SIEGE, false);
-				character.setInsideZone(L2Character.ZONE_NOSUMMONFRIEND, false);
+				character.setInsideZone(ZoneId.PVP, false);
+				character.setInsideZone(ZoneId.SIEGE, false);
+				character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false);
 				
 				if (character.isPlayer())
 				{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2SwampZone.java

@@ -19,6 +19,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * another type of zone where your speed is changed
@@ -87,7 +88,7 @@ public class L2SwampZone extends L2ZoneType
 			}
 		}
 		
-		character.setInsideZone(L2Character.ZONE_SWAMP, true);
+		character.setInsideZone(ZoneId.SWAMP, true);
 		if (character.isPlayer())
 		{
 			character.getActingPlayer().broadcastUserInfo();
@@ -98,9 +99,9 @@ public class L2SwampZone extends L2ZoneType
 	protected void onExit(L2Character character)
 	{
 		// don't broadcast info if not needed
-		if (character.isInsideZone(L2Character.ZONE_SWAMP))
+		if (character.isInsideZone(ZoneId.SWAMP))
 		{
-			character.setInsideZone(L2Character.ZONE_SWAMP, false);
+			character.setInsideZone(ZoneId.SWAMP, false);
 			if (character.isPlayer())
 			{
 				character.getActingPlayer().broadcastUserInfo();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2TownZone.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * A Town zone
@@ -53,13 +54,13 @@ public class L2TownZone extends L2ZoneType
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_TOWN, true);
+		character.setInsideZone(ZoneId.TOWN, true);
 	}
 	
 	@Override
 	protected void onExit(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_TOWN, false);
+		character.setInsideZone(ZoneId.TOWN, false);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java

@@ -20,6 +20,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
 import com.l2jserver.gameserver.network.serverpackets.ServerObjectInfo;
 
@@ -33,7 +34,7 @@ public class L2WaterZone extends L2ZoneType
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_WATER, true);
+		character.setInsideZone(ZoneId.WATER, true);
 		
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())
@@ -69,7 +70,7 @@ public class L2WaterZone extends L2ZoneType
 	@Override
 	protected void onExit(L2Character character)
 	{
-		character.setInsideZone(L2Character.ZONE_WATER, false);
+		character.setInsideZone(ZoneId.WATER, false);
 		
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())

L2J_Server_BETA/java/com/l2jserver/gameserver/network/L2GameClient.java

@@ -45,10 +45,10 @@ import com.l2jserver.gameserver.model.CharSelectInfoPackage;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.PcCondOverride;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.L2Event;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 import com.l2jserver.gameserver.network.serverpackets.ServerClose;
@@ -795,7 +795,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 			canSetShop = true;
 		}
 		
-		if (Config.OFFLINE_MODE_IN_PEACE_ZONE && !player.isInsideZone(L2Character.ZONE_PEACE))
+		if (Config.OFFLINE_MODE_IN_PEACE_ZONE && !player.isInsideZone(ZoneId.PEACE))
 		{
 			canSetShop = false;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

@@ -47,7 +47,6 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.PcCondOverride;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ClassMasterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Couple;
@@ -61,6 +60,7 @@ import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.communityserver.CommunityServerThread;
 import com.l2jserver.gameserver.network.communityserver.writepackets.WorldInfo;
@@ -555,8 +555,9 @@ public class EnterWorld extends L2GameClientPacket
 			}
 		}
 		
-		// Attacker or spectator logging in to a siege zone. Actually should be checked for inside castle only?
-		if (!activeChar.canOverrideCond(PcCondOverride.ZONE_CONDITIONS) && activeChar.isInsideZone(L2Character.ZONE_SIEGE) && (!activeChar.isInSiege() || (activeChar.getSiegeState() < 2)))
+		// Attacker or spectator logging in to a siege zone.
+		// Actually should be checked for inside castle only?
+		if (!activeChar.canOverrideCond(PcCondOverride.ZONE_CONDITIONS) && activeChar.isInsideZone(ZoneId.SIEGE) && (!activeChar.isInSiege() || (activeChar.getSiegeState() < 2)))
 		{
 			activeChar.teleToLocation(MapRegionManager.TeleportWhereType.Town);
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2ManufactureList;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2BabyPetInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
@@ -42,6 +41,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ChairSit;
@@ -207,7 +207,7 @@ public final class RequestActionUse extends L2GameClientPacket
 						return;
 					}
 					
-					if ((target.getActingPlayer() != null) && (pet.getOwner().getSiegeState() > 0) && pet.getOwner().isInsideZone(L2Character.ZONE_SIEGE) && (target.getActingPlayer().getSiegeState() == pet.getOwner().getSiegeState()) && (target.getActingPlayer() != pet.getOwner()) && (target.getActingPlayer().getSiegeSide() == pet.getOwner().getSiegeSide()))
+					if ((target.getActingPlayer() != null) && (pet.getOwner().getSiegeState() > 0) && pet.getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == pet.getOwner().getSiegeState()) && (target.getActingPlayer() != pet.getOwner()) && (target.getActingPlayer().getSiegeSide() == pet.getOwner().getSiegeSide()))
 					{
 						//
 						if (TerritoryWarManager.getInstance().isTWInProgress())

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java

@@ -14,8 +14,6 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.L2World;
@@ -24,6 +22,7 @@ import com.l2jserver.gameserver.model.entity.Message;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
@@ -67,7 +66,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket
 			return;
 		}
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE))
+		if (!activeChar.isInsideZone(ZoneId.PEACE))
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_CANCEL_NOT_IN_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java

@@ -14,12 +14,11 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jserver.gameserver.util.Util;
@@ -56,7 +55,7 @@ public final class RequestDeleteReceivedPost extends L2GameClientPacket
 		if (activeChar == null || _msgIds == null || !Config.ALLOW_MAIL)
 			return;
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE))
+		if (!activeChar.isInsideZone(ZoneId.PEACE))
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java

@@ -14,12 +14,11 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jserver.gameserver.util.Util;
@@ -56,7 +55,7 @@ public final class RequestDeleteSentPost extends L2GameClientPacket
 		if (activeChar == null || _msgIds == null || !Config.ALLOW_MAIL)
 			return;
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE))
+		if (!activeChar.isInsideZone(ZoneId.PEACE))
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java

@@ -17,12 +17,12 @@ package com.l2jserver.gameserver.network.clientpackets;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.AdminTable;
 import com.l2jserver.gameserver.model.PcCondOverride;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;
@@ -72,7 +72,7 @@ public final class RequestDropItem extends L2GameClientPacket
 				|| (!Config.ALLOW_DISCARDITEM && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS))
 				|| (!item.isDropable() && !(activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 				|| (item.getItemType() == L2EtcItemType.PET_COLLAR && activeChar.havePetInvItems())
-				|| activeChar.isInsideZone(L2Character.ZONE_NOITEMDROP))
+				|| activeChar.isInsideZone(ZoneId.NO_ITEM_DROP))
 		{
 			activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOffVehicle.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.GetOffVehicle;
 import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
@@ -58,7 +58,7 @@ public final class RequestGetOffVehicle extends L2GameClientPacket
 		sendPacket(ActionFailed.STATIC_PACKET);
 		activeChar.broadcastPacket(new GetOffVehicle(activeChar.getObjectId(), _boatId, _x, _y, _z));
 		activeChar.setXYZ(_x, _y, _z);
-		activeChar.setInsideZone(L2Character.ZONE_PEACE, false);
+		activeChar.setInsideZone(ZoneId.PEACE, false);
 		activeChar.revalidateZone(true);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOnVehicle.java

@@ -15,9 +15,9 @@
 package com.l2jserver.gameserver.network.clientpackets;
 
 import com.l2jserver.gameserver.instancemanager.BoatManager;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.GetOnVehicle;
 import com.l2jserver.gameserver.util.Point3D;
@@ -78,7 +78,7 @@ public final class RequestGetOnVehicle extends L2GameClientPacket
 		activeChar.broadcastPacket(new GetOnVehicle(activeChar.getObjectId(), boat.getObjectId(), _pos));
 		
 		activeChar.setXYZ(boat.getX(), boat.getY(), boat.getZ());
-		activeChar.setInsideZone(L2Character.ZONE_PEACE, true);
+		activeChar.setInsideZone(ZoneId.PEACE, true);
 		activeChar.revalidateZone(true);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java

@@ -14,7 +14,6 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
 import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.ADENA_ID;
 
 import com.l2jserver.Config;
@@ -26,6 +25,7 @@ import com.l2jserver.gameserver.model.entity.Message;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
@@ -68,7 +68,7 @@ public final class RequestPostAttachment extends L2GameClientPacket
 			return;
 		}
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE))
+		if (!activeChar.isInsideZone(ZoneId.PEACE))
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_NOT_IN_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPostItemList.java

@@ -14,10 +14,9 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExReplyPostItemList;
 
@@ -44,7 +43,7 @@ public final class RequestPostItemList extends L2GameClientPacket
 		if (activeChar == null)
 			return;
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE))
+		if (!activeChar.isInsideZone(ZoneId.PEACE))
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPost.java

@@ -14,12 +14,11 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jserver.gameserver.network.serverpackets.ExReplyReceivedPost;
@@ -51,7 +50,7 @@ public final class RequestReceivedPost extends L2GameClientPacket
 		if (msg == null)
 			return;
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE) && msg.hasAttachments())
+		if (!activeChar.isInsideZone(ZoneId.PEACE) && msg.hasAttachments())
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java

@@ -24,8 +24,8 @@ import com.l2jserver.gameserver.datatables.RecipeData;
 import com.l2jserver.gameserver.model.L2ManufactureItem;
 import com.l2jserver.gameserver.model.L2ManufactureList;
 import com.l2jserver.gameserver.model.L2RecipeList;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.RecipeShopMsg;
@@ -89,7 +89,7 @@ public final class RequestRecipeShopListSet extends L2GameClientPacket
 			return;
 		}
 		
-		if (player.isInsideZone(L2Character.ZONE_NOSTORE))
+		if (player.isInsideZone(ZoneId.NO_STORE))
 		{
 			player.sendPacket(SystemMessageId.NO_PRIVATE_WORKSHOP_HERE);
 			player.sendPacket(ActionFailed.STATIC_PACKET);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java

@@ -14,13 +14,12 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -54,7 +53,7 @@ public final class RequestRejectPostAttachment extends L2GameClientPacket
 		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("rejectattach"))
 			return;
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE))
+		if (!activeChar.isInsideZone(ZoneId.PEACE))
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java

@@ -14,7 +14,6 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
 import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.ADENA_ID;
 import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.MAX_ADENA;
 
@@ -28,6 +27,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
 import com.l2jserver.gameserver.model.itemcontainer.Mail;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExNoticePostSent;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
@@ -123,7 +123,7 @@ public final class RequestSendPost extends L2GameClientPacket
 			return;
 		}
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE) && _items != null)
+		if (!activeChar.isInsideZone(ZoneId.PEACE) && _items != null)
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_NOT_IN_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java

@@ -14,12 +14,11 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import static com.l2jserver.gameserver.model.actor.L2Character.ZONE_PEACE;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExReplySentPost;
 import com.l2jserver.gameserver.util.Util;
@@ -50,7 +49,7 @@ public final class RequestSentPost extends L2GameClientPacket
 		if (msg == null)
 			return;
 		
-		if (!activeChar.isInsideZone(ZONE_PEACE) && msg.hasAttachments())
+		if (!activeChar.isInsideZone(ZoneId.PEACE) && msg.hasAttachments())
 		{
 			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java

@@ -18,8 +18,8 @@ import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.MAX_ADENA
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.TradeList;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.PrivateStoreManageListBuy;
@@ -103,7 +103,7 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			return;
 		}
 		
-		if (player.isInsideZone(L2Character.ZONE_NOSTORE))
+		if (player.isInsideZone(ZoneId.NO_STORE))
 		{
 			player.sendPacket(new PrivateStoreManageListBuy(player));
 			player.sendPacket(SystemMessageId.NO_PRIVATE_STORE_HERE);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java

@@ -18,8 +18,8 @@ import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.MAX_ADENA
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.TradeList;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
@@ -97,7 +97,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket
 			return;
 		}
 		
-		if (player.isInsideZone(L2Character.ZONE_NOSTORE))
+		if (player.isInsideZone(ZoneId.NO_STORE))
 		{
 			player.sendPacket(new PrivateStoreManageListSell(player, _packageSale));
 			player.sendPacket(SystemMessageId.NO_PRIVATE_STORE_HERE);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/ValidatePosition.java

@@ -17,8 +17,8 @@ package com.l2jserver.gameserver.network.clientpackets;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.TaskPriority;
 import com.l2jserver.gameserver.geoeditorcon.GeoEditorListener;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.serverpackets.GetOnVehicle;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
@@ -132,7 +132,7 @@ public class ValidatePosition extends L2GameClientPacket
 					&& GeoEditorListener.getInstance().getThread().isSend(activeChar))
 				GeoEditorListener.getInstance().getThread().sendGmPosition(_x,_y,(short)_z);
 		
-		if (activeChar.isFlying() || activeChar.isInsideZone(L2Character.ZONE_WATER))
+		if (activeChar.isFlying() || activeChar.isInsideZone(ZoneId.WATER))
 		{
 			activeChar.setXYZ(realX, realY, _z);
 			if (diffSq > 90000) // validate packet, may also cause z bounce if close to land

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.AbnormalEffect;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 public abstract class AbstractNpcInfo extends L2GameServerPacket
 {
@@ -106,7 +107,7 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 			}
 			
 			// npc crest of owning clan/ally of castle
-			if (cha instanceof L2NpcInstance && cha.isInsideZone(L2Character.ZONE_TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && cha.getCastle().getOwnerId() != 0)
+			if (cha instanceof L2NpcInstance && cha.isInsideZone(ZoneId.TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && cha.getCastle().getOwnerId() != 0)
 			{
 				int townId = TownManager.getTown(_x, _y, _z).getTownId();
 				if (townId != 33 && townId != 22)

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/EtcStatusUpdate.java

@@ -15,8 +15,8 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.CharEffectList;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
  * @author Luca Baldi
@@ -40,7 +40,7 @@ public class EtcStatusUpdate extends L2GameServerPacket
 		writeD(_activeChar.getCharges()); // 1-7 increase force, lvl
 		writeD(_activeChar.getWeightPenalty()); // 1-4 weight penalty, lvl (1=50%, 2=66.6%, 3=80%, 4=100%)
 		writeD((_activeChar.getMessageRefusal() || _activeChar.isChatBanned() || _activeChar.isSilenceMode()) ? 1 : 0); // 1 = block all chat
-		writeD(_activeChar.isInsideZone(L2Character.ZONE_DANGERAREA) ? 1 : 0); // 1 = danger area
+		writeD(_activeChar.isInsideZone(ZoneId.DANGER_AREA) ? 1 : 0); // 1 = danger area
 		writeD(_activeChar.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4]
 		writeD(_activeChar.getExpertiseArmorPenalty()); // Armor Grade Penalty [1-4]
 		writeD(_activeChar.isAffected(CharEffectList.EFFECT_FLAG_CHARM_OF_COURAGE) ? 1 : 0); // 1 = charm of courage (allows resurrection on the same spot upon death on the siege battlefield)