BETA: Renaming `getIsInProgress` to `isInProgress` within !Fort/Castle/Territory war sieges.

	* Also minor javadocs/spelling fixes.
	* Reviewed by: Nos, Zoey76

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

@@ -96,7 +96,7 @@ public final class FortSiegeManager
 		{
 			text = "You must be on fort ground to summon this";
 		}
-		else if (!fort.getSiege().getIsInProgress())
+		else if (!fort.getSiege().isInProgress())
 		{
 			text = "You can only summon this during a siege.";
 		}
@@ -373,7 +373,7 @@ public final class FortSiegeManager
 			player.sendPacket(sm);
 			return false;
 		}
-		else if (!fort.getSiege().getIsInProgress())
+		else if (!fort.getSiege().isInProgress())
 		{
 			player.sendPacket(sm);
 			return false;
@@ -397,7 +397,7 @@ public final class FortSiegeManager
 			if (cf.getPlayerObjectId() == player.getObjectId())
 			{
 				cf.dropIt();
-				if (fort.getSiege().getIsInProgress())
+				if (fort.getSiege().isInProgress())
 				{
 					cf.spawnMe();
 				}

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

@@ -283,7 +283,7 @@ public final class MapRegionManager extends DocumentParser
 					if (castle == null)
 					{
 						castle = CastleManager.getInstance().getCastle(player);
-						if (!((castle != null) && castle.getSiege().getIsInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null)))
+						if (!((castle != null) && castle.getSiege().isInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null)))
 						{
 							castle = null;
 						}
@@ -308,7 +308,7 @@ public final class MapRegionManager extends DocumentParser
 					if (fort == null)
 					{
 						fort = FortManager.getInstance().getFort(player);
-						if (!((fort != null) && fort.getSiege().getIsInProgress() && (fort.getOwnerClan() == player.getClan())))
+						if (!((fort != null) && fort.getSiege().isInProgress() && (fort.getOwnerClan() == player.getClan())))
 						{
 							fort = null;
 						}
@@ -337,7 +337,7 @@ public final class MapRegionManager extends DocumentParser
 					}
 					else if (castle != null)
 					{
-						if (castle.getSiege().getIsInProgress())
+						if (castle.getSiege().isInProgress())
 						{
 							// Check if player's clan is attacker
 							List<L2Npc> flags = castle.getSiege().getFlag(player.getClan());
@@ -351,7 +351,7 @@ public final class MapRegionManager extends DocumentParser
 					}
 					else if (fort != null)
 					{
-						if (fort.getSiege().getIsInProgress())
+						if (fort.getSiege().isInProgress())
 						{
 							// Check if player's clan is attacker
 							List<L2Npc> flags = fort.getSiege().getFlag(player.getClan());
@@ -425,7 +425,7 @@ public final class MapRegionManager extends DocumentParser
 			castle = CastleManager.getInstance().getCastle(player);
 			if (castle != null)
 			{
-				if (castle.getSiege().getIsInProgress())
+				if (castle.getSiege().isInProgress())
 				{
 					// Check if player's clan is participating
 					if ((castle.getSiege().checkIsDefender(player.getClan()) || castle.getSiege().checkIsAttacker(player.getClan())) && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DAWN))

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

@@ -187,7 +187,7 @@ public final class MercTicketManager
 					if (NPC_IDS[i] == npcId) // Find the index of the item used
 					{
 						// only handle tickets if a siege is not ongoing in this npc's castle
-						if ((castle != null) && !(castle.getSiege().getIsInProgress()))
+						if ((castle != null) && !(castle.getSiege().isInProgress()))
 						{
 							itemId = ITEM_IDS[i];
 							// create the ticket in the gameworld

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

@@ -94,7 +94,7 @@ public final class SiegeManager
 		{
 			text = "You must be on castle ground to summon this";
 		}
-		else if (!castle.getSiege().getIsInProgress())
+		else if (!castle.getSiege().isInProgress())
 		{
 			text = "You can only summon this during a siege.";
 		}

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

@@ -1730,7 +1730,7 @@ public final class TerritoryWarManager implements Siegable
 			return ret;
 		}
 		
-		public boolean getIsInProgress()
+		public boolean isInProgress()
 		{
 			return _isInProgress;
 		}

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

@@ -60,7 +60,7 @@ public final class TownManager
 			Castle castle = CastleManager.getInstance().getCastles().get(CastleManager.getInstance().getCastleIndex(castleIndex));
 			if (castle != null)
 			{
-				return castle.getSiege().getIsInProgress();
+				return castle.getSiege().isInProgress();
 			}
 		}
 		return false;

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

@@ -40,14 +40,14 @@ public abstract class L2Tower extends L2Npc
 	public boolean canBeAttacked()
 	{
 		// Attackable during siege by attacker only
-		return ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().getIsInProgress());
+		return ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress());
 	}
 	
 	@Override
 	public boolean isAutoAttackable(L2Character attacker)
 	{
 		// Attackable during siege by attacker only
-		return ((attacker != null) && attacker.isPlayer() && (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().getIsInProgress() && getCastle().getSiege().checkIsAttacker(((L2PcInstance) attacker).getClan()));
+		return ((attacker != null) && attacker.isPlayer() && (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress() && getCastle().getSiege().checkIsAttacker(((L2PcInstance) attacker).getClan()));
 	}
 	
 	@Override

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

@@ -680,7 +680,7 @@ public final class L2AuctioneerInstance extends L2Npc
 	{
 		if ((getCastle() != null) && (getCastle().getResidenceId() > 0))
 		{
-			if (getCastle().getSiege().getIsInProgress())
+			if (getCastle().getSiege().isInProgress())
 			{
 				return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
 			}

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

@@ -45,7 +45,7 @@ public class L2ControlTowerInstance extends L2Tower
 	@Override
 	public boolean doDie(L2Character killer)
 	{
-		if (getCastle().getSiege().getIsInProgress())
+		if (getCastle().getSiege().isInProgress())
 		{
 			getCastle().getSiege().killedCT(this);
 			

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

@@ -696,8 +696,8 @@ public class L2DoorInstance extends L2Character
 			return false;
 		}
 		
-		boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().getIsInProgress());
-		boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().getIsInProgress());
+		boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress());
+		boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress());
 		boolean isHall = ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).isInSiege());
 		
 		if (isFort || isCastle || isHall)

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

@@ -59,7 +59,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance
 			return false;
 		}
 		
-		boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().getIsInProgress() && !getFort().getSiege().checkIsDefender(((L2PcInstance) attacker).getClan()));
+		boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress() && !getFort().getSiege().checkIsDefender(((L2PcInstance) attacker).getClan()));
 		
 		// Attackable during siege by all except defenders
 		return (isFort);
@@ -87,7 +87,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance
 			return false;
 		}
 		
-		if (getFort().getSiege().getIsInProgress())
+		if (getFort().getSiege().isInProgress())
 		{
 			getFort().getSiege().killedCommander(this);
 			

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

@@ -137,7 +137,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 		{
 			if (isMyLord(player))
 			{
-				if (getFort().getSiege().getIsInProgress())
+				if (getFort().getSiege().isInProgress())
 				{
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-siege.htm");
 				}

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

@@ -8816,14 +8816,14 @@ public final class L2PcInstance extends L2Playable
 		{
 			if ((((L2DoorInstance) target).getCastle() != null) && (((L2DoorInstance) target).getCastle().getResidenceId() > 0)) // If its castle door
 			{
-				if (!((L2DoorInstance) target).getCastle().getSiege().getIsInProgress())
+				if (!((L2DoorInstance) target).getCastle().getSiege().isInProgress())
 				{
 					return false;
 				}
 			}
 			else if ((((L2DoorInstance) target).getFort() != null) && (((L2DoorInstance) target).getFort().getResidenceId() > 0) && !((L2DoorInstance) target).getIsShowHp()) // If its fort door
 			{
-				if (!((L2DoorInstance) target).getFort().getSiege().getIsInProgress())
+				if (!((L2DoorInstance) target).getFort().getSiege().isInProgress())
 				{
 					return false;
 				}

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

@@ -101,19 +101,6 @@ public class L2SiegeFlagInstance extends L2Npc
 		setIsInvul(false);
 	}
 	
-	/**
-	 * Use L2SiegeFlagInstance(L2PcInstance, int, L2NpcTemplate, boolean) instead
-	 * @param player
-	 * @param objectId
-	 * @param template
-	 */
-	@Deprecated
-	public L2SiegeFlagInstance(L2PcInstance player, int objectId, L2NpcTemplate template)
-	{
-		super(objectId, template);
-		_isAdvanced = false;
-	}
-	
 	@Override
 	public boolean canBeAttacked()
 	{
@@ -205,7 +192,7 @@ public class L2SiegeFlagInstance extends L2Npc
 		super.reduceCurrentHp(damage, attacker, skill);
 		if (canTalk())
 		{
-			if (((getCastle() != null) && getCastle().getSiege().getIsInProgress()) || ((getFort() != null) && getFort().getSiege().getIsInProgress()) || ((getConquerableHall() != null) && getConquerableHall().isInSiege()))
+			if (((getCastle() != null) && getCastle().getSiege().isInProgress()) || ((getFort() != null) && getFort().getSiege().isInProgress()) || ((getConquerableHall() != null) && getConquerableHall().isInSiege()))
 			{
 				if (_clan != null)
 				{

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

@@ -327,7 +327,7 @@ public final class L2TeleporterInstance extends L2Npc
 			return COND_REGULAR; // Regular access
 		}
 		// Teleporter is on castle ground and siege is in progress
-		else if (getCastle().getSiege().getIsInProgress())
+		else if (getCastle().getSiege().isInProgress())
 		{
 			return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
 		}

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

@@ -62,7 +62,7 @@ public class ConditionPlayerCanCreateBase extends Condition
 			player.sendPacket(sm);
 			canCreateBase = false;
 		}
-		else if (((castle != null) && !castle.getSiege().getIsInProgress()) || ((fort != null) && !fort.getSiege().getIsInProgress()))
+		else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress()))
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			sm.addSkillName(env.getSkill());

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

@@ -62,7 +62,7 @@ public class ConditionPlayerCanSummonSiegeGolem extends Condition
 			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
 			canSummonSiegeGolem = false;
 		}
-		else if (((castle != null) && !castle.getSiege().getIsInProgress()) || ((fort != null) && !fort.getSiege().getIsInProgress()))
+		else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress()))
 		{
 			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
 			canSummonSiegeGolem = false;

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

@@ -53,7 +53,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
 		
 		Castle castle = CastleManager.getInstance().getCastle(env.getPlayer());
 		SystemMessage sm;
-		if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().getIsInProgress() || (castle.getSiege().getAttackerClan(env.getPlayer().getClan()) == null))
+		if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(env.getPlayer().getClan()) == null))
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			sm.addSkillName(env.getSkill());

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

@@ -49,7 +49,7 @@ public class ConditionPlayerCanTakeFort extends Condition
 		
 		final Fort fort = FortManager.getInstance().getFort(env.getPlayer());
 		final SystemMessage sm;
-		if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().getIsInProgress() || (fort.getSiege().getAttackerClan(env.getPlayer().getClan()) == null))
+		if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(env.getPlayer().getClan()) == null))
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			sm.addSkillName(env.getSkill());

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

@@ -549,7 +549,7 @@ public final class Castle extends AbstractResidence
 			FortManager.getInstance().getFortByOwner(clan).removeOwner(true);
 		}
 		
-		if (getSiege().getIsInProgress())
+		if (getSiege().isInProgress())
 		{
 			getSiege().midVictory(); // Mid victory phase of siege
 		}
@@ -585,7 +585,7 @@ public final class Castle extends AbstractResidence
 		}
 		
 		updateOwnerInDB(null);
-		if (getSiege().getIsInProgress())
+		if (getSiege().isInProgress())
 		{
 			getSiege().midVictory();
 		}

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

@@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence
 		updateOwnerInDB(); // Update in database
 		saveFortVariables();
 		
-		if (getSiege().getIsInProgress())
+		if (getSiege().isInProgress())
 		{
 			getSiege().endSiege();
 		}

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

@@ -77,7 +77,7 @@ public class FortSiege implements Siegable
 		@Override
 		public void run()
 		{
-			if (!getIsInProgress())
+			if (!isInProgress())
 			{
 				return;
 			}
@@ -108,7 +108,7 @@ public class FortSiege implements Siegable
 		@Override
 		public void run()
 		{
-			if (getIsInProgress())
+			if (isInProgress())
 			{
 				return;
 			}
@@ -191,7 +191,7 @@ public class FortSiege implements Siegable
 		@Override
 		public void run()
 		{
-			if (getIsInProgress())
+			if (isInProgress())
 			{
 				return;
 			}
@@ -212,7 +212,7 @@ public class FortSiege implements Siegable
 		@Override
 		public void run()
 		{
-			if (!getIsInProgress())
+			if (!isInProgress())
 			{
 				return;
 			}
@@ -250,13 +250,12 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * When siege ends<BR>
-	 * <BR>
+	 * When siege ends.
 	 */
 	@Override
 	public void endSiege()
 	{
-		if (getIsInProgress())
+		if (isInProgress())
 		{
 			_isInProgress = false; // Flag so that siege instance can be started
 			removeFlags(); // Removes all flags. Note: Remove flag before teleporting players
@@ -307,13 +306,12 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * When siege starts<BR>
-	 * <BR>
+	 * When siege starts
 	 */
 	@Override
 	public void startSiege()
 	{
-		if (!getIsInProgress())
+		if (!isInProgress())
 		{
 			if (!fireFortSiegeEventListeners(EventStage.START))
 			{
@@ -359,8 +357,7 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Announce to player.<BR>
-	 * <BR>
+	 * Announce to player.
 	 * @param sm the system message to send to player
 	 */
 	public void announceToPlayer(SystemMessage sm)
@@ -479,7 +476,7 @@ public class FortSiege implements Siegable
 	 */
 	public boolean checkIfInZone(int x, int y, int z)
 	{
-		return (getIsInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege
+		return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege
 	}
 	
 	/**
@@ -528,7 +525,7 @@ public class FortSiege implements Siegable
 			getAttackerClans().clear();
 			
 			// if siege is in progress, end siege
-			if (getIsInProgress())
+			if (isInProgress())
 			{
 				endSiege();
 			}
@@ -619,6 +616,7 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
+	 * TODO: To DP AI<br>
 	 * Commander was killed
 	 * @param instance
 	 */
@@ -722,11 +720,11 @@ public class FortSiege implements Siegable
 	 * @param player The L2PcInstance of the player trying to register.
 	 * @param checkConditions True if should be checked conditions, false otherwise
 	 * @return Number that defines what happened. <BR>
-	 *         0 - Player dont have clan.<BR>
-	 *         1 - Player dont havee enough adena to register.<BR>
+	 *         0 - Player don't have clan.<BR>
+	 *         1 - Player don't have enough adena to register.<BR>
 	 *         2 - Is not right time to register Fortress now.<BR>
-	 *         3 - Players clan is already registred to siege.<BR>
-	 *         4 - Players clan is successfully registred to siege.
+	 *         3 - Players clan is already registered to siege.<BR>
+	 *         4 - Players clan is successfully registered to siege.
 	 */
 	public int addAttacker(L2PcInstance player, boolean checkConditions)
 	{
@@ -759,7 +757,7 @@ public class FortSiege implements Siegable
 					return 3; // Players clan is already registred to siege
 				}
 				
-				if ((fort.getOwnerClan() == player.getClan()) && (fort.getSiege().getIsInProgress() || (fort.getSiege()._siegeStartTask != null)))
+				if ((fort.getOwnerClan() == player.getClan()) && (fort.getSiege().isInProgress() || (fort.getSiege()._siegeStartTask != null)))
 				{
 					return 3; // Players clan is already registred to siege
 				}
@@ -779,7 +777,7 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Remove clan from siege<BR>
+	 * Remove clan from siege
 	 * @param clan The clan being removed
 	 */
 	public void removeAttacker(L2Clan clan)
@@ -792,10 +790,8 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Remove clan from siege<BR>
-	 * <BR>
 	 * This function does not do any checks and should not be called from bypass !
-	 * @param clanId The int of player's clan id
+	 * @param clanId
 	 */
 	private void removeSiegeClan(int clanId)
 	{
@@ -813,7 +809,7 @@ public class FortSiege implements Siegable
 			loadSiegeClan();
 			if (getAttackerClans().isEmpty())
 			{
-				if (getIsInProgress())
+				if (isInProgress())
 				{
 					endSiege();
 				}
@@ -836,8 +832,7 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Start the auto tasks<BR>
-	 * <BR>
+	 * Start the auto tasks
 	 */
 	public void checkAutoTask()
 	{
@@ -897,8 +892,7 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Start the auto tasks<BR>
-	 * <BR>
+	 * Start the auto task
 	 * @param setTime
 	 */
 	public void startAutoTask(boolean setTime)
@@ -954,9 +948,8 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Add clan as attacker<BR>
-	 * <BR>
-	 * @param clanId The int of clan's id
+	 * Add clan as attacker<
+	 * @param clanId
 	 */
 	private void addAttacker(int clanId)
 	{
@@ -964,8 +957,8 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * @param clan The L2Clan of the player trying to register
-	 * @return true if the clan has already registered to a siege for the same day.
+	 * @param clan
+	 * @return {@code true} if the clan has already registered to a siege for the same day, {@code false} otherwise.
 	 */
 	public boolean checkIfAlreadyRegisteredForSameDay(L2Clan clan)
 	{
@@ -1086,9 +1079,8 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Save registration to database.<BR>
-	 * <BR>
-	 * @param clan The L2Clan of player
+	 * Save registration to database.
+	 * @param clan
 	 */
 	private void saveSiegeClan(L2Clan clan)
 	{
@@ -1172,8 +1164,7 @@ public class FortSiege implements Siegable
 	}
 	
 	/**
-	 * Spawn siege guard.<BR>
-	 * <BR>
+	 * Spawn siege guard.
 	 */
 	private void spawnSiegeGuard()
 	{
@@ -1216,7 +1207,7 @@ public class FortSiege implements Siegable
 		return _fort;
 	}
 	
-	public final boolean getIsInProgress()
+	public final boolean isInProgress()
 	{
 		return _isInProgress;
 	}

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

@@ -95,7 +95,7 @@ public class Siege implements Siegable
 		@Override
 		public void run()
 		{
-			if (!getIsInProgress())
+			if (!isInProgress())
 			{
 				return;
 			}
@@ -163,7 +163,7 @@ public class Siege implements Siegable
 		public void run()
 		{
 			_scheduledStartSiegeTask.cancel(false);
-			if (getIsInProgress())
+			if (isInProgress())
 			{
 				return;
 			}
@@ -251,7 +251,7 @@ public class Siege implements Siegable
 	@Override
 	public void endSiege()
 	{
-		if (getIsInProgress())
+		if (isInProgress())
 		{
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_OF_S1_HAS_ENDED);
 			sm.addCastleId(getCastle().getResidenceId());
@@ -380,7 +380,7 @@ public class Siege implements Siegable
 	 */
 	public void midVictory()
 	{
-		if (getIsInProgress()) // Siege still in progress
+		if (isInProgress()) // Siege still in progress
 		{
 			if (getCastle().getOwnerId() > 0)
 			{
@@ -474,7 +474,7 @@ public class Siege implements Siegable
 	@Override
 	public void startSiege()
 	{
-		if (!getIsInProgress())
+		if (!isInProgress())
 		{
 			if (!fireSiegeListeners(EventStage.START))
 			{
@@ -699,7 +699,7 @@ public class Siege implements Siegable
 	 */
 	public boolean checkIfInZone(int x, int y, int z)
 	{
-		return (getIsInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege
+		return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege
 	}
 	
 	/**
@@ -1170,7 +1170,7 @@ public class Siege implements Siegable
 			sm.addCastleId(getCastle().getResidenceId());
 			player.sendPacket(sm);
 		}
-		else if (getIsInProgress())
+		else if (isInProgress())
 		{
 			player.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
 		}
@@ -1696,7 +1696,7 @@ public class Siege implements Siegable
 		return _defenderWaitingClans;
 	}
 	
-	public final boolean getIsInProgress()
+	public final boolean isInProgress()
 	{
 		return _isInProgress;
 	}

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

@@ -561,7 +561,7 @@ public final class Formulas
 		}
 		
 		Siege siege = SiegeManager.getInstance().getSiege(activeChar.getX(), activeChar.getY(), activeChar.getZ());
-		if ((siege == null) || !siege.getIsInProgress())
+		if ((siege == null) || !siege.isInProgress())
 		{
 			return 0;
 		}

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

@@ -113,7 +113,7 @@ public class L2DamageZone extends L2ZoneType
 			L2PcInstance player = character.getActingPlayer();
 			if (getCastle() != null) // Castle zone
 			{
-				if (!(getCastle().getSiege().getIsInProgress() && (player != null) && (player.getSiegeState() != 2))) // Siege and no defender
+				if (!(getCastle().getSiege().isInProgress() && (player != null) && (player.getSiegeState() != 2))) // Siege and no defender
 				{
 					return;
 				}
@@ -181,7 +181,7 @@ public class L2DamageZone extends L2ZoneType
 			
 			if (_castle != null)
 			{
-				siege = _castle.getSiege().getIsInProgress();
+				siege = _castle.getSiege().isInProgress();
 				// castle zones active only during siege
 				if (!siege)
 				{

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() || !isEnabled())
+			if (!getCastle().getSiege().isInProgress() || !isEnabled())
 			{
 				return;
 			}

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

@@ -245,7 +245,7 @@ public class EnterWorld extends L2GameClientPacket
 			
 			for (Siege siege : SiegeManager.getInstance().getSieges())
 			{
-				if (!siege.getIsInProgress())
+				if (!siege.isInProgress())
 				{
 					continue;
 				}
@@ -265,7 +265,7 @@ public class EnterWorld extends L2GameClientPacket
 			
 			for (FortSiege siege : FortSiegeManager.getInstance().getSieges())
 			{
-				if (!siege.getIsInProgress())
+				if (!siege.isInProgress())
 				{
 					continue;
 				}

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

@@ -44,7 +44,7 @@ public class RequestFortressSiegeInfo extends L2GameClientPacket
 		{
 			for (Fort fort : FortManager.getInstance().getForts())
 			{
-				if ((fort != null) && fort.getSiege().getIsInProgress())
+				if ((fort != null) && fort.getSiege().isInProgress())
 				{
 					client.sendPacket(new ExShowFortressSiegeInfo(fort));
 				}

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

@@ -95,7 +95,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 		}
 		
 		Castle castle = CastleManager.getInstance().getCastle(activeChar.getX(), activeChar.getY(), activeChar.getZ());
-		if ((castle != null) && castle.getSiege().getIsInProgress())
+		if ((castle != null) && castle.getSiege().isInProgress())
 		{
 			if ((activeChar.getClan() != null) && castle.getSiege().checkIsAttacker(activeChar.getClan()))
 			{
@@ -151,7 +151,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 			{
 				castle = CastleManager.getInstance().getCastle(activeChar);
 				
-				if ((castle != null) && castle.getSiege().getIsInProgress())
+				if ((castle != null) && castle.getSiege().isInProgress())
 				{
 					// Siege in progress
 					if (castle.getSiege().checkIsDefender(activeChar.getClan()))
@@ -204,11 +204,11 @@ public final class RequestRestartPoint extends L2GameClientPacket
 				hall = CHSiegeManager.getInstance().getNearbyClanHall(activeChar);
 				L2SiegeFlagInstance flag = TerritoryWarManager.getInstance().getFlagForClan(activeChar.getClan());
 				
-				if ((castle != null) && castle.getSiege().getIsInProgress())
+				if ((castle != null) && castle.getSiege().isInProgress())
 				{
 					siegeClan = castle.getSiege().getAttackerClan(activeChar.getClan());
 				}
-				else if ((fort != null) && fort.getSiege().getIsInProgress())
+				else if ((fort != null) && fort.getSiege().isInProgress())
 				{
 					siegeClan = fort.getSiege().getAttackerClan(activeChar.getClan());
 				}

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

@@ -73,7 +73,7 @@ public class Die extends L2GameServerPacket
 			Castle castle = CastleManager.getInstance().getCastle(_activeChar);
 			Fort fort = FortManager.getInstance().getFort(_activeChar);
 			SiegableHall hall = CHSiegeManager.getInstance().getNearbyClanHall(_activeChar);
-			if ((castle != null) && castle.getSiege().getIsInProgress())
+			if ((castle != null) && castle.getSiege().isInProgress())
 			{
 				// siege in progress
 				siegeClan = castle.getSiege().getAttackerClan(_clan);
@@ -82,7 +82,7 @@ public class Die extends L2GameServerPacket
 					isInCastleDefense = true;
 				}
 			}
-			else if ((fort != null) && fort.getSiege().getIsInProgress())
+			else if ((fort != null) && fort.getSiege().isInProgress())
 			{
 				// siege in progress
 				siegeClan = fort.getSiege().getAttackerClan(_clan);

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

@@ -48,7 +48,7 @@ public class ExShowFortressInfo extends L2GameServerPacket
 			L2Clan clan = fort.getOwnerClan();
 			writeD(fort.getResidenceId());
 			writeS(clan != null ? clan.getName() : "");
-			writeD(fort.getSiege().getIsInProgress() ? 0x01 : 0x00);
+			writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00);
 			// Time of possession
 			writeD(fort.getOwnedTime());
 		}

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

@@ -44,11 +44,11 @@ public class ExShowFortressMapInfo extends L2GameServerPacket
 		writeH(0x7D);
 		
 		writeD(_fortress.getResidenceId());
-		writeD(_fortress.getSiege().getIsInProgress() ? 1 : 0); // fortress siege status
+		writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status
 		writeD(_fortress.getFortSize()); // barracks count
 		
 		FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
-		if ((commanders != null) && (commanders.size() != 0) && _fortress.getSiege().getIsInProgress())
+		if ((commanders != null) && (commanders.size() != 0) && _fortress.getSiege().isInProgress())
 		{
 			switch (commanders.size())
 			{