BETA: Moving Enums to seperate package.

	* First patch of more to come, will be done in parts 4-6 enums at a time.
	* Reviewed by: Zoey76

L2J_Server_BETA/dist/game/config/Server.properties

@@ -50,7 +50,7 @@ URL = jdbc:mysql://localhost/l2jgs
 # Database user info (default is "root" but it's not recommended)
 Login = root
 # Database connection password
-Password = 
+Password = tinkara.09
 
 # Default: 100
 MaximumDbConnections = 100

L2J_Server_BETA/dist/login/config/LoginServer.properties

@@ -84,7 +84,7 @@ URL = jdbc:mysql://localhost/l2jls
 # Database user info (default is "root" but it's not recommended)
 Login = root
 # Database connection password
-Password = 
+Password = tinkara.09
 
 # Default: 10
 MaximumDbConnections = 10

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CategoryData.java

@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.engines.DocumentParser;
-import com.l2jserver.gameserver.model.CategoryType;
+import com.l2jserver.gameserver.enums.CategoryType;
 
 /**
  * This class holds different categories containing class ids or npc ids.

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemData.java

@@ -27,8 +27,8 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.engines.DocumentParser;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.items.enchant.EnchantSupportItem;
 import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
+import com.l2jserver.gameserver.model.items.enchant.EnchantSupportItem;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentBase.java

@@ -35,7 +35,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.model.L2Object.InstanceType;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.base.PlayerState;
 import com.l2jserver.gameserver.model.base.Race;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CategoryType.java → L2J_Server_BETA/java/com/l2jserver/gameserver/enums/CategoryType.java

@@ -16,7 +16,7 @@
  * 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;
+package com.l2jserver.gameserver.enums;
 
 /**
  * This class defines all category types.

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/InstanceType.java

@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2004-2013 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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.
+ * 
+ * L2J Server 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum InstanceType
+{
+	L2Object(null),
+	L2ItemInstance(L2Object),
+	L2Character(L2Object),
+	L2Npc(L2Character),
+	L2Playable(L2Character),
+	L2Summon(L2Playable),
+	L2Decoy(L2Character),
+	L2PcInstance(L2Playable),
+	L2NpcInstance(L2Npc),
+	L2MerchantInstance(L2NpcInstance),
+	L2WarehouseInstance(L2NpcInstance),
+	L2StaticObjectInstance(L2Character),
+	L2DoorInstance(L2Character),
+	L2TerrainObjectInstance(L2Npc),
+	L2EffectPointInstance(L2Npc),
+	// Summons, Pets, Decoys and Traps
+	L2ServitorInstance(L2Summon),
+	L2SiegeSummonInstance(L2ServitorInstance),
+	L2MerchantSummonInstance(L2ServitorInstance),
+	L2PetInstance(L2Summon),
+	L2BabyPetInstance(L2PetInstance),
+	L2DecoyInstance(L2Decoy),
+	L2TrapInstance(L2Npc),
+	// Attackable
+	L2Attackable(L2Npc),
+	L2GuardInstance(L2Attackable),
+	L2QuestGuardInstance(L2GuardInstance),
+	L2MonsterInstance(L2Attackable),
+	L2ChestInstance(L2MonsterInstance),
+	L2ControllableMobInstance(L2MonsterInstance),
+	L2FeedableBeastInstance(L2MonsterInstance),
+	L2TamedBeastInstance(L2FeedableBeastInstance),
+	L2FriendlyMobInstance(L2Attackable),
+	L2RiftInvaderInstance(L2MonsterInstance),
+	L2RaidBossInstance(L2MonsterInstance),
+	L2GrandBossInstance(L2RaidBossInstance),
+	// FlyMobs
+	L2FlyNpcInstance(L2NpcInstance),
+	L2FlyMonsterInstance(L2MonsterInstance),
+	L2FlyRaidBossInstance(L2RaidBossInstance),
+	L2FlyTerrainObjectInstance(L2Npc),
+	// Sepulchers
+	L2SepulcherNpcInstance(L2NpcInstance),
+	L2SepulcherMonsterInstance(L2MonsterInstance),
+	// Festival
+	L2FestivalGiudeInstance(L2Npc),
+	L2FestivalMonsterInstance(L2MonsterInstance),
+	// Vehicles
+	L2Vehicle(L2Character),
+	L2BoatInstance(L2Vehicle),
+	L2AirShipInstance(L2Vehicle),
+	L2ControllableAirShipInstance(L2AirShipInstance),
+	// Siege
+	L2DefenderInstance(L2Attackable),
+	L2ArtefactInstance(L2NpcInstance),
+	L2ControlTowerInstance(L2Npc),
+	L2FlameTowerInstance(L2Npc),
+	L2SiegeFlagInstance(L2Npc),
+	L2SiegeNpcInstance(L2Npc),
+	// Fort Siege
+	L2FortBallistaInstance(L2Npc),
+	L2FortCommanderInstance(L2DefenderInstance),
+	// Castle NPCs
+	L2CastleMagicianInstance(L2NpcInstance),
+	// Fort NPCs
+	L2FortEnvoyInstance(L2Npc),
+	L2FortLogisticsInstance(L2MerchantInstance),
+	L2FortManagerInstance(L2MerchantInstance),
+	L2FortSiegeNpcInstance(L2Npc),
+	L2FortSupportCaptainInstance(L2MerchantInstance),
+	// Seven Signs
+	L2SignsPriestInstance(L2Npc),
+	L2DawnPriestInstance(L2SignsPriestInstance),
+	L2DuskPriestInstance(L2SignsPriestInstance),
+	L2DungeonGatekeeperInstance(L2Npc),
+	// City NPCs
+	L2AdventurerInstance(L2NpcInstance),
+	L2AuctioneerInstance(L2Npc),
+	L2ClanHallManagerInstance(L2MerchantInstance),
+	L2FishermanInstance(L2MerchantInstance),
+	L2ManorManagerInstance(L2MerchantInstance),
+	L2ObservationInstance(L2Npc),
+	L2OlympiadManagerInstance(L2Npc),
+	L2PetManagerInstance(L2MerchantInstance),
+	L2RaceManagerInstance(L2Npc),
+	L2TeleporterInstance(L2Npc),
+	L2TrainerInstance(L2NpcInstance),
+	L2VillageMasterInstance(L2NpcInstance),
+	// Doormens
+	L2DoormenInstance(L2NpcInstance),
+	L2CastleDoormenInstance(L2DoormenInstance),
+	L2FortDoormenInstance(L2DoormenInstance),
+	L2ClanHallDoormenInstance(L2DoormenInstance),
+	// Custom
+	L2ClassMasterInstance(L2NpcInstance),
+	L2NpcBufferInstance(L2Npc),
+	L2TvTEventNpcInstance(L2Npc),
+	L2WeddingManagerInstance(L2Npc),
+	L2EventMobInstance(L2Npc);
+	
+	private final InstanceType _parent;
+	private final long _typeL;
+	private final long _typeH;
+	private final long _maskL;
+	private final long _maskH;
+	
+	private InstanceType(InstanceType parent)
+	{
+		_parent = parent;
+		
+		final int high = ordinal() - (Long.SIZE - 1);
+		if (high < 0)
+		{
+			_typeL = 1L << ordinal();
+			_typeH = 0;
+		}
+		else
+		{
+			_typeL = 0;
+			_typeH = 1L << high;
+		}
+		
+		if ((_typeL < 0) || (_typeH < 0))
+		{
+			throw new Error("Too many instance types, failed to load " + name());
+		}
+		
+		if (parent != null)
+		{
+			_maskL = _typeL | parent._maskL;
+			_maskH = _typeH | parent._maskH;
+		}
+		else
+		{
+			_maskL = _typeL;
+			_maskH = _typeH;
+		}
+	}
+	
+	public final InstanceType getParent()
+	{
+		return _parent;
+	}
+	
+	public final boolean isType(InstanceType it)
+	{
+		return ((_maskL & it._typeL) > 0) || ((_maskH & it._typeH) > 0);
+	}
+	
+	public final boolean isTypes(InstanceType... it)
+	{
+		for (InstanceType i : it)
+		{
+			if (isType(i))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/MountType.java → L2J_Server_BETA/java/com/l2jserver/gameserver/enums/MountType.java

@@ -16,7 +16,7 @@
  * 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;
+package com.l2jserver.gameserver.enums;
 
 import com.l2jserver.gameserver.datatables.CategoryData;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/PetitionState.java → L2J_Server_BETA/java/com/l2jserver/gameserver/enums/PetitionState.java

@@ -16,7 +16,7 @@
  * 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;
+package com.l2jserver.gameserver.enums;
 
 /**
  * Enum with petition states.

L2J_Server_BETA/java/com/l2jserver/gameserver/model/PetitionType.java → L2J_Server_BETA/java/com/l2jserver/gameserver/enums/PetitionType.java

@@ -16,7 +16,7 @@
  * 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;
+package com.l2jserver.gameserver.enums;
 
 /**
  * Enum with petition types.

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ShotType.java → L2J_Server_BETA/java/com/l2jserver/gameserver/enums/ShotType.java

@@ -16,7 +16,7 @@
  * 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;
+package com.l2jserver.gameserver.enums;
 
 /**
  * @author UnAfraid

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/TriggerType.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2004-2013 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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.
+ * 
+ * L2J Server 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.enums;
+
+/**
+ * @author kombat
+ */
+public enum TriggerType
+{
+	// You hit an enemy
+	ON_HIT(1),
+	// You hit an enemy - was crit
+	ON_CRIT(2),
+	// You cast a skill
+	ON_CAST(4),
+	// You cast a skill - it was a physical one
+	ON_PHYSICAL(8),
+	// You cast a skill - it was a magic one
+	ON_MAGIC(16),
+	// You cast a skill - it was a magic one - good magic
+	ON_MAGIC_GOOD(32),
+	// You cast a skill - it was a magic one - offensive magic
+	ON_MAGIC_OFFENSIVE(64),
+	// You are attacked by enemy
+	ON_ATTACKED(128),
+	// You are attacked by enemy - by hit
+	ON_ATTACKED_HIT(256),
+	// You are attacked by enemy - by hit - was crit
+	ON_ATTACKED_CRIT(512),
+	// A skill was casted on you
+	ON_HIT_BY_SKILL(1024),
+	// An evil skill was casted on you
+	ON_HIT_BY_OFFENSIVE_SKILL(2048),
+	// A good skill was casted on you
+	ON_HIT_BY_GOOD_MAGIC(4096),
+	// Evading melee attack
+	ON_EVADED_HIT(8192),
+	// Effect only - on start
+	ON_START(16384),
+	// Effect only - each second
+	ON_ACTION_TIME(32768),
+	// Effect only - on exit
+	ON_EXIT(65536);
+	
+	private final int _mask;
+	
+	private TriggerType(int mask)
+	{
+		_mask = mask;
+	}
+	
+	public final boolean check(int event)
+	{
+		return (_mask & event) != 0; // Trigger (sub-)type contains event (sub-)type
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionHandler.java

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.handler;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.model.L2Object.InstanceType;
+import com.l2jserver.gameserver.enums.InstanceType;
 
 /**
  * @author UnAfraid

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionShiftHandler.java

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.handler;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.model.L2Object.InstanceType;
+import com.l2jserver.gameserver.enums.InstanceType;
 
 /**
  * @author UnAfraid

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/IActionHandler.java

@@ -20,8 +20,8 @@ package com.l2jserver.gameserver.handler;
 
 import java.util.logging.Logger;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 public interface IActionHandler

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

@@ -26,8 +26,8 @@ import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.enums.PetitionState;
 import com.l2jserver.gameserver.model.Petition;
-import com.l2jserver.gameserver.model.PetitionState;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;

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

@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.l2jserver.gameserver.enums.TriggerType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.Rnd;
 
@@ -50,56 +51,6 @@ public final class ChanceCondition
 	public static final int EVT_ON_ACTION_TIME = 32768;
 	public static final int EVT_ON_EXIT = 65536;
 	
-	public static enum TriggerType
-	{
-		// You hit an enemy
-		ON_HIT(1),
-		// You hit an enemy - was crit
-		ON_CRIT(2),
-		// You cast a skill
-		ON_CAST(4),
-		// You cast a skill - it was a physical one
-		ON_PHYSICAL(8),
-		// You cast a skill - it was a magic one
-		ON_MAGIC(16),
-		// You cast a skill - it was a magic one - good magic
-		ON_MAGIC_GOOD(32),
-		// You cast a skill - it was a magic one - offensive magic
-		ON_MAGIC_OFFENSIVE(64),
-		// You are attacked by enemy
-		ON_ATTACKED(128),
-		// You are attacked by enemy - by hit
-		ON_ATTACKED_HIT(256),
-		// You are attacked by enemy - by hit - was crit
-		ON_ATTACKED_CRIT(512),
-		// A skill was casted on you
-		ON_HIT_BY_SKILL(1024),
-		// An evil skill was casted on you
-		ON_HIT_BY_OFFENSIVE_SKILL(2048),
-		// A good skill was casted on you
-		ON_HIT_BY_GOOD_MAGIC(4096),
-		// Evading melee attack
-		ON_EVADED_HIT(8192),
-		// Effect only - on start
-		ON_START(16384),
-		// Effect only - each second
-		ON_ACTION_TIME(32768),
-		// Effect only - on exit
-		ON_EXIT(65536);
-		
-		private final int _mask;
-		
-		private TriggerType(int mask)
-		{
-			_mask = mask;
-		}
-		
-		public final boolean check(int event)
-		{
-			return (_mask & event) != 0; // Trigger (sub-)type contains event (sub-)type
-		}
-	}
-	
 	private final TriggerType _triggerType;
 	private final int _chance;
 	private final int _mindmg;

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

@@ -22,6 +22,8 @@ import java.util.Map;
 
 import javolution.util.FastMap;
 
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.ActionHandler;
 import com.l2jserver.gameserver.handler.ActionShiftHandler;
 import com.l2jserver.gameserver.handler.IActionHandler;
@@ -68,170 +70,6 @@ public abstract class L2Object extends ObjectPosition implements IIdentifiable
 		setActiveObject(this);
 	}
 	
-	public static enum InstanceType
-	{
-		L2Object(null),
-		L2ItemInstance(L2Object),
-		L2Character(L2Object),
-		L2Npc(L2Character),
-		L2Playable(L2Character),
-		L2Summon(L2Playable),
-		L2Decoy(L2Character),
-		L2PcInstance(L2Playable),
-		L2NpcInstance(L2Npc),
-		L2MerchantInstance(L2NpcInstance),
-		L2WarehouseInstance(L2NpcInstance),
-		L2StaticObjectInstance(L2Character),
-		L2DoorInstance(L2Character),
-		L2TerrainObjectInstance(L2Npc),
-		L2EffectPointInstance(L2Npc),
-		// Summons, Pets, Decoys and Traps
-		L2ServitorInstance(L2Summon),
-		L2SiegeSummonInstance(L2ServitorInstance),
-		L2MerchantSummonInstance(L2ServitorInstance),
-		L2PetInstance(L2Summon),
-		L2BabyPetInstance(L2PetInstance),
-		L2DecoyInstance(L2Decoy),
-		L2TrapInstance(L2Npc),
-		// Attackable
-		L2Attackable(L2Npc),
-		L2GuardInstance(L2Attackable),
-		L2QuestGuardInstance(L2GuardInstance),
-		L2MonsterInstance(L2Attackable),
-		L2ChestInstance(L2MonsterInstance),
-		L2ControllableMobInstance(L2MonsterInstance),
-		L2FeedableBeastInstance(L2MonsterInstance),
-		L2TamedBeastInstance(L2FeedableBeastInstance),
-		L2FriendlyMobInstance(L2Attackable),
-		L2RiftInvaderInstance(L2MonsterInstance),
-		L2RaidBossInstance(L2MonsterInstance),
-		L2GrandBossInstance(L2RaidBossInstance),
-		// FlyMobs
-		L2FlyNpcInstance(L2NpcInstance),
-		L2FlyMonsterInstance(L2MonsterInstance),
-		L2FlyRaidBossInstance(L2RaidBossInstance),
-		L2FlyTerrainObjectInstance(L2Npc),
-		// Sepulchers
-		L2SepulcherNpcInstance(L2NpcInstance),
-		L2SepulcherMonsterInstance(L2MonsterInstance),
-		// Festival
-		L2FestivalGiudeInstance(L2Npc),
-		L2FestivalMonsterInstance(L2MonsterInstance),
-		// Vehicles
-		L2Vehicle(L2Character),
-		L2BoatInstance(L2Vehicle),
-		L2AirShipInstance(L2Vehicle),
-		L2ControllableAirShipInstance(L2AirShipInstance),
-		// Siege
-		L2DefenderInstance(L2Attackable),
-		L2ArtefactInstance(L2NpcInstance),
-		L2ControlTowerInstance(L2Npc),
-		L2FlameTowerInstance(L2Npc),
-		L2SiegeFlagInstance(L2Npc),
-		L2SiegeNpcInstance(L2Npc),
-		// Fort Siege
-		L2FortBallistaInstance(L2Npc),
-		L2FortCommanderInstance(L2DefenderInstance),
-		// Castle NPCs
-		L2CastleMagicianInstance(L2NpcInstance),
-		// Fort NPCs
-		L2FortEnvoyInstance(L2Npc),
-		L2FortLogisticsInstance(L2MerchantInstance),
-		L2FortManagerInstance(L2MerchantInstance),
-		L2FortSiegeNpcInstance(L2Npc),
-		L2FortSupportCaptainInstance(L2MerchantInstance),
-		// Seven Signs
-		L2SignsPriestInstance(L2Npc),
-		L2DawnPriestInstance(L2SignsPriestInstance),
-		L2DuskPriestInstance(L2SignsPriestInstance),
-		L2DungeonGatekeeperInstance(L2Npc),
-		// City NPCs
-		L2AdventurerInstance(L2NpcInstance),
-		L2AuctioneerInstance(L2Npc),
-		L2ClanHallManagerInstance(L2MerchantInstance),
-		L2FishermanInstance(L2MerchantInstance),
-		L2ManorManagerInstance(L2MerchantInstance),
-		L2ObservationInstance(L2Npc),
-		L2OlympiadManagerInstance(L2Npc),
-		L2PetManagerInstance(L2MerchantInstance),
-		L2RaceManagerInstance(L2Npc),
-		L2TeleporterInstance(L2Npc),
-		L2TrainerInstance(L2NpcInstance),
-		L2VillageMasterInstance(L2NpcInstance),
-		// Doormens
-		L2DoormenInstance(L2NpcInstance),
-		L2CastleDoormenInstance(L2DoormenInstance),
-		L2FortDoormenInstance(L2DoormenInstance),
-		L2ClanHallDoormenInstance(L2DoormenInstance),
-		// Custom
-		L2ClassMasterInstance(L2NpcInstance),
-		L2NpcBufferInstance(L2Npc),
-		L2TvTEventNpcInstance(L2Npc),
-		L2WeddingManagerInstance(L2Npc),
-		L2EventMobInstance(L2Npc);
-		
-		private final InstanceType _parent;
-		private final long _typeL;
-		private final long _typeH;
-		private final long _maskL;
-		private final long _maskH;
-		
-		private InstanceType(InstanceType parent)
-		{
-			_parent = parent;
-			
-			final int high = ordinal() - (Long.SIZE - 1);
-			if (high < 0)
-			{
-				_typeL = 1L << ordinal();
-				_typeH = 0;
-			}
-			else
-			{
-				_typeL = 0;
-				_typeH = 1L << high;
-			}
-			
-			if ((_typeL < 0) || (_typeH < 0))
-			{
-				throw new Error("Too many instance types, failed to load " + name());
-			}
-			
-			if (parent != null)
-			{
-				_maskL = _typeL | parent._maskL;
-				_maskH = _typeH | parent._maskH;
-			}
-			else
-			{
-				_maskL = _typeL;
-				_maskH = _typeH;
-			}
-		}
-		
-		public final InstanceType getParent()
-		{
-			return _parent;
-		}
-		
-		public final boolean isType(InstanceType it)
-		{
-			return ((_maskL & it._typeL) > 0) || ((_maskH & it._typeH) > 0);
-		}
-		
-		public final boolean isTypes(InstanceType... it)
-		{
-			for (InstanceType i : it)
-			{
-				if (isType(i))
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-	
 	protected final void setInstanceType(InstanceType i)
 	{
 		_instanceType = i;

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

@@ -22,6 +22,8 @@ import java.util.List;
 
 import javolution.util.FastList;
 
+import com.l2jserver.gameserver.enums.PetitionState;
+import com.l2jserver.gameserver.enums.PetitionType;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.PetitionManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

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

@@ -40,6 +40,7 @@ import com.l2jserver.gameserver.datatables.EventDroplist.DateDrop;
 import com.l2jserver.gameserver.datatables.HerbDropTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.ManorData;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.L2CommandChannel;

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

@@ -46,6 +46,9 @@ import com.l2jserver.gameserver.ai.L2CharacterAI;
 import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
@@ -53,7 +56,6 @@ import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.instancemanager.TownManager;
-import com.l2jserver.gameserver.model.CategoryType;
 import com.l2jserver.gameserver.model.ChanceSkillList;
 import com.l2jserver.gameserver.model.CharEffectList;
 import com.l2jserver.gameserver.model.FusionSkill;
@@ -64,7 +66,6 @@ import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.PcCondOverride;
-import com.l2jserver.gameserver.model.ShotType;
 import com.l2jserver.gameserver.model.TeleportWhereType;
 import com.l2jserver.gameserver.model.actor.events.CharEvents;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

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

@@ -21,7 +21,8 @@ package com.l2jserver.gameserver.model.actor;
 import java.util.Collection;
 
 import com.l2jserver.gameserver.datatables.CategoryData;
-import com.l2jserver.gameserver.model.CategoryType;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -32,6 +32,9 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.CategoryData;
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.BypassHandler;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
@@ -39,13 +42,11 @@ import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.TownManager;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
-import com.l2jserver.gameserver.model.CategoryType;
 import com.l2jserver.gameserver.model.L2NpcAIData;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
-import com.l2jserver.gameserver.model.ShotType;
 import com.l2jserver.gameserver.model.actor.instance.L2ClanHallManagerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoormenInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2FestivalGuideInstance;

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor;
 
 import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.actor.events.PlayableEvents;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

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

@@ -26,14 +26,15 @@ import com.l2jserver.gameserver.ai.L2SummonAI;
 import com.l2jserver.gameserver.datatables.CategoryData;
 import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.handler.ItemHandler;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
-import com.l2jserver.gameserver.model.CategoryType;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.L2WorldRegion;
-import com.l2jserver.gameserver.model.ShotType;
 import com.l2jserver.gameserver.model.actor.L2Attackable.AggroInfo;
 import com.l2jserver.gameserver.model.actor.events.SummonEvents;
 import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance;

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

@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 /**

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.ai.L2AirShipAI;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.AirShipManager;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Vehicle;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -29,6 +29,7 @@ import java.util.StringTokenizer;
 import javolution.util.FastMap;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.AuctionManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;

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

@@ -28,6 +28,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.PetDataTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2PetData.L2PetSkillLearn;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.ai.L2BoatAI;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Vehicle;
 import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import java.util.StringTokenizer;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;

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

@@ -24,6 +24,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.L2SquadTrainer;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.skills.L2Skill;

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

@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.StringTokenizer;
 
 import com.l2jserver.gameserver.datatables.ClanTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -25,6 +25,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.model.L2Clan;

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

@@ -22,6 +22,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.ClassListData;
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.holders.ItemHolder;

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

@@ -23,6 +23,7 @@ import java.util.logging.Level;
 
 import javolution.util.FastList;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Tower;

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

@@ -22,6 +22,7 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.actor.stat.ControllableAirShipStat;
 import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;

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

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2CharacterAI;
 import com.l2jserver.gameserver.ai.L2ControllableMobAI;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;

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

@@ -23,6 +23,7 @@ import java.util.logging.Level;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Decoy;
 import com.l2jserver.gameserver.model.actor.knownlist.DecoyKnownList;

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

@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.ai.L2CharacterAI;
 import com.l2jserver.gameserver.ai.L2FortSiegeGuardAI;
 import com.l2jserver.gameserver.ai.L2SiegeGuardAI;
 import com.l2jserver.gameserver.ai.L2SpecialSiegeGuardAI;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;

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

@@ -29,6 +29,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.L2CharacterAI;
 import com.l2jserver.gameserver.ai.L2DoorAI;
 import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;

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

@@ -22,6 +22,7 @@ import java.util.StringTokenizer;
 
 import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2TeleportLocation;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -22,6 +22,7 @@ import java.util.StringTokenizer;
 
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2TeleportLocation;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 /**

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 // This class is here mostly for convenience and for avoidance of hardcoded IDs.

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

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -22,6 +22,7 @@ import java.util.List;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.base.AcquireSkillType;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import java.util.List;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Tower;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 public final class L2FlyMonsterInstance extends L2MonsterInstance

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 public final class L2FlyNpcInstance extends L2NpcInstance

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 public final class L2FlyRaidBossInstance extends L2RaidBossInstance

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -23,6 +23,7 @@ import javolution.util.FastList;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
 import com.l2jserver.gameserver.model.FortSiegeSpawn;
 import com.l2jserver.gameserver.model.L2Spawn;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import java.util.StringTokenizer;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Castle;

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

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 import java.util.StringTokenizer;
 
 import com.l2jserver.gameserver.datatables.NpcTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -25,6 +25,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2TeleportLocation;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -23,6 +23,7 @@ import java.util.StringTokenizer;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.L2SquadTrainer;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.knownlist.FriendlyMobKnownList;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;

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

@@ -26,6 +26,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2AttackableAI;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.actor.L2Attackable;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager;
 import com.l2jserver.gameserver.model.PcCondOverride;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 import com.l2jserver.gameserver.datatables.BuyListData;
 import com.l2jserver.gameserver.datatables.MerchantPriceConfigTable;
 import com.l2jserver.gameserver.datatables.MerchantPriceConfigTable.MerchantPriceConfig;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.buylist.L2BuyList;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -24,6 +24,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2CharacterAI;
 import com.l2jserver.gameserver.datatables.BuyListData;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.actor.L2Character;

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

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 import java.util.concurrent.ScheduledFuture;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.knownlist.MonsterKnownList;

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

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.NpcBufferTable;
 import com.l2jserver.gameserver.datatables.NpcBufferTable.NpcBufferData;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -24,6 +24,7 @@ import java.util.Map;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.status.FolkStatus;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.olympiad.Olympiad;

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

@@ -86,6 +86,10 @@ import com.l2jserver.gameserver.datatables.RecipeData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTable.FrequentSkill;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.handler.ItemHandler;
 import com.l2jserver.gameserver.idfactory.IdFactory;
@@ -108,7 +112,6 @@ import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
 import com.l2jserver.gameserver.model.BlockList;
-import com.l2jserver.gameserver.model.CategoryType;
 import com.l2jserver.gameserver.model.L2AccessLevel;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
@@ -131,13 +134,11 @@ import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.Macro;
 import com.l2jserver.gameserver.model.MacroList;
-import com.l2jserver.gameserver.model.MountType;
 import com.l2jserver.gameserver.model.PartyMatchRoom;
 import com.l2jserver.gameserver.model.PartyMatchRoomList;
 import com.l2jserver.gameserver.model.PartyMatchWaitingList;
 import com.l2jserver.gameserver.model.PcCondOverride;
 import com.l2jserver.gameserver.model.ShortCuts;
-import com.l2jserver.gameserver.model.ShotType;
 import com.l2jserver.gameserver.model.TeleportBookmark;
 import com.l2jserver.gameserver.model.TeleportWhereType;
 import com.l2jserver.gameserver.model.TerritoryWard;

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

@@ -40,6 +40,7 @@ import com.l2jserver.gameserver.datatables.PetDataTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SummonEffectsTable;
 import com.l2jserver.gameserver.datatables.SummonEffectsTable.SummonEffect;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.handler.ItemHandler;
 import com.l2jserver.gameserver.idfactory.IdFactory;

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.util.Evolve;

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -24,6 +24,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.MonsterRace;
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.knownlist.RaceManagerKnownList;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.model.L2Spawn;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 public class L2RiftInvaderInstance extends L2MonsterInstance

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

@@ -22,6 +22,7 @@ import java.util.concurrent.Future;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -25,6 +25,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.DoorTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Npc;

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

@@ -35,6 +35,7 @@ import com.l2jserver.gameserver.datatables.CharSummonTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SummonEffectsTable;
 import com.l2jserver.gameserver.datatables.SummonEffectsTable.SummonEffect;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 

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

@@ -26,6 +26,7 @@ import javolution.text.TextBuilder;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

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

@@ -19,6 +19,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.knownlist.StaticObjectKnownList;

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

@@ -28,6 +28,7 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

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

@@ -24,6 +24,7 @@ import java.util.StringTokenizer;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
 import com.l2jserver.gameserver.instancemanager.TownManager;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

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

@@ -18,6 +18,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 
 public class L2TrainerInstance extends L2NpcInstance

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

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.TvTEvent;

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

@@ -29,6 +29,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.ClassListData;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;