Do not start disabled sieges.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -84,6 +84,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -225,28 +252,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -81,6 +81,34 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	private final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	private SiegeGuardManager _siegeGuardManager;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		_siegeGuardManager = new SiegeGuardManager(getCastle());
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -222,30 +250,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	private final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	private SiegeGuardManager _siegeGuardManager;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		_siegeGuardManager = new SiegeGuardManager(getCastle());
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -82,6 +82,34 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	private final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	private SiegeGuardManager _siegeGuardManager;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		_siegeGuardManager = new SiegeGuardManager(getCastle());
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -223,30 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	private final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	private SiegeGuardManager _siegeGuardManager;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		_siegeGuardManager = new SiegeGuardManager(getCastle());
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -82,6 +82,34 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	private final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	private SiegeGuardManager _siegeGuardManager;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		_siegeGuardManager = new SiegeGuardManager(getCastle());
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -223,30 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	private final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	private SiegeGuardManager _siegeGuardManager;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		_siegeGuardManager = new SiegeGuardManager(getCastle());
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -83,6 +83,33 @@ public class Siege implements Siegable
 	
 	private int _controlTowerCount;
 	
+	// must support Concurrent Modifications
+	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
+	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
+	
+	// Castle setting
+	private final List<ControlTower> _controlTowers = new ArrayList<>();
+	private final List<FlameTower> _flameTowers = new ArrayList<>();
+	final Castle _castle;
+	boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle)
+	{
+		_castle = castle;
+		
+		final SiegeScheduleDate schedule = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
+		if ((schedule != null) && schedule.siegeEnabled())
+		{
+			startAutoTask();
+		}
+	}
+	
 	public class ScheduleEndSiegeTask implements Runnable
 	{
 		private final Castle _castleInst;
@@ -224,28 +251,6 @@ public class Siege implements Siegable
 		}
 	}
 	
-	// must support Concurrent Modifications
-	private final Collection<SiegeClan> _attackerClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderClans = ConcurrentHashMap.newKeySet();
-	private final Collection<SiegeClan> _defenderWaitingClans = ConcurrentHashMap.newKeySet();
-	
-	// Castle setting
-	private final List<ControlTower> _controlTowers = new ArrayList<>();
-	private final List<FlameTower> _flameTowers = new ArrayList<>();
-	final Castle _castle;
-	boolean _isInProgress = false;
-	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
-	protected boolean _isRegistrationOver = false;
-	protected Calendar _siegeEndDate;
-	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
-	protected int _firstOwnerClanId = -1;
-	
-	public Siege(Castle castle)
-	{
-		_castle = castle;
-		startAutoTask();
-	}
-	
 	@Override
 	public void endSiege()
 	{