BETA: Updating castle chamberlains

* Moved from Core to DP
* Added castle doors and traps upgrades

Reviewed by: Adry_85, !UnAfraid

'''NOTE''': Require Core/DP Update!

L2J_Server_BETA/dist/game/config/Feature.properties

@@ -20,42 +20,53 @@ SiegeHourList = 16,20
 # Teleport Function price
 # Price = 7 days
 CastleTeleportFunctionFeeRatio = 604800000
-CastleTeleportFunctionFeeLvl1 = 7000
-CastleTeleportFunctionFeeLvl2 = 14000
+CastleTeleportFunctionFeeLvl1 = 1000
+CastleTeleportFunctionFeeLvl2 = 10000
 
 # Support magic buff price
-# Price = 1 day
-CastleSupportFunctionFeeRatio = 86400000
-CastleSupportFeeLvl1 = 7000
-CastleSupportFeeLvl2 = 21000
-CastleSupportFeeLvl3 = 37000
-CastleSupportFeeLvl4 = 52000
+# Price = 7 day
+CastleSupportFunctionFeeRatio = 604800000
+CastleSupportFeeLvl1 = 49000
+CastleSupportFeeLvl2 = 120000
 
 # MP Regeneration price
-# Price = 1 day
-CastleMpRegenerationFunctionFeeRatio = 86400000
-CastleMpRegenerationFeeLvl1 = 2000
-CastleMpRegenerationFeeLvl2 = 6500
-CastleMpRegenerationFeeLvl3 = 13750
-CastleMpRegenerationFeeLvl4 = 20000
+# Price = 7 day
+CastleMpRegenerationFunctionFeeRatio = 604800000
+CastleMpRegenerationFeeLvl1 = 45000
+CastleMpRegenerationFeeLvl2 = 65000
 
 # Hp Regeneration price
-# Price = 1 day
-CastleHpRegenerationFunctionFeeRatio = 86400000
-CastleHpRegenerationFeeLvl1 = 1000
-CastleHpRegenerationFeeLvl2 = 1500
-CastleHpRegenerationFeeLvl3 = 2250
-CastleHpRegenerationFeeLvl4 = 3270
-CastleHpRegenerationFeeLvl5 = 5166
+# Price = 7 day
+CastleHpRegenerationFunctionFeeRatio = 604800000
+CastleHpRegenerationFeeLvl1 = 12000
+CastleHpRegenerationFeeLvl2 = 20000
 
 # Exp Regeneration price
-# Price = 1 day
-CastleExpRegenerationFunctionFeeRatio = 86400000
-CastleExpRegenerationFeeLvl1 = 9000
-CastleExpRegenerationFeeLvl2 = 15000
-CastleExpRegenerationFeeLvl3 = 21000
-CastleExpRegenerationFeeLvl4 = 30000
-
+# Price = 7 day
+CastleExpRegenerationFunctionFeeRatio = 604800000
+CastleExpRegenerationFeeLvl1 = 63000
+CastleExpRegenerationFeeLvl2 = 70000
+
+# Outer Door upgrade price
+OuterDoorUpgradePriceLvl2 = 3000000
+OuterDoorUpgradePriceLvl3 = 4000000
+OuterDoorUpgradePriceLvl5 = 5000000
+
+# Inner Door upgrade price
+InnerDoorUpgradePriceLvl2 = 750000
+InnerDoorUpgradePriceLvl3 = 900000
+InnerDoorUpgradePriceLvl5 = 1000000
+
+# Wall upgrade price
+WallUpgradePriceLvl2 = 1600000
+WallUpgradePriceLvl3 = 1800000
+WallUpgradePriceLvl5 = 2000000
+
+# Trap upgrade price
+TrapUpgradePriceLvl1 = 3000000
+TrapUpgradePriceLvl2 = 4000000
+TrapUpgradePriceLvl3 = 5000000
+TrapUpgradePriceLvl4 = 6000000
 
 # ---------------------------------------------------------------------------
 # Clan Hall

L2J_Server_BETA/dist/game/config/Siege.properties

@@ -48,101 +48,83 @@ BloodAllianceReward = 0
 # N - number
 # x,y,z - coords
 # npc_id - id of template
-# hp - maximum health
 #
-# Flame Towers syntax:  NameFlameTowerN=x,y,z,npc_id,hp
+# Flame Towers syntax:  NameFlameTowerN=x,y,z,npc_id,hp,zoneIds
 # Name - castle name
 # N - number
 # x,y,z - coords
 # npc_id - id of template
-# hp - maximum health
+# zoneIds - ids of zones related with tower
 #
-# Artefacts syntax:  NameArtefactN=x,y,z,heading,npc_id
-# Name - castle name
-# N - number
-# x,y,z - coords
-# heading
-# npc_id - id of template
 
 # Gludio
-GludioArtefact1=-18113,107972,-2480,16384,35063
-GludioFlameTower1=-18154,107591,-2560,13004,10000
-GludioFlameTower2=-19329,108154,-2384,13004,10000
-GludioControlTower1=-18325,112811,-2377,13002,10000
-GludioControlTower2=-18048,107098,-2378,13002,10000
-GludioControlTower3=-18113,108597,-2343,13002,10000
+GludioFlameTower1=-18154,107591,-2560,13004,70017,70019
+GludioFlameTower2=-19329,108154,-2384,13004,70018,70020
+GludioControlTower1=-18325,112811,-2377,13002
+GludioControlTower2=-18048,107098,-2378,13002
+GludioControlTower3=-18113,108597,-2343,13002
 GludioMaxMercenaries = 100
 
 # Giran
-GiranArtefact1=117950,145096,-2547,32768,35147
-GiranFlameTower1=118331,145055,-2627,13004,10000
-GiranFlameTower2=117768,143880,-2451,13004,10000
-GiranControlTower1=113115,144829,-2446,13002,10000
-GiranControlTower2=118828,145106,-2447,13002,10000
-GiranControlTower3=117329,145041,-2412,13002,10000
+GiranFlameTower1=118331,145055,-2627,13004,70025,70027
+GiranFlameTower2=117768,143880,-2451,13004,70026,70028
+GiranControlTower1=113115,144829,-2446,13002
+GiranControlTower2=118828,145106,-2447,13002
+GiranControlTower3=117329,145041,-2412,13002
 GiranMaxMercenaries = 200
 
 # Dion
-DionArtefact1=22073,161778,-2674,49152,35105
-DionFlameTower1=22114,162159,-2754,13004,10000
-DionFlameTower2=23289,161596,-2578,13004,10000
-DionControlTower1=22285,156939,-2571,13002,10000
-DionControlTower2=22008,162652,-2572,13002,10000
-DionControlTower3=22073,161153,-2537,13002,10000
+DionFlameTower1=22114,162159,-2754,13004,70021,70023
+DionFlameTower2=23289,161596,-2578,13004,70022,70024
+DionControlTower1=22285,156939,-2571,13002
+DionControlTower2=22008,162652,-2572,13002
+DionControlTower3=22073,161153,-2537,13002
 DionMaxMercenaries = 150
 
 # Oren
-OrenArtefact1=8402,37191,-2274,32768,35189
-OrenFlameTower1=84407,37150,-2354,13004,10000
-OrenFlameTower2=83844,35975,-2178,13004,10000
-OrenControlTower1=79193,36977,-2167,13002,10000
-OrenControlTower2=84906,37254,-2168,13002,10000
-OrenControlTower3=83407,37189,-2133,13002,10000
+OrenFlameTower1=84407,37150,-2354,13004,70029,70031
+OrenFlameTower2=83844,35975,-2178,13004,70030,70032
+OrenControlTower1=79193,36977,-2167,13002
+OrenControlTower2=84906,37254,-2168,13002
+OrenControlTower3=83407,37189,-2133,13002
 OrenMaxMercenaries = 300
 
 # Aden
-AdenArtefact1=147463,1529,-373,16384,35233
-AdenFlameTower1=149976,1583,-450,13004,10000
-AdenFlameTower2=144955,1603,-450,13004,10000
-AdenControlTower1=148774,2351,-389,13002,10000
-AdenControlTower2=147456,5724,158,13002,10000
-AdenControlTower3=146137,2352,-389,13002,10000
+AdenFlameTower1=149976,1583,-450,13004,70008,70016,70007,70015,70006,70014,70005,70013
+AdenFlameTower2=144955,1603,-450,13004,70004,70012,70003,70011,70002,70010,70001,70009
+AdenControlTower1=148774,2351,-389,13002
+AdenControlTower2=147456,5724,158,13002
+AdenControlTower3=146137,2352,-389,13002
 AdenMaxMercenaries = 400
 
 # Innadril
-InnadrilArtefact1=116024,250557,-770,-16384,35279
-InnadrilFlameTower1=116065,250938,-850,13004,10000
-InnadrilFlameTower2=117240,250375,-674,13004,10000
-InnadrilControlTower1=116236,245718,-667,13002,10000
-InnadrilControlTower2=115959,251431,-667,13002,10000
-InnadrilControlTower3=116024,249932,-633,13002,10000
+InnadrilFlameTower1=116065,250938,-850,13004,70033,70035
+InnadrilFlameTower2=117240,250375,-674,13004,70034,70036
+InnadrilControlTower1=116236,245718,-667,13002
+InnadrilControlTower2=115959,251431,-667,13002
+InnadrilControlTower3=116024,249932,-633,13002
 InnadrilMaxMercenaries = 400
 
 # Goddard
-GoddardArtefact1=146601,-50441,-1505,32768,35322
-GoddardArtefact2=148353,-50457,-1505,0,35323
-GoddardFlameTower1=148144,-46992,-1609,13004,10000
-GoddardFlameTower2=146784,-46992,-1609,13004,10000
-GoddardControlTower1=144672,-48832,-1742,13002,10000
-GoddardControlTower2=150240,-48832,-1742,13002,10000
-GoddardControlTower3=147456,-49200,-1619,13002,10000
+GoddardFlameTower1=148144,-46992,-1609,13004,70037,70039
+GoddardFlameTower2=146784,-46992,-1609,13004,70038,70040
+GoddardControlTower1=144672,-48832,-1742,13002
+GoddardControlTower2=150240,-48832,-1742,13002
+GoddardControlTower3=147456,-49200,-1619,13002
 GoddardMaxMercenaries = 400
 
 # Rune
-RuneArtefact1=9132,-49151,1095,0,35469
-RuneFlameTower1=12864,-47440,-1087,13004,10000
-RuneFlameTower2=12225,-50767,1248,13004,10000
-RuneControlTower1=16565,-50318,-641,13002,10000
-RuneControlTower2=16559,-48000,-641,13002,10000
-RuneControlTower3=10775,-48481,83,13002,10000
+RuneFlameTower1=12864,-47440,-1087,13004,70041,70043
+RuneFlameTower2=12225,-50767,1248,13004,70042,70044
+RuneControlTower1=16565,-50318,-641,13002
+RuneControlTower2=16559,-48000,-641,13002
+RuneControlTower3=10775,-48481,83,13002
 RuneMaxMercenaries = 400
 
 # Schuttgart
-SchuttgartArtefact1=76674,-154521,228,32768,35515
-SchuttgartArtefact2=78440,-154521,228,0,35514
-SchuttgartFlameTower1=78233,-151037,120,13004,10000
-SchuttgartFlameTower2=76872,-151043,120,13004,10000
-SchuttgartControlTower1=80334,-152898,-8,13002,10000
-SchuttgartControlTower2=74775,-152928,-8,13002,10000
-SchuttgartControlTower3=77547,-153246,112,13002,10000
+SchuttgartFlameTower1=76872,-151043,120,13004,70045,70047
+SchuttgartFlameTower2=78233,-151037,120,13004,70046,70048
+SchuttgartControlTower1=80334,-152898,-8,13002
+SchuttgartControlTower2=74775,-152928,-8,13002
+SchuttgartControlTower3=77547,-153246,112,13002
 SchuttgartMaxMercenaries = 400

L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -322,27 +322,32 @@ public final class Config
 	public static long CS_MPREG_FEE_RATIO;
 	public static int CS_MPREG1_FEE;
 	public static int CS_MPREG2_FEE;
-	public static int CS_MPREG3_FEE;
-	public static int CS_MPREG4_FEE;
 	public static long CS_HPREG_FEE_RATIO;
 	public static int CS_HPREG1_FEE;
 	public static int CS_HPREG2_FEE;
-	public static int CS_HPREG3_FEE;
-	public static int CS_HPREG4_FEE;
-	public static int CS_HPREG5_FEE;
 	public static long CS_EXPREG_FEE_RATIO;
 	public static int CS_EXPREG1_FEE;
 	public static int CS_EXPREG2_FEE;
-	public static int CS_EXPREG3_FEE;
-	public static int CS_EXPREG4_FEE;
 	public static long CS_SUPPORT_FEE_RATIO;
 	public static int CS_SUPPORT1_FEE;
 	public static int CS_SUPPORT2_FEE;
-	public static int CS_SUPPORT3_FEE;
-	public static int CS_SUPPORT4_FEE;
 	public static List<String> CL_SET_SIEGE_TIME_LIST;
 	public static List<Integer> SIEGE_HOUR_LIST_MORNING;
 	public static List<Integer> SIEGE_HOUR_LIST_AFTERNOON;
+	public static int OUTER_DOOR_UPGRADE_PRICE2;
+	public static int OUTER_DOOR_UPGRADE_PRICE3;
+	public static int OUTER_DOOR_UPGRADE_PRICE5;
+	public static int INNER_DOOR_UPGRADE_PRICE2;
+	public static int INNER_DOOR_UPGRADE_PRICE3;
+	public static int INNER_DOOR_UPGRADE_PRICE5;
+	public static int WALL_UPGRADE_PRICE2;
+	public static int WALL_UPGRADE_PRICE3;
+	public static int WALL_UPGRADE_PRICE5;
+	public static int TRAP_UPGRADE_PRICE1;
+	public static int TRAP_UPGRADE_PRICE2;
+	public static int TRAP_UPGRADE_PRICE3;
+	public static int TRAP_UPGRADE_PRICE4;
+	
 	// --------------------------------------------------
 	// Fortress Settings
 	// --------------------------------------------------
@@ -1344,29 +1349,34 @@ public final class Config
 				}
 			}
 			CS_TELE_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleTeleportFunctionFeeRatio", "604800000"));
-			CS_TELE1_FEE = Integer.parseInt(Feature.getProperty("CastleTeleportFunctionFeeLvl1", "7000"));
-			CS_TELE2_FEE = Integer.parseInt(Feature.getProperty("CastleTeleportFunctionFeeLvl2", "14000"));
-			CS_SUPPORT_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleSupportFunctionFeeRatio", "86400000"));
-			CS_SUPPORT1_FEE = Integer.parseInt(Feature.getProperty("CastleSupportFeeLvl1", "7000"));
-			CS_SUPPORT2_FEE = Integer.parseInt(Feature.getProperty("CastleSupportFeeLvl2", "21000"));
-			CS_SUPPORT3_FEE = Integer.parseInt(Feature.getProperty("CastleSupportFeeLvl3", "37000"));
-			CS_SUPPORT4_FEE = Integer.parseInt(Feature.getProperty("CastleSupportFeeLvl4", "52000"));
-			CS_MPREG_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleMpRegenerationFunctionFeeRatio", "86400000"));
-			CS_MPREG1_FEE = Integer.parseInt(Feature.getProperty("CastleMpRegenerationFeeLvl1", "2000"));
-			CS_MPREG2_FEE = Integer.parseInt(Feature.getProperty("CastleMpRegenerationFeeLvl2", "6500"));
-			CS_MPREG3_FEE = Integer.parseInt(Feature.getProperty("CastleMpRegenerationFeeLvl3", "13750"));
-			CS_MPREG4_FEE = Integer.parseInt(Feature.getProperty("CastleMpRegenerationFeeLvl4", "20000"));
-			CS_HPREG_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleHpRegenerationFunctionFeeRatio", "86400000"));
-			CS_HPREG1_FEE = Integer.parseInt(Feature.getProperty("CastleHpRegenerationFeeLvl1", "1000"));
-			CS_HPREG2_FEE = Integer.parseInt(Feature.getProperty("CastleHpRegenerationFeeLvl2", "1500"));
-			CS_HPREG3_FEE = Integer.parseInt(Feature.getProperty("CastleHpRegenerationFeeLvl3", "2250"));
-			CS_HPREG4_FEE = Integer.parseInt(Feature.getProperty("CastleHpRegenerationFeeLvl4", "3270"));
-			CS_HPREG5_FEE = Integer.parseInt(Feature.getProperty("CastleHpRegenerationFeeLvl5", "5166"));
-			CS_EXPREG_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleExpRegenerationFunctionFeeRatio", "86400000"));
-			CS_EXPREG1_FEE = Integer.parseInt(Feature.getProperty("CastleExpRegenerationFeeLvl1", "9000"));
-			CS_EXPREG2_FEE = Integer.parseInt(Feature.getProperty("CastleExpRegenerationFeeLvl2", "15000"));
-			CS_EXPREG3_FEE = Integer.parseInt(Feature.getProperty("CastleExpRegenerationFeeLvl3", "21000"));
-			CS_EXPREG4_FEE = Integer.parseInt(Feature.getProperty("CastleExpRegenerationFeeLvl4", "30000"));
+			CS_TELE1_FEE = Integer.parseInt(Feature.getProperty("CastleTeleportFunctionFeeLvl1", "1000"));
+			CS_TELE2_FEE = Integer.parseInt(Feature.getProperty("CastleTeleportFunctionFeeLvl2", "10000"));
+			CS_SUPPORT_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleSupportFunctionFeeRatio", "604800000"));
+			CS_SUPPORT1_FEE = Integer.parseInt(Feature.getProperty("CastleSupportFeeLvl1", "49000"));
+			CS_SUPPORT2_FEE = Integer.parseInt(Feature.getProperty("CastleSupportFeeLvl2", "120000"));
+			CS_MPREG_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleMpRegenerationFunctionFeeRatio", "604800000"));
+			CS_MPREG1_FEE = Integer.parseInt(Feature.getProperty("CastleMpRegenerationFeeLvl1", "45000"));
+			CS_MPREG2_FEE = Integer.parseInt(Feature.getProperty("CastleMpRegenerationFeeLvl2", "65000"));
+			CS_HPREG_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleHpRegenerationFunctionFeeRatio", "604800000"));
+			CS_HPREG1_FEE = Integer.parseInt(Feature.getProperty("CastleHpRegenerationFeeLvl1", "12000"));
+			CS_HPREG2_FEE = Integer.parseInt(Feature.getProperty("CastleHpRegenerationFeeLvl2", "20000"));
+			CS_EXPREG_FEE_RATIO = Long.parseLong(Feature.getProperty("CastleExpRegenerationFunctionFeeRatio", "604800000"));
+			CS_EXPREG1_FEE = Integer.parseInt(Feature.getProperty("CastleExpRegenerationFeeLvl1", "63000"));
+			CS_EXPREG2_FEE = Integer.parseInt(Feature.getProperty("CastleExpRegenerationFeeLvl2", "70000"));
+			
+			OUTER_DOOR_UPGRADE_PRICE2 = Integer.parseInt(Feature.getProperty("OuterDoorUpgradePriceLvl2", "3000000"));
+			OUTER_DOOR_UPGRADE_PRICE3 = Integer.parseInt(Feature.getProperty("OuterDoorUpgradePriceLvl3", "4000000"));
+			OUTER_DOOR_UPGRADE_PRICE5 = Integer.parseInt(Feature.getProperty("OuterDoorUpgradePriceLvl5", "5000000"));
+			INNER_DOOR_UPGRADE_PRICE2 = Integer.parseInt(Feature.getProperty("InnerDoorUpgradePriceLvl2", "750000"));
+			INNER_DOOR_UPGRADE_PRICE3 = Integer.parseInt(Feature.getProperty("InnerDoorUpgradePriceLvl3", "900000"));
+			INNER_DOOR_UPGRADE_PRICE5 = Integer.parseInt(Feature.getProperty("InnerDoorUpgradePriceLvl5", "1000000"));
+			WALL_UPGRADE_PRICE2 = Integer.parseInt(Feature.getProperty("WallUpgradePriceLvl2", "1600000"));
+			WALL_UPGRADE_PRICE3 = Integer.parseInt(Feature.getProperty("WallUpgradePriceLvl3", "1800000"));
+			WALL_UPGRADE_PRICE5 = Integer.parseInt(Feature.getProperty("WallUpgradePriceLvl5", "2000000"));
+			TRAP_UPGRADE_PRICE1 = Integer.parseInt(Feature.getProperty("TrapUpgradePriceLvl1", "3000000"));
+			TRAP_UPGRADE_PRICE2 = Integer.parseInt(Feature.getProperty("TrapUpgradePriceLvl2", "4000000"));
+			TRAP_UPGRADE_PRICE3 = Integer.parseInt(Feature.getProperty("TrapUpgradePriceLvl3", "5000000"));
+			TRAP_UPGRADE_PRICE4 = Integer.parseInt(Feature.getProperty("TrapUpgradePriceLvl4", "6000000"));
 			
 			FS_TELE_FEE_RATIO = Long.parseLong(Feature.getProperty("FortressTeleportFunctionFeeRatio", "604800000"));
 			FS_TELE1_FEE = Integer.parseInt(Feature.getProperty("FortressTeleportFunctionFeeLvl1", "1000"));

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

@@ -18,14 +18,13 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Properties;
+import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -38,26 +37,24 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TowerSpawn;
 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.entity.Siege;
 import com.l2jserver.gameserver.model.skills.L2Skill;
-
-import gnu.trove.map.hash.TIntObjectHashMap;
+import com.l2jserver.util.L2Properties;
 
 public class SiegeManager
 {
 	private static final Logger _log = Logger.getLogger(SiegeManager.class.getName());
 	
+	private final Map<Integer, List<TowerSpawn>> _controlTowers = new HashMap<>();
+	private final Map<Integer, List<TowerSpawn>> _flameTowers = new HashMap<>();
+	
 	private int _attackerMaxClans = 500; // Max number of clans
 	private int _attackerRespawnDelay = 0; // Time in ms. Changeable in siege.config
 	private int _defenderMaxClans = 500; // Max number of clans
-	
-	private TIntObjectHashMap<FastList<SiegeSpawn>> _artefactSpawnList;
-	private TIntObjectHashMap<FastList<SiegeSpawn>> _controlTowerSpawnList;
-	private TIntObjectHashMap<FastList<SiegeSpawn>> _flameTowerSpawnList;
-	
 	private int _flagMaxCount = 1; // Changeable in siege.config
 	private int _siegeClanMinLevel = 5; // Changeable in siege.config
 	private int _siegeLength = 120; // Time in minute. Changeable in siege.config
@@ -165,55 +162,43 @@ public class SiegeManager
 	
 	private final void load()
 	{
-		Properties siegeSettings = new Properties();
-		final File file = new File(Config.SIEGE_CONFIGURATION_FILE);
-		try (InputStream is = new FileInputStream(file))
+		final L2Properties siegeSettings = new L2Properties();
+		try
 		{
-			siegeSettings.load(is);
+			siegeSettings.load(Config.SIEGE_CONFIGURATION_FILE);
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error while loading Territory War Manager settings!", e);
+			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error while loading Siege settings!", e);
 		}
 		
 		// Siege setting
-		_attackerMaxClans = Integer.decode(siegeSettings.getProperty("AttackerMaxClans", "500"));
-		_attackerRespawnDelay = Integer.decode(siegeSettings.getProperty("AttackerRespawn", "0"));
-		_defenderMaxClans = Integer.decode(siegeSettings.getProperty("DefenderMaxClans", "500"));
-		_flagMaxCount = Integer.decode(siegeSettings.getProperty("MaxFlags", "1"));
-		_siegeClanMinLevel = Integer.decode(siegeSettings.getProperty("SiegeClanMinLevel", "5"));
-		_siegeLength = Integer.decode(siegeSettings.getProperty("SiegeLength", "120"));
-		_bloodAllianceReward = Integer.decode(siegeSettings.getProperty("BloodAllianceReward", "0"));
-		
-		// Siege spawns settings
-		_controlTowerSpawnList = new TIntObjectHashMap<>();
-		_artefactSpawnList = new TIntObjectHashMap<>();
-		_flameTowerSpawnList = new TIntObjectHashMap<>();
+		_attackerMaxClans = Integer.parseInt(siegeSettings.getProperty("AttackerMaxClans", "500"));
+		_attackerRespawnDelay = Integer.parseInt(siegeSettings.getProperty("AttackerRespawn", "0"));
+		_defenderMaxClans = Integer.parseInt(siegeSettings.getProperty("DefenderMaxClans", "500"));
+		_flagMaxCount = Integer.parseInt(siegeSettings.getProperty("MaxFlags", "1"));
+		_siegeClanMinLevel = Integer.parseInt(siegeSettings.getProperty("SiegeClanMinLevel", "5"));
+		_siegeLength = Integer.parseInt(siegeSettings.getProperty("SiegeLength", "120"));
+		_bloodAllianceReward = Integer.parseInt(siegeSettings.getProperty("BloodAllianceReward", "0"));
 		
 		for (Castle castle : CastleManager.getInstance().getCastles())
 		{
-			FastList<SiegeSpawn> _controlTowersSpawns = new FastList<>();
-			
+			final List<TowerSpawn> controlTowers = new ArrayList<>();
 			for (int i = 1; i < 0xFF; i++)
 			{
-				String _spawnParams = siegeSettings.getProperty(castle.getName() + "ControlTower" + i, "");
-				
-				if (_spawnParams.isEmpty())
+				if (!siegeSettings.containsKey(castle.getName() + "ControlTower" + i))
 				{
 					break;
 				}
-				
-				StringTokenizer st = new StringTokenizer(_spawnParams.trim(), ",");
-				
+				final StringTokenizer st = new StringTokenizer(siegeSettings.getProperty(castle.getName() + "ControlTower" + i).trim(), ",");
 				try
 				{
-					int x = Integer.parseInt(st.nextToken());
-					int y = Integer.parseInt(st.nextToken());
-					int z = Integer.parseInt(st.nextToken());
-					int npc_id = Integer.parseInt(st.nextToken());
-					int hp = Integer.parseInt(st.nextToken());
+					final int x = Integer.parseInt(st.nextToken());
+					final int y = Integer.parseInt(st.nextToken());
+					final int z = Integer.parseInt(st.nextToken());
+					final int npcId = Integer.parseInt(st.nextToken());
 					
-					_controlTowersSpawns.add(new SiegeSpawn(castle.getCastleId(), x, y, z, 0, npc_id, hp));
+					controlTowers.add(new TowerSpawn(npcId, new Location(x, y, z)));
 				}
 				catch (Exception e)
 				{
@@ -221,85 +206,53 @@ public class SiegeManager
 				}
 			}
 			
-			FastList<SiegeSpawn> _flameTowersSpawns = new FastList<>();
-			
+			final List<TowerSpawn> flameTowers = new ArrayList<>();
 			for (int i = 1; i < 0xFF; i++)
 			{
-				String _spawnParams = siegeSettings.getProperty(castle.getName() + "FlameTower" + i, "");
-				
-				if (_spawnParams.isEmpty())
+				if (!siegeSettings.containsKey(castle.getName() + "FlameTower" + i))
 				{
 					break;
 				}
-				
-				StringTokenizer st = new StringTokenizer(_spawnParams.trim(), ",");
-				
+				final StringTokenizer st = new StringTokenizer(siegeSettings.getProperty(castle.getName() + "FlameTower" + i).trim(), ",");
 				try
 				{
-					int x = Integer.parseInt(st.nextToken());
-					int y = Integer.parseInt(st.nextToken());
-					int z = Integer.parseInt(st.nextToken());
-					int npc_id = Integer.parseInt(st.nextToken());
-					int hp = Integer.parseInt(st.nextToken());
+					final int x = Integer.parseInt(st.nextToken());
+					final int y = Integer.parseInt(st.nextToken());
+					final int z = Integer.parseInt(st.nextToken());
+					final int npcId = Integer.parseInt(st.nextToken());
+					final List<Integer> zoneList = new ArrayList<>();
 					
-					_flameTowersSpawns.add(new SiegeSpawn(castle.getCastleId(), x, y, z, 0, npc_id, hp));
-				}
-				catch (Exception e)
-				{
-					_log.warning(getClass().getSimpleName() + ": Error while loading artefact(s) for " + castle.getName() + " castle.");
-				}
-			}
-			
-			FastList<SiegeSpawn> _artefactSpawns = new FastList<>();
-			
-			for (int i = 1; i < 0xFF; i++)
-			{
-				String _spawnParams = siegeSettings.getProperty(castle.getName() + "Artefact" + i, "");
-				
-				if (_spawnParams.isEmpty())
-				{
-					break;
-				}
-				
-				StringTokenizer st = new StringTokenizer(_spawnParams.trim(), ",");
-				
-				try
-				{
-					int x = Integer.parseInt(st.nextToken());
-					int y = Integer.parseInt(st.nextToken());
-					int z = Integer.parseInt(st.nextToken());
-					int heading = Integer.parseInt(st.nextToken());
-					int npc_id = Integer.parseInt(st.nextToken());
+					while (st.hasMoreTokens())
+					{
+						zoneList.add(Integer.parseInt(st.nextToken()));
+					}
 					
-					_artefactSpawns.add(new SiegeSpawn(castle.getCastleId(), x, y, z, heading, npc_id));
+					flameTowers.add(new TowerSpawn(npcId, new Location(x, y, z), zoneList));
 				}
 				catch (Exception e)
 				{
-					_log.warning(getClass().getSimpleName() + ": Error while loading artefact(s) for " + castle.getName() + " castle.");
+					_log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle.");
 				}
 			}
-			
+			_controlTowers.put(castle.getCastleId(), controlTowers);
+			_flameTowers.put(castle.getCastleId(), flameTowers);
 			MercTicketManager.MERCS_MAX_PER_CASTLE[castle.getCastleId() - 1] = Integer.parseInt(siegeSettings.getProperty(castle.getName() + "MaxMercenaries", Integer.toString(MercTicketManager.MERCS_MAX_PER_CASTLE[castle.getCastleId() - 1])).trim());
 			
-			_controlTowerSpawnList.put(castle.getCastleId(), _controlTowersSpawns);
-			_artefactSpawnList.put(castle.getCastleId(), _artefactSpawns);
-			_flameTowerSpawnList.put(castle.getCastleId(), _flameTowersSpawns);
+			if (castle.getOwnerId() != 0)
+			{
+				loadTrapUpgrade(castle.getCastleId());
+			}
 		}
 	}
 	
-	public final FastList<SiegeSpawn> getArtefactSpawnList(int _castleId)
+	public final List<TowerSpawn> getControlTowers(int castleId)
 	{
-		return _artefactSpawnList.get(_castleId);
+		return _controlTowers.get(castleId);
 	}
 	
-	public final FastList<SiegeSpawn> getControlTowerSpawnList(int _castleId)
+	public final List<TowerSpawn> getFlameTowers(int castleId)
 	{
-		return _controlTowerSpawnList.get(_castleId);
-	}
-	
-	public final FastList<SiegeSpawn> getFlameTowerSpawnList(int _castleId)
-	{
-		return _flameTowerSpawnList.get(_castleId);
+		return _flameTowers.get(castleId);
 	}
 	
 	public final int getAttackerMaxClans()
@@ -364,54 +317,23 @@ public class SiegeManager
 		return sieges;
 	}
 	
-	public static class SiegeSpawn
+	private final void loadTrapUpgrade(int castleId)
 	{
-		Location _location;
-		private final int _npcId;
-		private final int _heading;
-		private final int _castleId;
-		private int _hp;
-		
-		public SiegeSpawn(int castle_id, int x, int y, int z, int heading, int npc_id)
-		{
-			_castleId = castle_id;
-			_location = new Location(x, y, z, heading);
-			_heading = heading;
-			_npcId = npc_id;
-		}
-		
-		public SiegeSpawn(int castle_id, int x, int y, int z, int heading, int npc_id, int hp)
-		{
-			_castleId = castle_id;
-			_location = new Location(x, y, z, heading);
-			_heading = heading;
-			_npcId = npc_id;
-			_hp = hp;
-		}
-		
-		public int getCastleId()
-		{
-			return _castleId;
-		}
-		
-		public int getNpcId()
-		{
-			return _npcId;
-		}
-		
-		public int getHeading()
-		{
-			return _heading;
-		}
-		
-		public int getHp()
+		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement("SELECT * FROM castle_trapupgrade WHERE castleId=?"))
 		{
-			return _hp;
+			ps.setInt(1, castleId);
+			try (ResultSet rs = ps.executeQuery())
+			{
+				while (rs.next())
+				{
+					_flameTowers.get(castleId).get(rs.getInt("towerIndex")).setUpgradeLevel(rs.getInt("level"));
+				}
+			}
 		}
-		
-		public Location getLocation()
+		catch (Exception e)
 		{
-			return _location;
+			_log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e);
 		}
 	}
 	
@@ -424,4 +346,4 @@ public class SiegeManager
 	{
 		protected static final SiegeManager _instance = new SiegeManager();
 	}
-}
+}

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

@@ -134,7 +134,6 @@ public abstract class L2Object
 		L2FortBallistaInstance(L2Npc),
 		L2FortCommanderInstance(L2DefenderInstance),
 		// Castle NPCs
-		L2CastleChamberlainInstance(L2MerchantInstance),
 		L2CastleMagicianInstance(L2NpcInstance),
 		L2MercManagerInstance(L2MerchantInstance),
 		// Fort NPCs

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

@@ -0,0 +1,70 @@
+/*
+ * 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.model;
+
+import java.util.List;
+
+/**
+ * @author malyelfik
+ */
+public class TowerSpawn
+{
+	private final int _npcId;
+	private final Location _location;
+	private List<Integer> _zoneList = null;
+	private int _upgradeLevel = 0;
+	
+	public TowerSpawn(int npcId, Location location)
+	{
+		_location = location;
+		_npcId = npcId;
+	}
+	
+	public TowerSpawn(int npcId, Location location, List<Integer> zoneList)
+	{
+		_location = location;
+		_npcId = npcId;
+		_zoneList = zoneList;
+	}
+	
+	public int getNpcId()
+	{
+		return _npcId;
+	}
+	
+	public Location getLocation()
+	{
+		return _location;
+	}
+	
+	public List<Integer> getZoneList()
+	{
+		return _zoneList;
+	}
+	
+	public void setUpgradeLevel(int level)
+	{
+		_upgradeLevel = level;
+	}
+	
+	public int getUpgradeLevel()
+	{
+		return _upgradeLevel;
+	}
+}

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

@@ -1,1526 +0,0 @@
-/*
- * 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.model.actor.instance;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.SevenSigns;
-import com.l2jserver.gameserver.datatables.ClanTable;
-import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.datatables.TeleportLocationTable;
-import com.l2jserver.gameserver.model.L2Clan;
-import com.l2jserver.gameserver.model.L2TeleportLocation;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.entity.Castle;
-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.skills.L2SkillType;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.ExShowDominionRegistry;
-import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.StringUtil;
-
-/**
- * Castle Chamberlains implementation used for:
- * <ul>
- * <li>Tax rate control regional</li>
- * <li>Manor system control</li>
- * <li>Castle treasure control</li>
- * <li>Manor's agreement exchange</li>
- * </ul>
- */
-public class L2CastleChamberlainInstance extends L2MerchantInstance
-{
-	protected static final int COND_ALL_FALSE = 0;
-	protected static final int COND_BUSY_BECAUSE_OF_SIEGE = 1;
-	protected static final int COND_OWNER = 2;
-	private int _preDay;
-	private int _preHour;
-	
-	public L2CastleChamberlainInstance(int objectId, L2NpcTemplate template)
-	{
-		super(objectId, template);
-		setInstanceType(InstanceType.L2CastleChamberlainInstance);
-	}
-	
-	private void sendHtmlMessage(L2PcInstance player, NpcHtmlMessage html)
-	{
-		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
-		player.sendPacket(html);
-	}
-	
-	@Override
-	public void onBypassFeedback(L2PcInstance player, String command)
-	{
-		// BypassValidation Exploit plug.
-		if (player.getLastFolkNPC().getObjectId() != getObjectId())
-		{
-			return;
-		}
-		
-		SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
-		int condition = validateCondition(player);
-		if (condition <= COND_ALL_FALSE)
-		{
-			return;
-		}
-		else if (condition == COND_BUSY_BECAUSE_OF_SIEGE)
-		{
-			return;
-		}
-		else if (condition == COND_OWNER)
-		{
-			StringTokenizer st = new StringTokenizer(command, " ");
-			String actualCommand = st.nextToken(); // Get actual command
-			
-			String val = "";
-			if (st.hasMoreTokens())
-			{
-				val = st.nextToken();
-			}
-			
-			if (actualCommand.equalsIgnoreCase("banish_foreigner"))
-			{
-				if (!validatePrivileges(player, L2Clan.CP_CS_DISMISS))
-				{
-					return;
-				}
-				if (siegeBlocksFunction(player))
-				{
-					return;
-				}
-				getCastle().banishForeigners(); // Move non-clan members off castle area
-				NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-banishafter.htm");
-				html.replace("%objectId%", String.valueOf(getObjectId()));
-				player.sendPacket(html);
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("banish_foreigner_show"))
-			{
-				if (!validatePrivileges(player, L2Clan.CP_CS_DISMISS))
-				{
-					return;
-				}
-				if (siegeBlocksFunction(player))
-				{
-					return;
-				}
-				NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-banishfore.htm");
-				html.replace("%objectId%", String.valueOf(getObjectId()));
-				player.sendPacket(html);
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("list_siege_clans"))
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_MANAGE_SIEGE) == L2Clan.CP_CS_MANAGE_SIEGE)
-				{
-					getCastle().getSiege().listRegisterClan(player); // List current register clan
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("list_territory_clans"))
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_MANAGE_SIEGE) == L2Clan.CP_CS_MANAGE_SIEGE)
-				{
-					player.sendPacket(new ExShowDominionRegistry(getCastle().getCastleId(), player));
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("receive_report"))
-			{
-				if (player.isClanLeader())
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-report.htm");
-					html.replace("%objectId%", String.valueOf(getObjectId()));
-					L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId());
-					html.replace("%clanname%", clan.getName());
-					html.replace("%clanleadername%", clan.getLeaderName());
-					html.replace("%castlename%", getCastle().getName());
-					
-					int currentPeriod = SevenSigns.getInstance().getCurrentPeriod();
-					switch (currentPeriod)
-					{
-						case SevenSigns.PERIOD_COMP_RECRUITING:
-							html.replace("%ss_event%", "Quest Event Initialization");
-							break;
-						case SevenSigns.PERIOD_COMPETITION:
-							html.replace("%ss_event%", "Competition (Quest Event)");
-							break;
-						case SevenSigns.PERIOD_COMP_RESULTS:
-							html.replace("%ss_event%", "Quest Event Results");
-							break;
-						case SevenSigns.PERIOD_SEAL_VALIDATION:
-							html.replace("%ss_event%", "Seal Validation");
-							break;
-					}
-					int sealOwner1 = SevenSigns.getInstance().getSealOwner(1);
-					switch (sealOwner1)
-					{
-						case SevenSigns.CABAL_NULL:
-							html.replace("%ss_avarice%", "Not in Possession");
-							break;
-						case SevenSigns.CABAL_DAWN:
-							html.replace("%ss_avarice%", "Lords of Dawn");
-							break;
-						case SevenSigns.CABAL_DUSK:
-							html.replace("%ss_avarice%", "Revolutionaries of Dusk");
-							break;
-					}
-					int sealOwner2 = SevenSigns.getInstance().getSealOwner(2);
-					switch (sealOwner2)
-					{
-						case SevenSigns.CABAL_NULL:
-							html.replace("%ss_gnosis%", "Not in Possession");
-							break;
-						case SevenSigns.CABAL_DAWN:
-							html.replace("%ss_gnosis%", "Lords of Dawn");
-							break;
-						case SevenSigns.CABAL_DUSK:
-							html.replace("%ss_gnosis%", "Revolutionaries of Dusk");
-							break;
-					}
-					int sealOwner3 = SevenSigns.getInstance().getSealOwner(3);
-					switch (sealOwner3)
-					{
-						case SevenSigns.CABAL_NULL:
-							html.replace("%ss_strife%", "Not in Possession");
-							break;
-						case SevenSigns.CABAL_DAWN:
-							html.replace("%ss_strife%", "Lords of Dawn");
-							break;
-						case SevenSigns.CABAL_DUSK:
-							html.replace("%ss_strife%", "Revolutionaries of Dusk");
-							break;
-					}
-					player.sendPacket(html);
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("items"))
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_USE_FUNCTIONS) == L2Clan.CP_CS_USE_FUNCTIONS)
-				{
-					if (val.isEmpty())
-					{
-						return;
-					}
-					player.tempInventoryDisable();
-					
-					if (Config.DEBUG)
-					{
-						_log.fine("Showing chamberlain buylist");
-					}
-					
-					showBuyWindow(player, Integer.parseInt(val + "1"));
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("manage_siege_defender"))
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_MANAGE_SIEGE) == L2Clan.CP_CS_MANAGE_SIEGE)
-				{
-					getCastle().getSiege().listRegisterClan(player);
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("manage_vault"))
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_TAXES) == L2Clan.CP_CS_TAXES)
-				{
-					String filename = "data/html/chamberlain/chamberlain-vault.htm";
-					long amount = 0;
-					if (val.equalsIgnoreCase("deposit"))
-					{
-						try
-						{
-							amount = Long.parseLong(st.nextToken());
-						}
-						catch (NoSuchElementException e)
-						{
-						}
-						if ((amount > 0) && ((getCastle().getTreasury() + amount) < PcInventory.MAX_ADENA))
-						{
-							if (player.reduceAdena("Castle", amount, this, true))
-							{
-								getCastle().addToTreasuryNoTax(amount);
-							}
-							else
-							{
-								sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
-							}
-						}
-					}
-					else if (val.equalsIgnoreCase("withdraw"))
-					{
-						try
-						{
-							amount = Long.parseLong(st.nextToken());
-						}
-						catch (NoSuchElementException e)
-						{
-						}
-						if (amount > 0)
-						{
-							if (getCastle().getTreasury() < amount)
-							{
-								filename = "data/html/chamberlain/chamberlain-vault-no.htm";
-							}
-							else
-							{
-								if (getCastle().addToTreasuryNoTax((-1) * amount))
-								{
-									player.addAdena("Castle", amount, this, true);
-								}
-							}
-						}
-					}
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), filename);
-					html.replace("%objectId%", String.valueOf(getObjectId()));
-					html.replace("%npcname%", getName());
-					html.replace("%tax_income%", Util.formatAdena(getCastle().getTreasury()));
-					html.replace("%withdraw_amount%", Util.formatAdena(amount));
-					player.sendPacket(html);
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("operate_door")) // door control
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_OPEN_DOOR) == L2Clan.CP_CS_OPEN_DOOR)
-				{
-					if (!val.isEmpty())
-					{
-						boolean open = (Integer.parseInt(val) == 1);
-						while (st.hasMoreTokens())
-						{
-							getCastle().openCloseDoor(player, Integer.parseInt(st.nextToken()), open);
-						}
-						
-						NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-						String file = "data/html/chamberlain/doors-close.htm";
-						if (open)
-						{
-							file = "data/html/chamberlain/doors-open.htm";
-						}
-						html.setFile(player.getHtmlPrefix(), file);
-						html.replace("%objectId%", String.valueOf(getObjectId()));
-						player.sendPacket(html);
-						return;
-					}
-					
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/" + getTemplate().getNpcId() + "-d.htm");
-					html.replace("%objectId%", String.valueOf(getObjectId()));
-					html.replace("%npcname%", getName());
-					player.sendPacket(html);
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("tax_set")) // tax rates
-			// control
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_TAXES) == L2Clan.CP_CS_TAXES)
-				{
-					if (!val.isEmpty())
-					{
-						getCastle().setTaxPercent(player, Integer.parseInt(val));
-					}
-					
-					final String msg = StringUtil.concat("<html><body>", getName(), ":<br>" + "Current tax rate: ", String.valueOf(getCastle().getTaxPercent()), "%<br>" + "<table>" + "<tr>" + "<td>Change tax rate to:</td>" + "<td><edit var=\"value\" width=40><br>" + "<button value=\"Adjust\" action=\"bypass -h npc_%objectId%_tax_set $value\" width=80 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>" + "</tr>" + "</table>" + "</center>" + "</body></html>");
-					sendHtmlMessage(player, msg);
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-tax.htm");
-					html.replace("%objectId%", String.valueOf(getObjectId()));
-					html.replace("%tax%", String.valueOf(getCastle().getTaxPercent()));
-					player.sendPacket(html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("manage_functions"))
-			{
-				NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-manage.htm");
-				html.replace("%objectId%", String.valueOf(getObjectId()));
-				player.sendPacket(html);
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("products"))
-			{
-				NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-products.htm");
-				html.replace("%objectId%", String.valueOf(getObjectId()));
-				html.replace("%npcId%", String.valueOf(getNpcId()));
-				player.sendPacket(html);
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("functions"))
-			{
-				if (val.equalsIgnoreCase("tele"))
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(1);
-					if (getCastle().getFunction(Castle.FUNC_TELEPORT) == null)
-					{
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-nac.htm");
-					}
-					else
-					{
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/" + getNpcId() + "-t" + getCastle().getFunction(Castle.FUNC_TELEPORT).getLvl() + ".htm");
-					}
-					sendHtmlMessage(player, html);
-				}
-				else if (val.equalsIgnoreCase("support"))
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(1);
-					if (getCastle().getFunction(Castle.FUNC_SUPPORT) == null)
-					{
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-nac.htm");
-					}
-					else
-					{
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/support" + getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl() + ".htm");
-						html.replace("%mp%", String.valueOf((int) getCurrentMp()));
-					}
-					sendHtmlMessage(player, html);
-				}
-				else if (val.equalsIgnoreCase("back"))
-				{
-					showChatWindow(player);
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(1);
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-functions.htm");
-					if (getCastle().getFunction(Castle.FUNC_RESTORE_EXP) != null)
-					{
-						html.replace("%xp_regen%", String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_EXP).getLvl()));
-					}
-					else
-					{
-						html.replace("%xp_regen%", "0");
-					}
-					if (getCastle().getFunction(Castle.FUNC_RESTORE_HP) != null)
-					{
-						html.replace("%hp_regen%", String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_HP).getLvl()));
-					}
-					else
-					{
-						html.replace("%hp_regen%", "0");
-					}
-					if (getCastle().getFunction(Castle.FUNC_RESTORE_MP) != null)
-					{
-						html.replace("%mp_regen%", String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_MP).getLvl()));
-					}
-					else
-					{
-						html.replace("%mp_regen%", "0");
-					}
-					sendHtmlMessage(player, html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("manage"))
-			{
-				if ((player.getClanPrivileges() & L2Clan.CP_CS_SET_FUNCTIONS) == L2Clan.CP_CS_SET_FUNCTIONS)
-				{
-					if (val.equalsIgnoreCase("recovery"))
-					{
-						if (st.countTokens() >= 1)
-						{
-							if (getCastle().getOwnerId() == 0)
-							{
-								player.sendMessage("This castle have no owner, you cannot change configuration");
-								return;
-							}
-							val = st.nextToken();
-							if (val.equalsIgnoreCase("hp_cancel"))
-							{
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel.htm");
-								html.replace("%apply%", "recovery hp 0");
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("mp_cancel"))
-							{
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel.htm");
-								html.replace("%apply%", "recovery mp 0");
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("exp_cancel"))
-							{
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel.htm");
-								html.replace("%apply%", "recovery exp 0");
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("edit_hp"))
-							{
-								val = st.nextToken();
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply.htm");
-								html.replace("%name%", "Fireplace (HP Recovery Device)");
-								int percent = Integer.parseInt(val);
-								int cost;
-								switch (percent)
-								{
-									case 80:
-										cost = Config.CS_HPREG1_FEE;
-										break;
-									case 120:
-										cost = Config.CS_HPREG2_FEE;
-										break;
-									case 180:
-										cost = Config.CS_HPREG3_FEE;
-										break;
-									case 240:
-										cost = Config.CS_HPREG4_FEE;
-										break;
-									default: // 300
-										cost = Config.CS_HPREG5_FEE;
-										break;
-								}
-								
-								html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
-								html.replace("%use%", "Provides additional HP recovery for clan members in the castle.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
-								html.replace("%apply%", "recovery hp " + String.valueOf(percent));
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("edit_mp"))
-							{
-								val = st.nextToken();
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply.htm");
-								html.replace("%name%", "Carpet (MP Recovery)");
-								int percent = Integer.parseInt(val);
-								int cost;
-								switch (percent)
-								{
-									case 5:
-										cost = Config.CS_MPREG1_FEE;
-										break;
-									case 15:
-										cost = Config.CS_MPREG2_FEE;
-										break;
-									case 30:
-										cost = Config.CS_MPREG3_FEE;
-										break;
-									default: // 40
-										cost = Config.CS_MPREG4_FEE;
-										break;
-								}
-								html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
-								html.replace("%use%", "Provides additional MP recovery for clan members in the castle.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
-								html.replace("%apply%", "recovery mp " + String.valueOf(percent));
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("edit_exp"))
-							{
-								val = st.nextToken();
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply.htm");
-								html.replace("%name%", "Chandelier (EXP Recovery Device)");
-								int percent = Integer.parseInt(val);
-								int cost;
-								switch (percent)
-								{
-									case 15:
-										cost = Config.CS_EXPREG1_FEE;
-										break;
-									case 25:
-										cost = Config.CS_EXPREG2_FEE;
-										break;
-									case 35:
-										cost = Config.CS_EXPREG3_FEE;
-										break;
-									default: // 50
-										cost = Config.CS_EXPREG4_FEE;
-										break;
-								}
-								html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
-								html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the castle.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
-								html.replace("%apply%", "recovery exp " + String.valueOf(percent));
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("hp"))
-							{
-								if (st.countTokens() >= 1)
-								{
-									int fee;
-									if (Config.DEBUG)
-									{
-										_log.warning("Hp editing invoked");
-									}
-									val = st.nextToken();
-									NpcHtmlMessage html = new NpcHtmlMessage(1);
-									html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply_confirmed.htm");
-									if (getCastle().getFunction(Castle.FUNC_RESTORE_HP) != null)
-									{
-										if (getCastle().getFunction(Castle.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
-										{
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-used.htm");
-											html.replace("%val%", String.valueOf(val) + "%");
-											sendHtmlMessage(player, html);
-											return;
-										}
-									}
-									int percent = Integer.parseInt(val);
-									switch (percent)
-									{
-										case 0:
-											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel_confirmed.htm");
-											break;
-										case 80:
-											fee = Config.CS_HPREG1_FEE;
-											break;
-										case 120:
-											fee = Config.CS_HPREG2_FEE;
-											break;
-										case 180:
-											fee = Config.CS_HPREG3_FEE;
-											break;
-										case 240:
-											fee = Config.CS_HPREG4_FEE;
-											break;
-										default: // 300
-											fee = Config.CS_HPREG5_FEE;
-											break;
-									}
-									if (!getCastle().updateFunctions(player, Castle.FUNC_RESTORE_HP, percent, fee, Config.CS_HPREG_FEE_RATIO, (getCastle().getFunction(Castle.FUNC_RESTORE_HP) == null)))
-									{
-										html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/low_adena.htm");
-										sendHtmlMessage(player, html);
-									}
-									sendHtmlMessage(player, html);
-								}
-								return;
-							}
-							else if (val.equalsIgnoreCase("mp"))
-							{
-								if (st.countTokens() >= 1)
-								{
-									int fee;
-									if (Config.DEBUG)
-									{
-										_log.warning("Mp editing invoked");
-									}
-									val = st.nextToken();
-									NpcHtmlMessage html = new NpcHtmlMessage(1);
-									html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply_confirmed.htm");
-									if (getCastle().getFunction(Castle.FUNC_RESTORE_MP) != null)
-									{
-										if (getCastle().getFunction(Castle.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
-										{
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-used.htm");
-											html.replace("%val%", String.valueOf(val) + "%");
-											sendHtmlMessage(player, html);
-											return;
-										}
-									}
-									int percent = Integer.parseInt(val);
-									switch (percent)
-									{
-										case 0:
-											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel_confirmed.htm");
-											break;
-										case 5:
-											fee = Config.CS_MPREG1_FEE;
-											break;
-										case 15:
-											fee = Config.CS_MPREG2_FEE;
-											break;
-										case 30:
-											fee = Config.CS_MPREG3_FEE;
-											break;
-										default: // 40
-											fee = Config.CS_MPREG4_FEE;
-											break;
-									}
-									if (!getCastle().updateFunctions(player, Castle.FUNC_RESTORE_MP, percent, fee, Config.CS_MPREG_FEE_RATIO, (getCastle().getFunction(Castle.FUNC_RESTORE_MP) == null)))
-									{
-										html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/low_adena.htm");
-										sendHtmlMessage(player, html);
-									}
-									sendHtmlMessage(player, html);
-								}
-								return;
-							}
-							else if (val.equalsIgnoreCase("exp"))
-							{
-								if (st.countTokens() >= 1)
-								{
-									int fee;
-									if (Config.DEBUG)
-									{
-										_log.warning("Exp editing invoked");
-									}
-									val = st.nextToken();
-									NpcHtmlMessage html = new NpcHtmlMessage(1);
-									html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply_confirmed.htm");
-									if (getCastle().getFunction(Castle.FUNC_RESTORE_EXP) != null)
-									{
-										if (getCastle().getFunction(Castle.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
-										{
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-used.htm");
-											html.replace("%val%", String.valueOf(val) + "%");
-											sendHtmlMessage(player, html);
-											return;
-										}
-									}
-									int percent = Integer.parseInt(val);
-									switch (percent)
-									{
-										case 0:
-											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel_confirmed.htm");
-											break;
-										case 15:
-											fee = Config.CS_EXPREG1_FEE;
-											break;
-										case 25:
-											fee = Config.CS_EXPREG2_FEE;
-											break;
-										case 35:
-											fee = Config.CS_EXPREG3_FEE;
-											break;
-										default: // 50
-											fee = Config.CS_EXPREG4_FEE;
-											break;
-									}
-									if (!getCastle().updateFunctions(player, Castle.FUNC_RESTORE_EXP, percent, fee, Config.CS_EXPREG_FEE_RATIO, (getCastle().getFunction(Castle.FUNC_RESTORE_EXP) == null)))
-									{
-										html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/low_adena.htm");
-										sendHtmlMessage(player, html);
-									}
-									sendHtmlMessage(player, html);
-								}
-								return;
-							}
-						}
-						NpcHtmlMessage html = new NpcHtmlMessage(1);
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/edit_recovery.htm");
-						String hp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 80\">80%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 120\">120%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 180\">180%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 240\">240%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 300\">300%</a>]";
-						String exp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 25\">25%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 35\">35%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 50\">50%</a>]";
-						String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
-						if (getCastle().getFunction(Castle.FUNC_RESTORE_HP) != null)
-						{
-							html.replace("%hp_recovery%", String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_HP).getLease()) + "</font>Adena /" + String.valueOf(Config.CS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
-							html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getCastle().getFunction(Castle.FUNC_RESTORE_HP).getEndTime()));
-							html.replace("%change_hp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery hp_cancel\">Deactivate</a>]" + hp);
-						}
-						else
-						{
-							html.replace("%hp_recovery%", "none");
-							html.replace("%hp_period%", "none");
-							html.replace("%change_hp%", hp);
-						}
-						if (getCastle().getFunction(Castle.FUNC_RESTORE_EXP) != null)
-						{
-							html.replace("%exp_recovery%", String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /" + String.valueOf(Config.CS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
-							html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getCastle().getFunction(Castle.FUNC_RESTORE_EXP).getEndTime()));
-							html.replace("%change_exp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery exp_cancel\">Deactivate</a>]" + exp);
-						}
-						else
-						{
-							html.replace("%exp_recovery%", "none");
-							html.replace("%exp_period%", "none");
-							html.replace("%change_exp%", exp);
-						}
-						if (getCastle().getFunction(Castle.FUNC_RESTORE_MP) != null)
-						{
-							html.replace("%mp_recovery%", String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getCastle().getFunction(Castle.FUNC_RESTORE_MP).getLease()) + "</font>Adena /" + String.valueOf(Config.CS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
-							html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getCastle().getFunction(Castle.FUNC_RESTORE_MP).getEndTime()));
-							html.replace("%change_mp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery mp_cancel\">Deactivate</a>]" + mp);
-						}
-						else
-						{
-							html.replace("%mp_recovery%", "none");
-							html.replace("%mp_period%", "none");
-							html.replace("%change_mp%", mp);
-						}
-						sendHtmlMessage(player, html);
-					}
-					else if (val.equalsIgnoreCase("other"))
-					{
-						if (st.countTokens() >= 1)
-						{
-							if (getCastle().getOwnerId() == 0)
-							{
-								player.sendMessage("This castle have no owner, you cannot change configuration");
-								return;
-							}
-							val = st.nextToken();
-							if (val.equalsIgnoreCase("tele_cancel"))
-							{
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel.htm");
-								html.replace("%apply%", "other tele 0");
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("support_cancel"))
-							{
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel.htm");
-								html.replace("%apply%", "other support 0");
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("edit_support"))
-							{
-								val = st.nextToken();
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply.htm");
-								html.replace("%name%", "Insignia (Supplementary Magic)");
-								int stage = Integer.parseInt(val);
-								int cost;
-								switch (stage)
-								{
-									case 1:
-										cost = Config.CS_SUPPORT1_FEE;
-										break;
-									case 2:
-										cost = Config.CS_SUPPORT2_FEE;
-										break;
-									case 3:
-										cost = Config.CS_SUPPORT3_FEE;
-										break;
-									default:
-										cost = Config.CS_SUPPORT4_FEE;
-										break;
-								}
-								html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
-								html.replace("%use%", "Enables the use of supplementary magic.");
-								html.replace("%apply%", "other support " + String.valueOf(stage));
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("edit_tele"))
-							{
-								val = st.nextToken();
-								NpcHtmlMessage html = new NpcHtmlMessage(1);
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply.htm");
-								html.replace("%name%", "Mirror (Teleportation Device)");
-								int stage = Integer.parseInt(val);
-								int cost;
-								switch (stage)
-								{
-									case 1:
-										cost = Config.CS_TELE1_FEE;
-										break;
-									default:
-										cost = Config.CS_TELE2_FEE;
-										break;
-								}
-								html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
-								html.replace("%use%", "Teleports clan members in a castle to the target <font color=\"00FFFF\">Stage " + String.valueOf(stage) + "</font> staging area");
-								html.replace("%apply%", "other tele " + String.valueOf(stage));
-								sendHtmlMessage(player, html);
-								return;
-							}
-							else if (val.equalsIgnoreCase("tele"))
-							{
-								if (st.countTokens() >= 1)
-								{
-									int fee;
-									if (Config.DEBUG)
-									{
-										_log.warning("Tele editing invoked");
-									}
-									val = st.nextToken();
-									NpcHtmlMessage html = new NpcHtmlMessage(1);
-									html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply_confirmed.htm");
-									if (getCastle().getFunction(Castle.FUNC_TELEPORT) != null)
-									{
-										if (getCastle().getFunction(Castle.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
-										{
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-used.htm");
-											html.replace("%val%", "Stage " + String.valueOf(val));
-											sendHtmlMessage(player, html);
-											return;
-										}
-									}
-									int lvl = Integer.parseInt(val);
-									switch (lvl)
-									{
-										case 0:
-											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel_confirmed.htm");
-											break;
-										case 1:
-											fee = Config.CS_TELE1_FEE;
-											break;
-										default:
-											fee = Config.CS_TELE2_FEE;
-											break;
-									}
-									if (!getCastle().updateFunctions(player, Castle.FUNC_TELEPORT, lvl, fee, Config.CS_TELE_FEE_RATIO, (getCastle().getFunction(Castle.FUNC_TELEPORT) == null)))
-									{
-										html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/low_adena.htm");
-										sendHtmlMessage(player, html);
-									}
-									sendHtmlMessage(player, html);
-								}
-								return;
-							}
-							else if (val.equalsIgnoreCase("support"))
-							{
-								if (st.countTokens() >= 1)
-								{
-									int fee;
-									if (Config.DEBUG)
-									{
-										_log.warning("Support editing invoked");
-									}
-									val = st.nextToken();
-									NpcHtmlMessage html = new NpcHtmlMessage(1);
-									html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-apply_confirmed.htm");
-									if (getCastle().getFunction(Castle.FUNC_SUPPORT) != null)
-									{
-										if (getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
-										{
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-used.htm");
-											html.replace("%val%", "Stage " + String.valueOf(val));
-											sendHtmlMessage(player, html);
-											return;
-										}
-									}
-									int lvl = Integer.parseInt(val);
-									switch (lvl)
-									{
-										case 0:
-											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/functions-cancel_confirmed.htm");
-											break;
-										case 1:
-											fee = Config.CS_SUPPORT1_FEE;
-											break;
-										case 2:
-											fee = Config.CS_SUPPORT2_FEE;
-											break;
-										case 3:
-											fee = Config.CS_SUPPORT3_FEE;
-											break;
-										default:
-											fee = Config.CS_SUPPORT4_FEE;
-											break;
-									}
-									if (!getCastle().updateFunctions(player, Castle.FUNC_SUPPORT, lvl, fee, Config.CS_SUPPORT_FEE_RATIO, (getCastle().getFunction(Castle.FUNC_SUPPORT) == null)))
-									{
-										html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/low_adena.htm");
-										sendHtmlMessage(player, html);
-									}
-									else
-									{
-										sendHtmlMessage(player, html);
-									}
-								}
-								return;
-							}
-						}
-						NpcHtmlMessage html = new NpcHtmlMessage(1);
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/edit_other.htm");
-						String tele = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
-						String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 3\">Level 3</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 4\">Level 4</a>]";
-						if (getCastle().getFunction(Castle.FUNC_TELEPORT) != null)
-						{
-							html.replace("%tele%", "Stage " + String.valueOf(getCastle().getFunction(Castle.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getCastle().getFunction(Castle.FUNC_TELEPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
-							html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getCastle().getFunction(Castle.FUNC_TELEPORT).getEndTime()));
-							html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
-						}
-						else
-						{
-							html.replace("%tele%", "none");
-							html.replace("%tele_period%", "none");
-							html.replace("%change_tele%", tele);
-						}
-						if (getCastle().getFunction(Castle.FUNC_SUPPORT) != null)
-						{
-							html.replace("%support%", "Stage " + String.valueOf(getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getCastle().getFunction(Castle.FUNC_SUPPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
-							html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getCastle().getFunction(Castle.FUNC_SUPPORT).getEndTime()));
-							html.replace("%change_support%", "[<a action=\"bypass -h npc_%objectId%_manage other support_cancel\">Deactivate</a>]" + support);
-						}
-						else
-						{
-							html.replace("%support%", "none");
-							html.replace("%support_period%", "none");
-							html.replace("%change_support%", support);
-						}
-						sendHtmlMessage(player, html);
-					}
-					else if (val.equalsIgnoreCase("back"))
-					{
-						showChatWindow(player);
-					}
-					else
-					{
-						NpcHtmlMessage html = new NpcHtmlMessage(1);
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/manage.htm");
-						sendHtmlMessage(player, html);
-					}
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(1);
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					sendHtmlMessage(player, html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("support"))
-			{
-				setTarget(player);
-				L2Skill skill;
-				if (val.isEmpty())
-				{
-					return;
-				}
-				
-				try
-				{
-					int skill_id = Integer.parseInt(val);
-					try
-					{
-						if (getCastle().getFunction(Castle.FUNC_SUPPORT) == null)
-						{
-							return;
-						}
-						if (getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl() == 0)
-						{
-							return;
-						}
-						NpcHtmlMessage html = new NpcHtmlMessage(1);
-						int skill_lvl = 0;
-						if (st.countTokens() >= 1)
-						{
-							skill_lvl = Integer.parseInt(st.nextToken());
-						}
-						skill = SkillTable.getInstance().getInfo(skill_id, skill_lvl);
-						if (skill.getSkillType() == L2SkillType.SUMMON)
-						{
-							player.doSimultaneousCast(skill);
-						}
-						else
-						{
-							if (!((skill.getMpConsume() + skill.getMpInitialConsume()) > getCurrentMp()))
-							{
-								this.doCast(skill);
-							}
-							else
-							{
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/support-no_mana.htm");
-								html.replace("%mp%", String.valueOf((int) getCurrentMp()));
-								sendHtmlMessage(player, html);
-								return;
-							}
-						}
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/support-done.htm");
-						html.replace("%mp%", String.valueOf((int) getCurrentMp()));
-						sendHtmlMessage(player, html);
-					}
-					catch (Exception e)
-					{
-						player.sendMessage("Invalid skill level, contact your admin!");
-					}
-				}
-				catch (Exception e)
-				{
-					player.sendMessage("Invalid skill level, contact your admin!");
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("support_back"))
-			{
-				NpcHtmlMessage html = new NpcHtmlMessage(1);
-				if (getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl() == 0)
-				{
-					return;
-				}
-				html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/support" + getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl() + ".htm");
-				html.replace("%mp%", String.valueOf((int) getStatus().getCurrentMp()));
-				sendHtmlMessage(player, html);
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("goto"))
-			{
-				int whereTo = Integer.parseInt(val);
-				doTeleport(player, whereTo);
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("siege_change")) // siege day set
-			{
-				if (Config.CL_SET_SIEGE_TIME_LIST.isEmpty())
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(1);
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noadmin.htm");
-					sendHtmlMessage(player, html);
-				}
-				else if (player.isClanLeader())
-				{
-					if (getCastle().getSiege().getTimeRegistrationOverDate().getTimeInMillis() < Calendar.getInstance().getTimeInMillis())
-					{
-						NpcHtmlMessage html = new NpcHtmlMessage(1);
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/siegetime1.htm");
-						sendHtmlMessage(player, html);
-					}
-					else if (getCastle().getSiege().getIsTimeRegistrationOver())
-					{
-						NpcHtmlMessage html = new NpcHtmlMessage(1);
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/siegetime2.htm");
-						sendHtmlMessage(player, html);
-					}
-					else
-					{
-						NpcHtmlMessage html = new NpcHtmlMessage(1);
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/siegetime3.htm");
-						html.replace("%time%", String.valueOf(getCastle().getSiegeDate().getTime()));
-						sendHtmlMessage(player, html);
-					}
-				}
-				else
-				{
-					NpcHtmlMessage html = new NpcHtmlMessage(1);
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-					sendHtmlMessage(player, html);
-				}
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("siege_time_set")) // set preDay
-			{
-				boolean isAfternoon = Config.SIEGE_HOUR_LIST_MORNING.isEmpty();
-				switch (Integer.parseInt(val))
-				{
-					case 0:
-					case 4:
-						break;
-					case 1:
-						_preDay = Integer.parseInt(st.nextToken());
-						break;
-					case 2:
-						isAfternoon = Boolean.parseBoolean(st.nextToken());
-						break;
-					case 3:
-						_preHour = Integer.parseInt(st.nextToken());
-						break;
-					default:
-						break;
-				}
-				NpcHtmlMessage html = getNextSiegeTimePage(player.getHtmlPrefix(), Integer.parseInt(val), isAfternoon);
-				
-				if (html == null)
-				{
-					if (Config.CL_SET_SIEGE_TIME_LIST.contains("day"))
-					{
-						getCastle().getSiegeDate().set(Calendar.DAY_OF_WEEK, _preDay);
-					}
-					else
-					{
-						getCastle().getSiegeDate().set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
-					}
-					if (Config.CL_SET_SIEGE_TIME_LIST.contains("hour"))
-					{
-						getCastle().getSiegeDate().set(Calendar.HOUR_OF_DAY, _preHour);
-					}
-					if (Config.CL_SET_SIEGE_TIME_LIST.contains("minute"))
-					{
-						getCastle().getSiegeDate().set(Calendar.MINUTE, Integer.parseInt(st.nextToken()));
-					}
-					// now store the changed time and finished next Siege Time registration
-					getCastle().getSiege().endTimeRegistration(false);
-					
-					html = new NpcHtmlMessage(1);
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/siegetime8.htm");
-					html.replace("%time%", String.valueOf(getCastle().getSiegeDate().getTime()));
-				}
-				sendHtmlMessage(player, html);
-				return;
-			}
-			else if (actualCommand.equals("give_crown"))
-			{
-				if (siegeBlocksFunction(player))
-				{
-					return;
-				}
-				
-				NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				
-				if (player.isClanLeader())
-				{
-					if (player.getInventory().getItemByItemId(6841) == null)
-					{
-						L2ItemInstance crown = player.getInventory().addItem("Castle Crown", 6841, 1, player, this);
-						
-						SystemMessage ms = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
-						ms.addItemName(crown);
-						player.sendPacket(ms);
-						
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-gavecrown.htm");
-						html.replace("%CharName%", String.valueOf(player.getName()));
-						html.replace("%FeudName%", String.valueOf(getCastle().getName()));
-					}
-					else
-					{
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-hascrown.htm");
-					}
-				}
-				else
-				{
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-				}
-				
-				player.sendPacket(html);
-				return;
-			}
-			else if (actualCommand.equalsIgnoreCase("manors_cert"))
-			{
-				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				// Zoey76: TODO: Check privileges and replace with enum/constants.
-				if (isMyLord(player) || (validatePrivileges(player, 5) && (validateCondition(player) == COND_OWNER)))
-				{
-					if (getCastle().getSiege().getIsInProgress())
-					{
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-busy.htm");
-						html.replace("%npcname%", String.valueOf(getName()));
-					}
-					else
-					{
-						final int cabal = SevenSigns.getInstance().getPlayerCabal(player.getObjectId());
-						if ((cabal == SevenSigns.CABAL_DAWN) && SevenSigns.getInstance().isCompetitionPeriod())
-						{
-							final int ticketCount = getCastle().getTicketBuyCount();
-							if (ticketCount < (Config.SSQ_DAWN_TICKET_QUANTITY / Config.SSQ_DAWN_TICKET_BUNDLE))
-							{
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/ssq_selldawnticket.htm");
-								html.replace("%DawnTicketLeft%", String.valueOf(Config.SSQ_DAWN_TICKET_QUANTITY - (ticketCount * Config.SSQ_DAWN_TICKET_BUNDLE)));
-								html.replace("%DawnTicketBundle%", String.valueOf(Config.SSQ_DAWN_TICKET_BUNDLE));
-								html.replace("%DawnTicketPrice%", String.valueOf(Config.SSQ_DAWN_TICKET_PRICE * Config.SSQ_DAWN_TICKET_BUNDLE));
-							}
-							else
-							{
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/ssq_notenoughticket.htm");
-							}
-						}
-						else
-						{
-							html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/ssq_notdawnorevent.htm");
-						}
-					}
-				}
-				else
-				{
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-				}
-				html.replace("%objectId%", String.valueOf(getObjectId()));
-				player.sendPacket(html);
-			}
-			else if (actualCommand.equalsIgnoreCase("manors_cert_confirm"))
-			{
-				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				// Zoey76: TODO: Check privileges and replace with enum/constants.
-				if (isMyLord(player) || (validatePrivileges(player, 5) && (validateCondition(player) == COND_OWNER)))
-				{
-					if (getCastle().getSiege().getIsInProgress())
-					{
-						html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-busy.htm");
-						html.replace("%npcname%", String.valueOf(getName()));
-					}
-					else
-					{
-						final int cabal = SevenSigns.getInstance().getPlayerCabal(player.getObjectId());
-						if ((cabal == SevenSigns.CABAL_DAWN) && SevenSigns.getInstance().isCompetitionPeriod())
-						{
-							final int ticketCount = getCastle().getTicketBuyCount();
-							if (ticketCount < (Config.SSQ_DAWN_TICKET_QUANTITY / Config.SSQ_DAWN_TICKET_BUNDLE))
-							{
-								final long totalCost = Config.SSQ_DAWN_TICKET_PRICE * Config.SSQ_DAWN_TICKET_BUNDLE;
-								if (player.getAdena() >= totalCost)
-								{
-									// Take the adena.
-									player.reduceAdena(actualCommand, totalCost, this, true);
-									// Give the certificate.
-									player.addItem(actualCommand, Config.SSQ_MANORS_AGREEMENT_ID, Config.SSQ_DAWN_TICKET_BUNDLE, this, true);
-									// Set the ticket count for the player's clan.
-									getCastle().setTicketBuyCount(ticketCount + 1);
-									return;
-								}
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain_noadena.htm");
-							}
-							else
-							{
-								html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/ssq_notenoughticket.htm");
-							}
-						}
-						else
-						{
-							html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/ssq_notdawnorevent.htm");
-						}
-					}
-				}
-				else
-				{
-					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-				}
-				html.replace("%objectId%", String.valueOf(getObjectId()));
-				player.sendPacket(html);
-			}
-			else
-			{
-				super.onBypassFeedback(player, command);
-			}
-		}
-	}
-	
-	private NpcHtmlMessage getNextSiegeTimePage(String htmlPrefix, int now, boolean isAfternoon)
-	{
-		NpcHtmlMessage ret = new NpcHtmlMessage(1);
-		if ((now == 0) && Config.CL_SET_SIEGE_TIME_LIST.contains("day"))
-		{
-			ret.setFile(htmlPrefix, "data/html/chamberlain/siegetime4.htm");
-			return ret;
-		}
-		if ((now < 3) && Config.CL_SET_SIEGE_TIME_LIST.contains("hour"))
-		{
-			switch (now)
-			{
-				case 0:
-				case 1:
-					if (!Config.SIEGE_HOUR_LIST_MORNING.isEmpty() && !Config.SIEGE_HOUR_LIST_AFTERNOON.isEmpty())
-					{
-						ret.setFile(htmlPrefix, "data/html/chamberlain/siegetime5.htm");
-						return ret;
-					}
-				case 2:
-					ret.setFile(htmlPrefix, "data/html/chamberlain/siegetime6.htm");
-					List<Integer> list;
-					int inc = 0;
-					String ampm = "";
-					
-					if (!isAfternoon)
-					{
-						if (Config.SIEGE_HOUR_LIST_AFTERNOON.isEmpty())
-						{
-							ampm = "AM";
-						}
-						list = Config.SIEGE_HOUR_LIST_MORNING;
-					}
-					else
-					{
-						if (Config.SIEGE_HOUR_LIST_MORNING.isEmpty())
-						{
-							ampm = "PM";
-						}
-						inc = 12;
-						list = Config.SIEGE_HOUR_LIST_AFTERNOON;
-					}
-					
-					final StringBuilder tList = new StringBuilder(list.size() * 50);
-					for (Integer hour : list)
-					{
-						if (hour == 0)
-						{
-							StringUtil.append(tList, "<a action=\"bypass -h npc_%objectId%_siege_time_set 3 ", String.valueOf(hour + inc), "\">", String.valueOf(hour + 12), ":00 ", ampm, "</a><br>");
-						}
-						else
-						{
-							StringUtil.append(tList, "<a action=\"bypass -h npc_%objectId%_siege_time_set 3 ", String.valueOf(hour + inc), "\">", String.valueOf(hour), ":00 ", ampm, "</a><br>");
-						}
-					}
-					ret.replace("%links%", tList.toString());
-			}
-			return ret;
-		}
-		if ((now < 4) && Config.CL_SET_SIEGE_TIME_LIST.contains("minute"))
-		{
-			ret.setFile(htmlPrefix, "data/html/chamberlain/siegetime7.htm");
-			return ret;
-		}
-		
-		return null;
-	}
-	
-	private void sendHtmlMessage(L2PcInstance player, String htmlMessage)
-	{
-		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-		html.setHtml(htmlMessage);
-		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcname%", getName());
-		player.sendPacket(html);
-	}
-	
-	@Override
-	public void showChatWindow(L2PcInstance player)
-	{
-		player.sendPacket(ActionFailed.STATIC_PACKET);
-		String filename = "data/html/chamberlain/chamberlain-no.htm";
-		
-		int condition = validateCondition(player);
-		if (condition > COND_ALL_FALSE)
-		{
-			if (condition == COND_BUSY_BECAUSE_OF_SIEGE)
-			{
-				filename = "data/html/chamberlain/chamberlain-busy.htm"; // Busy because of siege
-			}
-			else if (condition == COND_OWNER)
-			{
-				filename = "data/html/chamberlain/chamberlain.htm"; // Owner message window
-			}
-		}
-		
-		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-		html.setFile(player.getHtmlPrefix(), filename);
-		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcname%", getName());
-		player.sendPacket(html);
-	}
-	
-	private void doTeleport(L2PcInstance player, int val)
-	{
-		if (Config.DEBUG)
-		{
-			_log.warning("doTeleport(L2PcInstance player, int val) is called");
-		}
-		L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val);
-		if (list != null)
-		{
-			if (player.destroyItemByItemId("Teleport", list.getItemId(), list.getPrice(), this, true))
-			{
-				if (Config.DEBUG)
-				{
-					_log.warning("Teleporting player " + player.getName() + " for Castle to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ());
-				}
-				player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ());
-			}
-		}
-		else
-		{
-			_log.warning("No teleport destination with id:" + val);
-		}
-		player.sendPacket(ActionFailed.STATIC_PACKET);
-	}
-	
-	protected int validateCondition(L2PcInstance player)
-	{
-		if ((getCastle() != null) && (getCastle().getCastleId() > 0))
-		{
-			if (player.getClan() != null)
-			{
-				if (getCastle().getZone().isActive())
-				{
-					return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
-				}
-				else if (getCastle().getOwnerId() == player.getClanId())
-				{
-					return COND_OWNER; // Owner
-				}
-			}
-		}
-		return COND_ALL_FALSE;
-	}
-	
-	private boolean validatePrivileges(L2PcInstance player, int privilege)
-	{
-		if ((player.getClanPrivileges() & privilege) != privilege)
-		{
-			NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-			html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
-			player.sendPacket(html);
-			return false;
-		}
-		return true;
-	}
-	
-	private boolean siegeBlocksFunction(L2PcInstance player)
-	{
-		if (getCastle().getSiege().getIsInProgress())
-		{
-			NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-			html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-busy.htm");
-			html.replace("%npcname%", String.valueOf(getName()));
-			player.sendPacket(html);
-			return true;
-		}
-		return false;
-	}
-}

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

@@ -40,6 +40,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.knownlist.DoorKnownList;
+import com.l2jserver.gameserver.model.actor.stat.DoorStat;
 import com.l2jserver.gameserver.model.actor.status.DoorStatus;
 import com.l2jserver.gameserver.model.actor.templates.L2DoorTemplate;
 import com.l2jserver.gameserver.model.entity.Castle;
@@ -207,6 +208,18 @@ public class L2DoorInstance extends L2Character
 		setStatus(new DoorStatus(this));
 	}
 	
+	@Override
+	public void initCharStat()
+	{
+		setStat(new DoorStat(this));
+	}
+	
+	@Override
+	public DoorStat getStat()
+	{
+		return (DoorStat) super.getStat();
+	}
+	
 	/**
 	 * @return {@code true} if door is open-able by skill.
 	 */

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

@@ -18,9 +18,13 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Tower;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
 
 /**
  * Class for Flame Control Tower instance.
@@ -28,6 +32,9 @@ import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
  */
 public class L2FlameTowerInstance extends L2Tower
 {
+	private int _upgradeLevel = 0;
+	private List<Integer> _zoneList;
+	
 	public L2FlameTowerInstance(int objectId, L2NpcTemplate template)
 	{
 		super(objectId, template);
@@ -37,10 +44,41 @@ public class L2FlameTowerInstance extends L2Tower
 	@Override
 	public boolean doDie(L2Character killer)
 	{
-		if (getCastle().getSiege().getIsInProgress())
+		enableZones(false);
+		return super.doDie(killer);
+	}
+	
+	@Override
+	public void deleteMe()
+	{
+		enableZones(false);
+		super.deleteMe();
+	}
+	
+	public final void enableZones(boolean state)
+	{
+		if ((_zoneList != null) && (_upgradeLevel != 0))
 		{
-			getCastle().getSiege().disableTraps();
+			final int maxIndex = _upgradeLevel * 2;
+			for (int i = 0; i < maxIndex; i++)
+			{
+				final L2ZoneType zone = ZoneManager.getInstance().getZoneById(_zoneList.get(i));
+				if (zone != null)
+				{
+					zone.setEnabled(state);
+				}
+			}
 		}
-		return super.doDie(killer);
 	}
-}
+	
+	public final void setUpgradeLevel(int level)
+	{
+		_upgradeLevel = level;
+	}
+	
+	public final void setZoneList(List<Integer> list)
+	{
+		_zoneList = list;
+		enableZones(true);
+	}
+}

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

@@ -0,0 +1,56 @@
+/*
+ * 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.model.actor.stat;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+/**
+ * @author malyelfik
+ */
+public class DoorStat extends CharStat
+{
+	private int _upgradeHpRatio = 1;
+	
+	public DoorStat(L2DoorInstance activeChar)
+	{
+		super(activeChar);
+	}
+	
+	@Override
+	public L2DoorInstance getActiveChar()
+	{
+		return (L2DoorInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public int getMaxHp()
+	{
+		return super.getMaxHp() * _upgradeHpRatio;
+	}
+	
+	public void setUpgradeHpRatio(int ratio)
+	{
+		_upgradeHpRatio = ratio;
+	}
+	
+	public int getUpgradeHpRatio()
+	{
+		return _upgradeHpRatio;
+	}
+}

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

@@ -21,7 +21,6 @@ package com.l2jserver.gameserver.model.entity;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -34,7 +33,6 @@ import javolution.util.FastMap;
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.CastleUpdater;
-import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.DoorTable;
@@ -46,12 +44,14 @@ import com.l2jserver.gameserver.instancemanager.CastleManorManager;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager.CropProcure;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager.SeedProduction;
 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.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.TowerSpawn;
 import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -278,6 +278,7 @@ public class Castle
 		if (getOwnerId() != 0)
 		{
 			loadFunctions();
+			loadDoorUpgrade();
 		}
 	}
 	
@@ -525,6 +526,7 @@ public class Castle
 	public void removeUpgrade()
 	{
 		removeDoorUpgrade();
+		removeTrapUpgrade();
 		for (Integer fc : _function.keySet())
 		{
 			removeFunction(fc);
@@ -630,32 +632,6 @@ public class Castle
 		_function.clear();
 	}
 	
-	// This method updates the castle tax rate
-	public void setTaxPercent(L2PcInstance activeChar, int taxPercent)
-	{
-		int maxTax;
-		switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE))
-		{
-			case SevenSigns.CABAL_DAWN:
-				maxTax = 25;
-				break;
-			case SevenSigns.CABAL_DUSK:
-				maxTax = 5;
-				break;
-			default: // no owner
-				maxTax = 15;
-		}
-		
-		if ((taxPercent < 0) || (taxPercent > maxTax))
-		{
-			activeChar.sendMessage("Tax value must be between 0 and " + maxTax + ".");
-			return;
-		}
-		
-		setTaxPercent(taxPercent);
-		activeChar.sendMessage(getName() + " castle tax changed to " + taxPercent + "%.");
-	}
-	
 	public void setTaxPercent(int taxPercent)
 	{
 		_taxPercent = taxPercent;
@@ -694,14 +670,7 @@ public class Castle
 			if (door.isDead())
 			{
 				door.doRevive();
-				if (isDoorWeak)
-				{
-					door.setCurrentHp(door.getMaxHp() / 2);
-				}
-				else
-				{
-					door.setCurrentHp(door.getMaxHp());
-				}
+				door.setCurrentHp((isDoorWeak) ? (door.getMaxHp() / 2) : (door.getMaxHp()));
 			}
 			
 			if (door.getOpen())
@@ -709,21 +678,6 @@ public class Castle
 				door.closeMe();
 			}
 		}
-		loadDoorUpgrade(); // Check for any upgrade the doors may have
-	}
-	
-	// This method upgrade door
-	public void upgradeDoor(int doorId, int hp, int pDef, int mDef)
-	{
-		L2DoorInstance door = getDoor(doorId);
-		if (door == null)
-		{
-			return;
-		}
-		
-		door.setCurrentHp(door.getMaxHp() + hp);
-		
-		saveDoorUpgrade(doorId, hp, pDef, mDef);
 	}
 	
 	// This method loads castle
@@ -881,20 +835,16 @@ public class Castle
 	// This method loads castle door upgrade data from database
 	private void loadDoorUpgrade()
 	{
-		StringBuilder doorIds = new StringBuilder(100);
-		for (L2DoorInstance door : getDoors())
-		{
-			doorIds.append(door.getDoorId()).append(',');
-		}
-		doorIds.deleteCharAt(doorIds.length() - 1);
-		
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			Statement s = con.createStatement();
-			ResultSet rs = s.executeQuery("SELECT * FROM castle_doorupgrade WHERE doorId IN (" + doorIds.toString() + ")"))
+			PreparedStatement ps = con.prepareStatement("SELECT * FROM castle_doorupgrade WHERE castleId=?"))
 		{
-			while (rs.next())
+			ps.setInt(1, getCastleId());
+			try (ResultSet rs = ps.executeQuery())
 			{
-				upgradeDoor(rs.getInt("id"), rs.getInt("hp"), rs.getInt("pDef"), rs.getInt("mDef"));
+				while (rs.next())
+				{
+					setDoorUpgrade(rs.getInt("doorId"), rs.getInt("ratio"), false);
+				}
 			}
 		}
 		catch (Exception e)
@@ -905,17 +855,17 @@ public class Castle
 	
 	private void removeDoorUpgrade()
 	{
-		StringBuilder doorIds = new StringBuilder(100);
-		for (L2DoorInstance door : getDoors())
+		for (L2DoorInstance door : _doors)
 		{
-			doorIds.append(door.getDoorId()).append(',');
+			door.getStat().setUpgradeHpRatio(1);
+			door.setCurrentHp(door.getCurrentHp());
 		}
-		doorIds.deleteCharAt(doorIds.length() - 1);
 		
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			Statement s = con.createStatement())
+			PreparedStatement ps = con.prepareStatement("DELETE FROM castle_doorupgrade WHERE castleId=?"))
 		{
-			s.executeQuery("DELETE FROM castle_doorupgrade WHERE doorId IN (" + doorIds.toString() + ")");
+			ps.setInt(1, getCastleId());
+			ps.execute();
 		}
 		catch (Exception e)
 		{
@@ -923,20 +873,31 @@ public class Castle
 		}
 	}
 	
-	private void saveDoorUpgrade(int doorId, int hp, int pDef, int mDef)
+	public void setDoorUpgrade(int doorId, int ratio, boolean save)
 	{
-		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement ps = con.prepareStatement("INSERT INTO castle_doorupgrade (doorId, hp, pDef, mDef) values (?,?,?,?)"))
+		final L2DoorInstance door = (getDoors().isEmpty()) ? DoorTable.getInstance().getDoor(doorId) : getDoor(doorId);
+		if (door == null)
 		{
-			ps.setInt(1, doorId);
-			ps.setInt(2, hp);
-			ps.setInt(3, pDef);
-			ps.setInt(4, mDef);
-			ps.execute();
+			return;
 		}
-		catch (Exception e)
+		
+		door.getStat().setUpgradeHpRatio(ratio);
+		door.setCurrentHp(door.getMaxHp());
+		
+		if (save)
 		{
-			_log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e);
+			try (Connection con = L2DatabaseFactory.getInstance().getConnection();
+				PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_doorupgrade (doorId, ratio, castleId) values (?,?,?)"))
+			{
+				ps.setInt(1, doorId);
+				ps.setInt(2, ratio);
+				ps.setInt(3, getCastleId());
+				ps.execute();
+			}
+			catch (Exception e)
+			{
+				_log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e);
+			}
 		}
 	}
 	
@@ -1023,10 +984,7 @@ public class Castle
 	{
 		if (_siege == null)
 		{
-			_siege = new Siege(new Castle[]
-			{
-				this
-			});
+			_siege = new Siege(this);
 		}
 		return _siege;
 	}
@@ -1598,6 +1556,55 @@ public class Castle
 		}
 	}
 	
+	public int getTrapUpgradeLevel(int towerIndex)
+	{
+		final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(_castleId).get(towerIndex);
+		return (spawn != null) ? spawn.getUpgradeLevel() : 0;
+	}
+	
+	public void setTrapUpgrade(int towerIndex, int level, boolean save)
+	{
+		if (save)
+		{
+			try (Connection con = L2DatabaseFactory.getInstance().getConnection();
+				PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_trapupgrade (castleId, towerIndex, level) values (?,?,?)"))
+			{
+				ps.setInt(1, getCastleId());
+				ps.setInt(2, towerIndex);
+				ps.setInt(3, level);
+				ps.execute();
+			}
+			catch (Exception e)
+			{
+				_log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e);
+			}
+		}
+		final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(_castleId).get(towerIndex);
+		if (spawn != null)
+		{
+			spawn.setUpgradeLevel(level);
+		}
+	}
+	
+	private void removeTrapUpgrade()
+	{
+		for (TowerSpawn ts : SiegeManager.getInstance().getFlameTowers(_castleId))
+		{
+			ts.setUpgradeLevel(0);
+		}
+		
+		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement("DELETE FROM castle_trapupgrade WHERE castleId=?"))
+		{
+			ps.setInt(1, getCastleId());
+			ps.execute();
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e);
+		}
+	}
+	
 	@Override
 	public String toString()
 	{

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

@@ -37,12 +37,10 @@ import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
-import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.instancemanager.MercTicketManager;
 import com.l2jserver.gameserver.instancemanager.SiegeGuardManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
-import com.l2jserver.gameserver.instancemanager.SiegeManager.SiegeSpawn;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2Object;
@@ -50,11 +48,11 @@ import com.l2jserver.gameserver.model.L2SiegeClan;
 import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.TowerSpawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2ControlTowerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2FlameTowerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import com.l2jserver.gameserver.network.serverpackets.RelationChanged;
@@ -87,9 +85,6 @@ public class Siege implements Siegable
 	}
 	
 	private int _controlTowerCount;
-	private int _controlTowerMaxCount;
-	private int _flameTowerCount;
-	private int _flameTowerMaxCount;
 	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
@@ -237,9 +232,9 @@ public class Siege implements Siegable
 	private final List<L2SiegeClan> _defenderWaitingClans = new FastList<>();
 	
 	// Castle setting
-	private List<L2ControlTowerInstance> _controlTowers = new ArrayList<>();
-	private List<L2FlameTowerInstance> _flameTowers = new ArrayList<>();
-	private final Castle[] _castle;
+	private final List<L2ControlTowerInstance> _controlTowers = new ArrayList<>();
+	private final List<L2FlameTowerInstance> _flameTowers = new ArrayList<>();
+	private final Castle _castle;
 	private boolean _isInProgress = false;
 	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
 	protected boolean _isRegistrationOver = false;
@@ -248,7 +243,7 @@ public class Siege implements Siegable
 	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
 	protected int _firstOwnerClanId = -1;
 	
-	public Siege(Castle[] castle)
+	public Siege(Castle castle)
 	{
 		_castle = castle;
 		_siegeGuardManager = new SiegeGuardManager(getCastle());
@@ -310,8 +305,7 @@ public class Siege implements Siegable
 			updatePlayerSiegeStateFlags(true);
 			saveCastleSiege(); // Save castle specific data
 			clearSiegeClan(); // Clear siege clan from db
-			removeControlTower(); // Remove all control tower from this castle
-			removeFlameTower();
+			removeTowers(); // Remove all towers from this castle
 			_siegeGuardManager.unspawnSiegeGuard(); // Remove all spawned siege guard from this castle
 			if (getCastle().getOwnerId() > 0)
 			{
@@ -444,14 +438,10 @@ public class Siege implements Siegable
 				removeDefenderFlags(); // Removes defenders' flags
 				getCastle().removeUpgrade(); // Remove all castle upgrade
 				getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp)
-				removeControlTower(); // Remove all control tower from this castle
-				removeFlameTower();
+				removeTowers(); // Remove all towers from this castle
 				_controlTowerCount = 0;// Each new siege midvictory CT are completely respawned.
-				_controlTowerMaxCount = 0;
-				_flameTowerCount = 0;
-				_flameTowerMaxCount = 0;
-				spawnControlTower(getCastle().getCastleId());
-				spawnFlameTower(getCastle().getCastleId());
+				spawnControlTower();
+				spawnFlameTower();
 				updatePlayerSiegeStateFlags(false);
 				fireSiegeListeners(EventStage.CONTROL_CHANGE);
 			}
@@ -500,9 +490,8 @@ public class Siege implements Siegable
 			teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionManager.TeleportWhereType.Town); // Teleport to the closest town
 			// teleportPlayer(Siege.TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town); // Teleport to the second closest town
 			_controlTowerCount = 0;
-			_controlTowerMaxCount = 0;
-			spawnControlTower(getCastle().getCastleId()); // Spawn control tower
-			spawnFlameTower(getCastle().getCastleId()); // Spawn control tower
+			spawnControlTower(); // Spawn control tower
+			spawnFlameTower(); // Spawn control tower
 			getCastle().spawnDoor(); // Spawn door
 			spawnSiegeGuard(); // Spawn siege guard
 			MercTicketManager.getInstance().deleteTickets(getCastle().getCastleId()); // remove the tickets from the ground
@@ -1292,54 +1281,21 @@ public class Siege implements Siegable
 		}
 	}
 	
-	/** Remove all control tower spawned. */
-	private void removeControlTower()
+	/** Remove all spawned towers. */
+	private void removeTowers()
 	{
-		if ((_controlTowers != null) && !_controlTowers.isEmpty())
+		for (L2FlameTowerInstance ct : _flameTowers)
 		{
-			// Remove all instances of control tower for this castle
-			for (L2ControlTowerInstance ct : _controlTowers)
-			{
-				if (ct != null)
-				{
-					try
-					{
-						ct.deleteMe();
-					}
-					catch (Exception e)
-					{
-						_log.log(Level.WARNING, "Exception: removeControlTower(): " + e.getMessage(), e);
-					}
-				}
-			}
-			_controlTowers.clear();
-			_controlTowers = null;
+			ct.deleteMe();
 		}
-	}
-	
-	/** Remove all flame towers spawned. */
-	private void removeFlameTower()
-	{
-		if ((_flameTowers != null) && !_flameTowers.isEmpty())
+		
+		for (L2ControlTowerInstance ct : _controlTowers)
 		{
-			// Remove all instances of control tower for this castle
-			for (L2FlameTowerInstance ct : _flameTowers)
-			{
-				if (ct != null)
-				{
-					try
-					{
-						ct.deleteMe();
-					}
-					catch (Exception e)
-					{
-						_log.log(Level.WARNING, "Exception: removeFlamelTower(): " + e.getMessage(), e);
-					}
-				}
-			}
-			_flameTowers.clear();
-			_flameTowers = null;
+			ct.deleteMe();
 		}
+		
+		_flameTowers.clear();
+		_controlTowers.clear();
 	}
 	
 	/** Remove all flags. */
@@ -1514,66 +1470,45 @@ public class Siege implements Siegable
 	
 	/**
 	 * Spawn control tower.
-	 * @param Id
 	 */
-	private void spawnControlTower(int Id)
+	private void spawnControlTower()
 	{
-		// Set control tower array size if one does not exist
-		if (_controlTowers == null)
+		for (TowerSpawn ts : SiegeManager.getInstance().getControlTowers(getCastle().getCastleId()))
 		{
-			_controlTowers = new ArrayList<>();
-		}
-		
-		for (SiegeSpawn _sp : SiegeManager.getInstance().getControlTowerSpawnList(Id))
-		{
-			L2ControlTowerInstance ct;
-			
-			L2NpcTemplate template = NpcTable.getInstance().getTemplate(_sp.getNpcId());
-			
-			ct = new L2ControlTowerInstance(IdFactory.getInstance().getNextId(), template);
-			
-			ct.setCurrentHpMp(_sp.getHp(), ct.getMaxMp());
-			ct.spawnMe(_sp.getLocation().getX(), _sp.getLocation().getY(), _sp.getLocation().getZ() + 20);
-			_controlTowerCount++;
-			_controlTowerMaxCount++;
-			_controlTowers.add(ct);
+			try
+			{
+				final L2Spawn spawn = new L2Spawn(NpcTable.getInstance().getTemplate(ts.getNpcId()));
+				spawn.setLocation(ts.getLocation());
+				_controlTowers.add((L2ControlTowerInstance) spawn.doSpawn());
+			}
+			catch (Exception e)
+			{
+				_log.warning(getClass().getName() + ": Cannot spawn control tower! " + e);
+			}
 		}
+		_controlTowerCount = _controlTowers.size();
 	}
 	
 	/**
 	 * Spawn flame tower.
-	 * @param Id
 	 */
-	private void spawnFlameTower(int Id)
+	private void spawnFlameTower()
 	{
-		// Set control tower array size if one does not exist
-		if (_flameTowers == null)
+		for (TowerSpawn ts : SiegeManager.getInstance().getFlameTowers(getCastle().getCastleId()))
 		{
-			_flameTowers = new ArrayList<>();
-		}
-		
-		for (SiegeSpawn _sp : SiegeManager.getInstance().getFlameTowerSpawnList(Id))
-		{
-			L2FlameTowerInstance ct;
-			
-			L2NpcTemplate template = NpcTable.getInstance().getTemplate(_sp.getNpcId());
-			
-			// TODO: Check/confirm if control towers have any special weapon resistances/vulnerabilities
-			// template.addVulnerability(Stats.BOW_WPN_VULN,0);
-			// template.addVulnerability(Stats.BLUNT_WPN_VULN,0);
-			// template.addVulnerability(Stats.DAGGER_WPN_VULN,0);
-			
-			ct = new L2FlameTowerInstance(IdFactory.getInstance().getNextId(), template);
-			
-			ct.setCurrentHpMp(_sp.getHp(), ct.getMaxMp());
-			ct.spawnMe(_sp.getLocation().getX(), _sp.getLocation().getY(), _sp.getLocation().getZ() + 20);
-			_flameTowerCount++;
-			_flameTowerMaxCount++;
-			_flameTowers.add(ct);
-		}
-		if (_flameTowerCount == 0)
-		{
-			_flameTowerCount = 1;
+			try
+			{
+				final L2Spawn spawn = new L2Spawn(NpcTable.getInstance().getTemplate(ts.getNpcId()));
+				spawn.setLocation(ts.getLocation());
+				final L2FlameTowerInstance tower = (L2FlameTowerInstance) spawn.doSpawn();
+				tower.setUpgradeLevel(ts.getUpgradeLevel());
+				tower.setZoneList(ts.getZoneList());
+				_flameTowers.add(tower);
+			}
+			catch (Exception e)
+			{
+				_log.warning(getClass().getName() + ": Cannot spawn flame tower! " + e);
+			}
 		}
 	}
 	
@@ -1587,7 +1522,7 @@ public class Siege implements Siegable
 		
 		// Register guard to the closest Control Tower
 		// When CT dies, so do all the guards that it controls
-		if (!getSiegeGuardManager().getSiegeGuardSpawn().isEmpty() && !_controlTowers.isEmpty())
+		if (!getSiegeGuardManager().getSiegeGuardSpawn().isEmpty())
 		{
 			L2ControlTowerInstance closestCt;
 			int x, y, z;
@@ -1670,11 +1605,11 @@ public class Siege implements Siegable
 	
 	public final Castle getCastle()
 	{
-		if ((_castle == null) || (_castle.length <= 0))
+		if (_castle == null)
 		{
 			return null;
 		}
-		return _castle[0];
+		return _castle;
 	}
 	
 	@Override
@@ -1799,38 +1734,6 @@ public class Siege implements Siegable
 		return _controlTowerCount;
 	}
 	
-	/**
-	 * TODO: Use it.
-	 * @return the max count of control type towers.
-	 */
-	public int getControlTowerMaxCount()
-	{
-		return _controlTowerMaxCount;
-	}
-	
-	/**
-	 * TODO: Use it.
-	 * @return the max count of flame type towers.
-	 */
-	public int getFlameTowerMaxCount()
-	{
-		return _flameTowerMaxCount;
-	}
-	
-	public void disableTraps()
-	{
-		_flameTowerCount--;
-	}
-	
-	/**
-	 * @return boolean - traps are active
-	 */
-	public boolean isTrapsActive()
-	{
-		// return true;
-		return _flameTowerCount > 0;
-	}
-	
 	@Override
 	public boolean giveFame()
 	{

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

@@ -61,6 +61,7 @@ public abstract class L2ZoneType
 	private Map<QuestEventType, List<Quest>> _questEvents;
 	private InstanceType _target = InstanceType.L2Character; // default all chars
 	private boolean _allowStore;
+	private boolean _enabled;
 	private AbstractZoneSettings _settings;
 	
 	protected L2ZoneType(int id)
@@ -77,6 +78,7 @@ public abstract class L2ZoneType
 		_race = null;
 		_class = null;
 		_allowStore = true;
+		_enabled = true;
 	}
 	
 	/**
@@ -188,6 +190,10 @@ public abstract class L2ZoneType
 		{
 			_allowStore = Boolean.parseBoolean(value);
 		}
+		else if (name.equals("default_enabled"))
+		{
+			_enabled = Boolean.parseBoolean(value);
+		}
 		else
 		{
 			_log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId());
@@ -601,4 +607,14 @@ public abstract class L2ZoneType
 	{
 		getZone().visualizeZone(z);
 	}
-}
+	
+	public void setEnabled(boolean state)
+	{
+		_enabled = state;
+	}
+	
+	public boolean isEnabled()
+	{
+		return _enabled;
+	}
+}

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

@@ -42,7 +42,6 @@ import com.l2jserver.util.L2FastList;
 public class L2BossZone extends L2ZoneType
 {
 	private int _timeInvade;
-	private boolean _enabled = true; // default value, unless overridden by xml...
 	
 	private int[] _oustLoc =
 	{
@@ -121,10 +120,6 @@ public class L2BossZone extends L2ZoneType
 		{
 			_timeInvade = Integer.parseInt(value);
 		}
-		else if (name.equals("default_enabled"))
-		{
-			_enabled = Boolean.parseBoolean(value);
-		}
 		else if (name.equals("oustX"))
 		{
 			_oustLoc[0] = Integer.parseInt(value);
@@ -155,7 +150,7 @@ public class L2BossZone extends L2ZoneType
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		if (_enabled)
+		if (isEnabled())
 		{
 			if (character.isPlayer())
 			{
@@ -231,7 +226,7 @@ public class L2BossZone extends L2ZoneType
 	@Override
 	protected void onExit(L2Character character)
 	{
-		if (_enabled)
+		if (isEnabled())
 		{
 			if (character.isPlayer())
 			{
@@ -305,14 +300,14 @@ public class L2BossZone extends L2ZoneType
 		}
 	}
 	
-	public void setZoneEnabled(boolean flag)
+	@Override
+	public void setEnabled(boolean flag)
 	{
-		if (_enabled != flag)
+		if (isEnabled() != flag)
 		{
 			oustAllPlayers();
 		}
-		
-		_enabled = flag;
+		super.setEnabled(flag);
 	}
 	
 	public int getTimeInvade()

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

@@ -45,8 +45,6 @@ public class L2DamageZone extends L2ZoneType
 	private int _startTask;
 	private int _reuseTask;
 	
-	protected boolean _enabled;
-	
 	public L2DamageZone(int id)
 	{
 		super(id);
@@ -63,9 +61,6 @@ public class L2DamageZone extends L2ZoneType
 		_castleId = 0;
 		_castle = null;
 		
-		// enabled by default
-		_enabled = true;
-		
 		setTargetType(InstanceType.L2Playable); // default only playabale
 		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
 		if (settings == null)
@@ -104,10 +99,6 @@ public class L2DamageZone extends L2ZoneType
 		{
 			_reuseTask = Integer.parseInt(value);
 		}
-		else if (name.equalsIgnoreCase("default_enabled"))
-		{
-			_enabled = Boolean.parseBoolean(value);
-		}
 		else
 		{
 			super.setParameter(name, value);
@@ -143,7 +134,7 @@ public class L2DamageZone extends L2ZoneType
 	{
 		if (_characterList.isEmpty() && (getSettings().getTask() != null))
 		{
-			stopTask();
+			getSettings().clear();
 		}
 	}
 	
@@ -157,14 +148,6 @@ public class L2DamageZone extends L2ZoneType
 		return _damageMPPerSec;
 	}
 	
-	protected void stopTask()
-	{
-		if (getSettings().getTask() != null)
-		{
-			getSettings().getTask().cancel(false);
-		}
-	}
-	
 	protected Castle getCastle()
 	{
 		if ((_castleId > 0) && (_castle == null))
@@ -189,7 +172,7 @@ public class L2DamageZone extends L2ZoneType
 		@Override
 		public void run()
 		{
-			if (!_enabled)
+			if (!isEnabled())
 			{
 				return;
 			}
@@ -202,7 +185,7 @@ public class L2DamageZone extends L2ZoneType
 				// castle zones active only during siege
 				if (!siege)
 				{
-					_dmgZone.stopTask();
+					_dmgZone.getSettings().clear();
 					return;
 				}
 			}
@@ -236,11 +219,6 @@ public class L2DamageZone extends L2ZoneType
 		}
 	}
 	
-	public void setEnabled(boolean state)
-	{
-		_enabled = state;
-	}
-	
 	@Override
 	public void onDieInside(L2Character character)
 	{

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

@@ -45,7 +45,6 @@ public class L2EffectZone extends L2ZoneType
 	private int _chance;
 	private int _initialDelay;
 	private int _reuse;
-	private boolean _enabled;
 	protected boolean _bypassConditions;
 	private boolean _isShowDangerIcon;
 	protected FastMap<Integer, Integer> _skills;
@@ -56,7 +55,6 @@ public class L2EffectZone extends L2ZoneType
 		_chance = 100;
 		_initialDelay = 0;
 		_reuse = 30000;
-		_enabled = true;
 		setTargetType(InstanceType.L2Playable); // default only playabale
 		_bypassConditions = false;
 		_isShowDangerIcon = true;
@@ -85,10 +83,6 @@ public class L2EffectZone extends L2ZoneType
 		{
 			_initialDelay = Integer.parseInt(value);
 		}
-		else if (name.equals("default_enabled"))
-		{
-			_enabled = Boolean.parseBoolean(value);
-		}
 		else if (name.equals("reuse"))
 		{
 			_reuse = Integer.parseInt(value);
@@ -191,11 +185,6 @@ public class L2EffectZone extends L2ZoneType
 		return SkillTable.getInstance().getInfo(skillId, skillLvl);
 	}
 	
-	public boolean isEnabled()
-	{
-		return _enabled;
-	}
-	
 	public int getChance()
 	{
 		return _chance;
@@ -237,11 +226,6 @@ public class L2EffectZone extends L2ZoneType
 		}
 	}
 	
-	public void setZoneEnabled(boolean val)
-	{
-		_enabled = val;
-	}
-	
 	public int getSkillLevel(int skillId)
 	{
 		if ((_skills == null) || !_skills.containsKey(skillId))

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

@@ -81,7 +81,7 @@ public class L2SwampZone extends L2ZoneType
 		if (getCastle() != null)
 		{
 			// castle zones active only during siege
-			if (!getCastle().getSiege().getIsInProgress() || !getCastle().getSiege().isTrapsActive())
+			if (!getCastle().getSiege().getIsInProgress() || !isEnabled())
 			{
 				return;
 			}
@@ -129,4 +129,4 @@ public class L2SwampZone extends L2ZoneType
 	public void onReviveInside(L2Character character)
 	{
 	}
-}
+}

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

@@ -29,8 +29,6 @@ import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager.CropProcure;
 import com.l2jserver.gameserver.model.L2Clan;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.instance.L2CastleChamberlainInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.util.Util;
@@ -96,24 +94,7 @@ public class RequestSetCrop extends L2GameClientPacket
 			return;
 		}
 		
-		L2Object manager = player.getTarget();
-		
-		if (!(manager instanceof L2CastleChamberlainInstance))
-		{
-			manager = player.getLastFolkNPC();
-		}
-		
-		if (!(manager instanceof L2CastleChamberlainInstance))
-		{
-			return;
-		}
-		
-		if (((L2CastleChamberlainInstance) manager).getCastle() != currentCastle)
-		{
-			return;
-		}
-		
-		if (!player.isInsideRadius(manager, INTERACTION_DISTANCE, true, false))
+		if (!player.isInsideRadius(player.getLastFolkNPC(), INTERACTION_DISTANCE, true, false))
 		{
 			return;
 		}

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

@@ -29,8 +29,6 @@ import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager.SeedProduction;
 import com.l2jserver.gameserver.model.L2Clan;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.instance.L2CastleChamberlainInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.util.Util;
@@ -95,24 +93,7 @@ public class RequestSetSeed extends L2GameClientPacket
 			return;
 		}
 		
-		L2Object manager = player.getTarget();
-		
-		if (!(manager instanceof L2CastleChamberlainInstance))
-		{
-			manager = player.getLastFolkNPC();
-		}
-		
-		if (!(manager instanceof L2CastleChamberlainInstance))
-		{
-			return;
-		}
-		
-		if (((L2CastleChamberlainInstance) manager).getCastle() != currentCastle)
-		{
-			return;
-		}
-		
-		if (!player.isInsideRadius(manager, INTERACTION_DISTANCE, true, false))
+		if (!player.isInsideRadius(player.getLastFolkNPC(), INTERACTION_DISTANCE, true, false))
 		{
 			return;
 		}