Properly named residence id getters.

L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java

@@ -39,8 +39,8 @@ public class Clan
 	private String _allyName;
 	private int _allyId;
 	private int _level;
-	private int _hasCastle;
+	private int _castleId;
-	private int _hasHideout;
+	private int _hideoutId;
 	
 	public int getClanId()
 	{
@@ -138,14 +138,14 @@ public class Clan
 		return _level;
 	}
 	
-	public int getHasCastle()
+	public int getCastleId()
 	{
-		return _hasCastle;
+		return _castleId;
 	}
 	
-	public int getHasHideout()
+	public int getHideoutId()
 	{
-		return _hasHideout;
+		return _hideoutId;
 	}
 	
 	public int getCrestId()
@@ -165,12 +165,12 @@ public class Clan
 	
 	public void setHasCastle(int hasCastle)
 	{
-		_hasCastle = hasCastle;
+		_castleId = hasCastle;
 	}
 	
 	public void setHasHideout(int hasHideout)
 	{
-		_hasHideout = hasHideout;
+		_hideoutId = hasHideout;
 	}
 	
 	public void setLevel(int level)
@@ -194,8 +194,8 @@ public class Clan
 			out.write(getClanId() + ";");
 			out.write(getName() + ";");
 			out.write(getLevel() + ";");
-			out.write(getHasCastle() + ";");
+			out.write(getCastleId() + ";");
-			out.write(getHasHideout() + ";");
+			out.write(getHideoutId() + ";");
 			out.write(getAllyId() + ";");
 			out.write("none\r\n");
 			out.write("#memberName;memberLevel;classId;objectId\r\n");

L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java

@@ -42,8 +42,8 @@ public class GMViewPledgeInfo extends ServerBasePacket
 		writeS(_clan.getLeaderName());
 		writeD(0);
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
+		writeD(_clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(0);
 		writeD(_activeChar.getLevel());
 		writeD(0);

L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java

@@ -41,8 +41,8 @@ public class PledgeShowMemberListAll extends ServerBasePacket
 		writeS(_clan.getLeaderName());
 		writeD(0);
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
+		writeD(_clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(0);
 		writeD(_activeChar.getLevel());
 		writeD(0);

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java

@@ -147,7 +147,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 			{
 				player = ((Summon) target).getOwner();
 			}
-			if ((player == null) || ((player.getClan() != null) && (player.getClan().getHasFort() == ((NpcInstance) _actor).getFort().getFortId())))
+			if ((player == null) || ((player.getClan() != null) && (player.getClan().getFortId() == ((NpcInstance) _actor).getFort().getFortId())))
 			{
 				return false;
 			}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/ClanTable.java

@@ -286,7 +286,7 @@ public class ClanTable
 		
 		clan.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.CLAN_HAS_DISPERSED));
 		
-		final int castleId = clan.getHasCastle();
+		final int castleId = clan.getCastleId();
 		if (castleId == 0)
 		{
 			for (Siege siege : SiegeManager.getInstance().getSieges())
@@ -295,7 +295,7 @@ public class ClanTable
 			}
 		}
 		
-		final int fortId = clan.getHasFort();
+		final int fortId = clan.getFortId();
 		if (fortId == 0)
 		{
 			for (FortSiege siege : FortSiegeManager.getInstance().getSieges())

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java

@@ -192,7 +192,7 @@ public class AdminSiege implements IAdminCommandHandler
 				{
 					BuilderUtil.sendSysMessage(activeChar, "This ClanHall isn't free!");
 				}
-				else if (player.getClan().getHasHideout() == 0)
+				else if (player.getClan().getHideoutId() == 0)
 				{
 					ClanHallManager.getInstance().setOwner(clanhall.getId(), player.getClan());
 					if (AuctionManager.getInstance().getAuction(clanhall.getId()) != null)

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CastleCmd.java

@@ -38,7 +38,7 @@ public class CastleCmd implements IVoicedCommandHandler
 		if (command.startsWith("open doors") && target.equals("castle") && activeChar.isClanLeader())
 		{
 			final DoorInstance door = (DoorInstance) activeChar.getTarget();
-			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
+			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getCastleId());
 			if ((door == null) || (castle == null))
 			{
 				return false;
@@ -52,7 +52,7 @@ public class CastleCmd implements IVoicedCommandHandler
 		else if (command.startsWith("close doors") && target.equals("castle") && activeChar.isClanLeader())
 		{
 			final DoorInstance door = (DoorInstance) activeChar.getTarget();
-			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
+			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getCastleId());
 			if ((door == null) || (castle == null))
 			{
 				return false;
@@ -63,7 +63,7 @@ public class CastleCmd implements IVoicedCommandHandler
 				door.closeMe();
 			}
 		}
-		else if (command.startsWith("ride wyvern") && target.equals("castle") && (activeChar.getClan().getHasCastle() > 0) && activeChar.isClanLeader())
+		else if (command.startsWith("ride wyvern") && target.equals("castle") && (activeChar.getClan().getCastleId() > 0) && activeChar.isClanLeader())
 		{
 			if (!activeChar.disarmWeapons())
 			{

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java

@@ -131,7 +131,7 @@ public class FortSiegeManager
 			return false;
 		}
 		
-		if (clan.getHasFort() > 0)
+		if (clan.getFortId() > 0)
 		{
 			return true;
 		}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java

@@ -145,7 +145,7 @@ public class SiegeManager
 			return false;
 		}
 		
-		if (clan.getHasCastle() > 0)
+		if (clan.getCastleId() > 0)
 		{
 			return true;
 		}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java

@@ -130,7 +130,7 @@ public class AuctioneerInstance extends FolkInstance
 							bid = Integer.parseInt(st.nextToken());
 						}
 						
-						final Auction a = new Auction(player.getClan().getHasHideout(), player.getClan(), days * 86400000, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName());
+						final Auction a = new Auction(player.getClan().getHideoutId(), player.getClan(), days * 86400000, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName());
 						if (_pendingAuctions.get(a.getId()) != null)
 						{
 							_pendingAuctions.remove(a.getId());
@@ -165,9 +165,9 @@ public class AuctioneerInstance extends FolkInstance
 			{
 				try
 				{
-					final Auction a = _pendingAuctions.get(player.getClan().getHasHideout());
+					final Auction a = _pendingAuctions.get(player.getClan().getHideoutId());
 					a.confirmAuction();
-					_pendingAuctions.remove(player.getClan().getHasHideout());
+					_pendingAuctions.remove(player.getClan().getHideoutId());
 				}
 				catch (Exception e)
 				{
@@ -268,7 +268,7 @@ public class AuctioneerInstance extends FolkInstance
 					return;
 				}
 				
-				if (((player.getClan().getAuctionBiddedAt() > 0) && (player.getClan().getAuctionBiddedAt() != Integer.parseInt(val))) || (player.getClan().getHasHideout() > 0))
+				if (((player.getClan().getAuctionBiddedAt() > 0) && (player.getClan().getAuctionBiddedAt() != Integer.parseInt(val))) || (player.getClan().getHideoutId() > 0))
 				{
 					player.sendMessage("You can't bid at more than one auction");
 					return;
@@ -386,7 +386,7 @@ public class AuctioneerInstance extends FolkInstance
 			}
 			else if (actualCommand.equalsIgnoreCase("selectedItems"))
 			{
-				if ((player.getClan() != null) && (player.getClan().getHasHideout() == 0) && (player.getClan().getAuctionBiddedAt() > 0))
+				if ((player.getClan() != null) && (player.getClan().getHideoutId() == 0) && (player.getClan().getAuctionBiddedAt() > 0))
 				{
 					final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 					final String filename = "data/html/auction/AgitBidInfo.htm";
@@ -417,13 +417,13 @@ public class AuctioneerInstance extends FolkInstance
 					
 					return;
 				}
-				else if ((player.getClan() != null) && (AuctionManager.getInstance().getAuction(player.getClan().getHasHideout()) != null))
+				else if ((player.getClan() != null) && (AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null))
 				{
 					final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 					final String filename = "data/html/auction/AgitSaleInfo.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(1);
 					html.setFile(filename);
-					final Auction a = AuctionManager.getInstance().getAuction(player.getClan().getHasHideout());
+					final Auction a = AuctionManager.getInstance().getAuction(player.getClan().getHideoutId());
 					if (a != null)
 					{
 						html.replace("%AGIT_NAME%", a.getItemName());
@@ -443,15 +443,15 @@ public class AuctioneerInstance extends FolkInstance
 					}
 					else
 					{
-						LOGGER.warning("Auctioneer Auction null for getHasHideout : " + player.getClan().getHasHideout());
+						LOGGER.warning("Auctioneer Auction null for getHideoutId : " + player.getClan().getHideoutId());
 					}
 					player.sendPacket(html);
 					
 					return;
 				}
-				else if ((player.getClan() != null) && (player.getClan().getHasHideout() != 0))
+				else if ((player.getClan() != null) && (player.getClan().getHideoutId() != 0))
 				{
-					final int ItemId = player.getClan().getHasHideout();
+					final int ItemId = player.getClan().getHideoutId();
 					final String filename = "data/html/auction/AgitInfo.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(1);
 					html.setFile(filename);
@@ -518,9 +518,9 @@ public class AuctioneerInstance extends FolkInstance
 			}
 			else if (actualCommand.equalsIgnoreCase("doCancelAuction"))
 			{
-				if (AuctionManager.getInstance().getAuction(player.getClan().getHasHideout()) != null)
+				if (AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null)
 				{
-					AuctionManager.getInstance().getAuction(player.getClan().getHasHideout()).cancelAuction();
+					AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()).cancelAuction();
 					player.sendMessage("Your auction has been canceled");
 				}
 				return;

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuardInstance.java

@@ -188,7 +188,7 @@ public class FortSiegeGuardInstance extends Attackable
 				{
 					player = ((Summon) attacker).getOwner();
 				}
-				if ((player != null) && (player.getClan() != null) && (player.getClan().getHasFort() == getFort().getFortId()))
+				if ((player != null) && (player.getClan() != null) && (player.getClan().getFortId() == getFort().getFortId()))
 				{
 					return;
 				}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriestInstance.java

@@ -587,7 +587,7 @@ public class SignsPriestInstance extends FolkInstance
 				final Clan[] clanList = ClanTable.getInstance().getClans();
 				for (Clan clan : clanList)
 				{
-					if ((clan.getAllyId() == allyId) && (clan.getHasCastle() > 0))
+					if ((clan.getAllyId() == allyId) && (clan.getCastleId() > 0))
 					{
 						return true;
 					}
@@ -595,7 +595,7 @@ public class SignsPriestInstance extends FolkInstance
 			}
 		}
 		
-		return playerClan.getHasCastle() > 0;
+		return playerClan.getCastleId() > 0;
 	}
 	
 	private void showChatWindow(PlayerInstance player, int value, String suffix, boolean isDescription)

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java

@@ -575,7 +575,7 @@ public class VillageMasterInstance extends FolkInstance
 			return;
 		}
 		
-		if ((clan.getHasCastle() != 0) || (clan.getHasHideout() != 0) || (clan.getHasFort() != 0))
+		if ((clan.getCastleId() != 0) || (clan.getHideoutId() != 0) || (clan.getFortId() != 0))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_WHILE_OWNING_A_CLAN_HALL_OR_CASTLE);
 			return;

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java

@@ -68,9 +68,9 @@ public class Clan
 	private String _allyName;
 	private int _allyId = 0;
 	private int _level;
-	private int _hasCastle;
+	private int _castleId;
-	private int _hasFort;
+	private int _fortId;
-	private int _hasHideout;
+	private int _hideoutId;
 	private boolean _hasCrest;
 	private int _hiredGuards;
 	private int _crestId;
@@ -427,7 +427,7 @@ public class Clan
 		exMember.saveApprenticeAndSponsor(0, 0);
 		if (Config.REMOVE_CASTLE_CIRCLETS)
 		{
-			CastleManager.getInstance().removeCirclet(exMember, getHasCastle());
+			CastleManager.getInstance().removeCirclet(exMember, getCastleId());
 		}
 		
 		if (exMember.isOnline())
@@ -609,19 +609,19 @@ public class Clan
 		return _level;
 	}
 	
-	public int getHasCastle()
+	public int getCastleId()
 	{
-		return _hasCastle;
+		return _castleId;
 	}
 	
-	public int getHasFort()
+	public int getFortId()
 	{
-		return _hasFort;
+		return _fortId;
 	}
 	
-	public int getHasHideout()
+	public int getHideoutId()
 	{
-		return _hasHideout;
+		return _hideoutId;
 	}
 	
 	/**
@@ -659,17 +659,17 @@ public class Clan
 	
 	public void setHasCastle(int hasCastle)
 	{
-		_hasCastle = hasCastle;
+		_castleId = hasCastle;
 	}
 	
 	public void setHasFort(int hasFort)
 	{
-		_hasFort = hasFort;
+		_fortId = hasFort;
 	}
 	
 	public void setHasHideout(int hasHideout)
 	{
-		_hasHideout = hasHideout;
+		_hideoutId = hasHideout;
 	}
 	
 	public void setLevel(int level)
@@ -725,7 +725,7 @@ public class Clan
 			statement.setInt(1, _clanId);
 			statement.setString(2, _name);
 			statement.setInt(3, _level);
-			statement.setInt(4, _hasCastle);
+			statement.setInt(4, _castleId);
 			statement.setInt(5, _allyId);
 			statement.setString(6, _allyName);
 			statement.setInt(7, getLeaderId());
@@ -2310,6 +2310,6 @@ public class Clan
 	@Override
 	public String toString()
 	{
-		return "Clan [_name=" + _name + ", _clanId=" + _clanId + ", _leader=" + _leader + ", _members=" + _members + ", _allyName=" + _allyName + ", _allyId=" + _allyId + ", _level=" + _level + ", _hasCastle=" + _hasCastle + ", _hasFort=" + _hasFort + ", _hasHideout=" + _hasHideout + ", _hasCrest=" + _hasCrest + ", _hiredGuards=" + _hiredGuards + ", _crestId=" + _crestId + ", _crestLargeId=" + _crestLargeId + ", _allyCrestId=" + _allyCrestId + ", _auctionBiddedAt=" + _auctionBiddedAt + ", _allyPenaltyExpiryTime=" + _allyPenaltyExpiryTime + ", _allyPenaltyType=" + _allyPenaltyType + ", _charPenaltyExpiryTime=" + _charPenaltyExpiryTime + ", _dissolvingExpiryTime=" + _dissolvingExpiryTime + ", _warehouse=" + _warehouse + ", _atWarWith=" + _atWarWith + ", _atWarAttackers=" + _atWarAttackers + ", _hasCrestLarge=" + _hasCrestLarge + ", _forum=" + _forum + ", _skillList=" + _skillList + ", _notice=" + _notice + ", _noticeEnabled=" + _noticeEnabled + ", _skills=" + _skills + ", _privs=" + _privs + ", _subPledges=" + _subPledges + ", _reputationScore=" + _reputationScore + ", _rank=" + _rank + "]";
+		return "Clan [_name=" + _name + ", _clanId=" + _clanId + ", _leader=" + _leader + ", _members=" + _members + ", _allyName=" + _allyName + ", _allyId=" + _allyId + ", _level=" + _level + ", _hasCastle=" + _castleId + ", _hasFort=" + _fortId + ", _hasHideout=" + _hideoutId + ", _hasCrest=" + _hasCrest + ", _hiredGuards=" + _hiredGuards + ", _crestId=" + _crestId + ", _crestLargeId=" + _crestLargeId + ", _allyCrestId=" + _allyCrestId + ", _auctionBiddedAt=" + _auctionBiddedAt + ", _allyPenaltyExpiryTime=" + _allyPenaltyExpiryTime + ", _allyPenaltyType=" + _allyPenaltyType + ", _charPenaltyExpiryTime=" + _charPenaltyExpiryTime + ", _dissolvingExpiryTime=" + _dissolvingExpiryTime + ", _warehouse=" + _warehouse + ", _atWarWith=" + _atWarWith + ", _atWarAttackers=" + _atWarAttackers + ", _hasCrestLarge=" + _hasCrestLarge + ", _forum=" + _forum + ", _skillList=" + _skillList + ", _notice=" + _notice + ", _noticeEnabled=" + _noticeEnabled + ", _skills=" + _skills + ", _privs=" + _privs + ", _subPledges=" + _subPledges + ", _reputationScore=" + _reputationScore + ", _rank=" + _rank + "]";
 	}
 }

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/Auction.java

@@ -453,7 +453,7 @@ public class Auction
 		
 		for (Bidder b : _bidders.values())
 		{
-			if (ClanTable.getInstance().getClanByName(b.getClanName()).getHasHideout() == 0)
+			if (ClanTable.getInstance().getClanByName(b.getClanName()).getHideoutId() == 0)
 			{
 				returnItem(b.getClanName(), b.getBid(), true); // 10 % tax
 			}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/CastleUpdater.java

@@ -47,9 +47,9 @@ public class CastleUpdater implements Runnable
 		{
 			// Move current castle treasury to clan warehouse every 2 hour
 			final ItemContainer warehouse = _clan.getWarehouse();
-			if ((warehouse != null) && (_clan.getHasCastle() > 0))
+			if ((warehouse != null) && (_clan.getCastleId() > 0))
 			{
-				final Castle castle = CastleManager.getInstance().getCastleById(_clan.getHasCastle());
+				final Castle castle = CastleManager.getInstance().getCastleById(_clan.getCastleId());
 				if (!Config.ALT_MANOR_SAVE_ALL_ACTIONS && ((_runCount % Config.ALT_MANOR_SAVE_PERIOD_RATE) == 0))
 				{
 					castle.saveSeedData();

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/FortSiege.java

@@ -908,7 +908,7 @@ public class FortSiege
 	 */
 	public void removeSiegeClan(Clan clan)
 	{
-		if ((clan == null) || (clan.getHasFort() == getFort().getFortId()) || !FortSiegeManager.getInstance().checkIsRegistered(clan, getFort().getFortId()))
+		if ((clan == null) || (clan.getFortId() == getFort().getFortId()) || !FortSiegeManager.getInstance().checkIsRegistered(clan, getFort().getFortId()))
 		{
 			return;
 		}
@@ -1071,11 +1071,11 @@ public class FortSiege
 		{
 			player.sendMessage("Only clans with Level " + FortSiegeManager.getInstance().getSiegeClanMinLevel() + " and higher may register for a fort siege.");
 		}
-		else if (player.getClan().getHasFort() > 0)
+		else if (player.getClan().getFortId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a fort.");
 		}
-		else if (player.getClan().getHasCastle() > 0)
+		else if (player.getClan().getCastleId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a castle.");
 		}
@@ -1223,7 +1223,7 @@ public class FortSiege
 	 */
 	private void saveSiegeClan(Clan clan, int typeId, boolean isUpdateRegistration)
 	{
-		if (clan.getHasFort() > 0)
+		if (clan.getFortId() > 0)
 		{
 			return;
 		}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java

@@ -1047,7 +1047,7 @@ public class Siege
 	 */
 	public void removeSiegeClan(Clan clan)
 	{
-		if ((clan == null) || (clan.getHasCastle() == getCastle().getCastleId()) || !SiegeManager.getInstance().checkIsRegistered(clan, getCastle().getCastleId()))
+		if ((clan == null) || (clan.getCastleId() == getCastle().getCastleId()) || !SiegeManager.getInstance().checkIsRegistered(clan, getCastle().getCastleId()))
 		{
 			return;
 		}
@@ -1192,11 +1192,11 @@ public class Siege
 		{
 			player.sendMessage("Only clans with Level " + SiegeManager.getInstance().getSiegeClanMinLevel() + " and higher may register for a castle siege.");
 		}
-		else if (player.getClan().getHasCastle() > 0)
+		else if (player.getClan().getCastleId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a castle.");
 		}
-		else if (player.getClan().getHasFort() > 0)
+		else if (player.getClan().getFortId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a fort.");
 		}
@@ -1428,7 +1428,7 @@ public class Siege
 	 */
 	private void saveSiegeClan(Clan clan, int typeId, boolean isUpdateRegistration)
 	{
-		if (clan.getHasCastle() > 0)
+		if (clan.getCastleId() > 0)
 		{
 			return;
 		}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Formulas.java

@@ -1016,7 +1016,7 @@ public class Formulas
 			
 			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null))
 			{
-				final int clanHallIndex = player.getClan().getHasHideout();
+				final int clanHallIndex = player.getClan().getHideoutId();
 				if (clanHallIndex > 0)
 				{
 					final ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);
@@ -1090,7 +1090,7 @@ public class Formulas
 			
 			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null))
 			{
-				final int clanHallIndex = player.getClan().getHasHideout();
+				final int clanHallIndex = player.getClan().getHideoutId();
 				if (clanHallIndex > 0)
 				{
 					final ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -822,9 +822,9 @@ public class EnterWorld extends GameClientPacket
 	private void notifyCastleOwner(PlayerInstance player)
 	{
 		final Clan clan = player.getClan();
-		if ((clan != null) && (clan.getHasCastle() > 0))
+		if ((clan != null) && (clan.getCastleId() > 0))
 		{
-			final Castle castle = CastleManager.getInstance().getCastleById(clan.getHasCastle());
+			final Castle castle = CastleManager.getInstance().getCastleById(clan.getCastleId());
 			if ((castle != null) && (player.getObjectId() == clan.getLeaderId()))
 			{
 				Announcements.getInstance().announceToAll("Lord " + player.getName() + " Ruler Of " + castle.getName() + " Castle is now Online!");

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java

@@ -91,7 +91,7 @@ public class RequestExSetPledgeCrestLarge extends GameClientPacket
 		
 		if ((player.getClanPrivileges() & Clan.CP_CL_REGISTER_CREST) == Clan.CP_CL_REGISTER_CREST)
 		{
-			if ((clan.getHasCastle() == 0) && (clan.getHasHideout() == 0))
+			if ((clan.getCastleId() == 0) && (clan.getHideoutId() == 0))
 			{
 				player.sendMessage("Only a clan that owns a clan hall or a castle can get their emblem displayed on clan related items"); // there is a system message for that but didnt found the id
 				return;

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -131,7 +131,7 @@ public class RequestRestartPoint extends GameClientPacket
 					{
 						if (_player.getClan() != null)
 						{
-							if (_player.getClan().getHasHideout() == 0)
+							if (_player.getClan().getHideoutId() == 0)
 							{
 								// cheater
 								_player.sendMessage("You may not use this respawn point!");
@@ -162,7 +162,7 @@ public class RequestRestartPoint extends GameClientPacket
 						{
 							isInDefense = true;
 						}
-						if ((_player.getClan().getHasCastle() == 0) && (_player.getClan().getHasFort() == 0) && !isInDefense)
+						if ((_player.getClan().getCastleId() == 0) && (_player.getClan().getFortId() == 0) && !isInDefense)
 						{
 							// cheater
 							_player.sendMessage("You may not use this respawn point!");

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -196,14 +196,14 @@ public class UseItem extends GameClientPacket
 		
 		final Clan cl = player.getClan();
 		// A shield that can only be used by the members of a clan that owns a castle.
-		if (((cl == null) || (cl.getHasCastle() == 0)) && (itemId == 7015) && Config.CASTLE_SHIELD && !player.isGM())
+		if (((cl == null) || (cl.getCastleId() == 0)) && (itemId == 7015) && Config.CASTLE_SHIELD && !player.isGM())
 		{
 			player.sendMessage("You can't equip that.");
 			return;
 		}
 		
 		// A shield that can only be used by the members of a clan that owns a clan hall.
-		if (((cl == null) || (cl.getHasHideout() == 0)) && (itemId == 6902) && Config.CLANHALL_SHIELD && !player.isGM())
+		if (((cl == null) || (cl.getHideoutId() == 0)) && (itemId == 6902) && Config.CLANHALL_SHIELD && !player.isGM())
 		{
 			player.sendMessage("You can't equip that.");
 			return;
@@ -224,7 +224,7 @@ public class UseItem extends GameClientPacket
 		}
 		
 		// The Lord's Crown used by castle lords only
-		if ((itemId == 6841) && Config.CASTLE_CROWN && ((cl == null) || (cl.getHasCastle() == 0) || !player.isClanLeader()) && !player.isGM())
+		if ((itemId == 6841) && Config.CASTLE_CROWN && ((cl == null) || (cl.getCastleId() == 0) || !player.isClanLeader()) && !player.isGM())
 		{
 			player.sendMessage("You can't equip that.");
 			return;
@@ -245,7 +245,7 @@ public class UseItem extends GameClientPacket
 				return;
 			}
 			
-			final int circletId = CastleManager.getInstance().getCircletByCastleId(cl.getHasCastle());
+			final int circletId = CastleManager.getInstance().getCircletByCastleId(cl.getCastleId());
 			if ((player.getPledgeType() == -1) || (circletId != itemId))
 			{
 				player.sendMessage("You can't equip that.");

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -102,8 +102,8 @@ public class Die extends GameServerPacket
 				}
 			}
 			
-			writeD(_clan.getHasHideout() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away
+			writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away
-			writeD((_clan.getHasCastle() > 0) || (_clan.getHasFort() > 0) || isInDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle
+			writeD((_clan.getCastleId() > 0) || (_clan.getFortId() > 0) || isInDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle
 			writeD((siegeClan != null) && !isInDefense && !siegeClan.getFlag().isEmpty() ? 0x01 : 0x00); // 6d 03 00 00 00 - to siege HQ
 		}
 		else

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java

@@ -45,8 +45,8 @@ public class GMViewPledgeInfo extends GameServerPacket
 		writeS(_clan.getLeaderName());
 		writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
+		writeD(_clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(0);
 		writeD(_player.getLevel());
 		writeD(_clan.getDissolvingExpiryTime() > System.currentTimeMillis() ? 3 : 0);

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java

@@ -42,8 +42,8 @@ public class PledgeReceiveMemberInfo extends GameServerPacket
 		writeS(_member.getClan().getLeaderName());
 		writeD(_member.getClan().getCrestId()); // crest id .. is used again
 		writeD(_member.getClan().getLevel());
-		writeD(_member.getClan().getHasCastle());
+		writeD(_member.getClan().getCastleId());
-		writeD(_member.getClan().getHasHideout());
+		writeD(_member.getClan().getHideoutId());
 		writeD(0);
 		writeD(getClient().getPlayer().getLevel()); // ??
 		writeD(_member.getClan().getDissolvingExpiryTime() > System.currentTimeMillis() ? 3 : 0);

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java

@@ -41,8 +41,8 @@ public class PledgeShowInfoUpdate extends GameServerPacket
 		writeD(_clan.getClanId());
 		writeD(_clan.getCrestId());
 		writeD(_clan.getLevel()); // clan level
-		writeD(_clan.getHasFort() != 0 ? _clan.getHasFort() : _clan.getHasCastle());
+		writeD(_clan.getFortId() != 0 ? _clan.getFortId() : _clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(TOP);
 		writeD(_clan.getReputationScore()); // clan reputation score
 		writeD(0);

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java

@@ -45,8 +45,8 @@ public class PledgeShowMemberListAll extends GameServerPacket
 		writeS(_clan.getLeaderName());
 		writeD(_clan.getCrestId()); // crest id .. is used again
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
+		writeD(_clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(0);
 		writeD(getClient().getPlayer().getLevel()); // ??
 		writeD(_clan.getDissolvingExpiryTime() > System.currentTimeMillis() ? 3 : 0);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java

@@ -147,7 +147,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 			{
 				player = ((Summon) target).getOwner();
 			}
-			if ((player == null) || ((player.getClan() != null) && (player.getClan().getHasFort() == ((NpcInstance) _actor).getFort().getFortId())))
+			if ((player == null) || ((player.getClan() != null) && (player.getClan().getFortId() == ((NpcInstance) _actor).getFort().getFortId())))
 			{
 				return false;
 			}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/ClanTable.java

@@ -286,7 +286,7 @@ public class ClanTable
 		
 		clan.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.CLAN_HAS_DISPERSED));
 		
-		final int castleId = clan.getHasCastle();
+		final int castleId = clan.getCastleId();
 		if (castleId == 0)
 		{
 			for (Siege siege : SiegeManager.getInstance().getSieges())
@@ -295,7 +295,7 @@ public class ClanTable
 			}
 		}
 		
-		final int fortId = clan.getHasFort();
+		final int fortId = clan.getFortId();
 		if (fortId == 0)
 		{
 			for (FortSiege siege : FortSiegeManager.getInstance().getSieges())

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java

@@ -192,7 +192,7 @@ public class AdminSiege implements IAdminCommandHandler
 				{
 					BuilderUtil.sendSysMessage(activeChar, "This ClanHall isn't free!");
 				}
-				else if (player.getClan().getHasHideout() == 0)
+				else if (player.getClan().getHideoutId() == 0)
 				{
 					ClanHallManager.getInstance().setOwner(clanhall.getId(), player.getClan());
 					if (AuctionManager.getInstance().getAuction(clanhall.getId()) != null)

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CastleCmd.java

@@ -38,7 +38,7 @@ public class CastleCmd implements IVoicedCommandHandler
 		if (command.startsWith("open doors") && target.equals("castle") && activeChar.isClanLeader())
 		{
 			final DoorInstance door = (DoorInstance) activeChar.getTarget();
-			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
+			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getCastleId());
 			if ((door == null) || (castle == null))
 			{
 				return false;
@@ -52,7 +52,7 @@ public class CastleCmd implements IVoicedCommandHandler
 		else if (command.startsWith("close doors") && target.equals("castle") && activeChar.isClanLeader())
 		{
 			final DoorInstance door = (DoorInstance) activeChar.getTarget();
-			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
+			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getCastleId());
 			if ((door == null) || (castle == null))
 			{
 				return false;
@@ -63,7 +63,7 @@ public class CastleCmd implements IVoicedCommandHandler
 				door.closeMe();
 			}
 		}
-		else if (command.startsWith("ride wyvern") && target.equals("castle") && (activeChar.getClan().getHasCastle() > 0) && activeChar.isClanLeader())
+		else if (command.startsWith("ride wyvern") && target.equals("castle") && (activeChar.getClan().getCastleId() > 0) && activeChar.isClanLeader())
 		{
 			if (!activeChar.disarmWeapons())
 			{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java

@@ -131,7 +131,7 @@ public class FortSiegeManager
 			return false;
 		}
 		
-		if (clan.getHasFort() > 0)
+		if (clan.getFortId() > 0)
 		{
 			return true;
 		}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java

@@ -145,7 +145,7 @@ public class SiegeManager
 			return false;
 		}
 		
-		if (clan.getHasCastle() > 0)
+		if (clan.getCastleId() > 0)
 		{
 			return true;
 		}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java

@@ -130,7 +130,7 @@ public class AuctioneerInstance extends FolkInstance
 							bid = Integer.parseInt(st.nextToken());
 						}
 						
-						final Auction a = new Auction(player.getClan().getHasHideout(), player.getClan(), days * 86400000, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName());
+						final Auction a = new Auction(player.getClan().getHideoutId(), player.getClan(), days * 86400000, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName());
 						if (_pendingAuctions.get(a.getId()) != null)
 						{
 							_pendingAuctions.remove(a.getId());
@@ -165,9 +165,9 @@ public class AuctioneerInstance extends FolkInstance
 			{
 				try
 				{
-					final Auction a = _pendingAuctions.get(player.getClan().getHasHideout());
+					final Auction a = _pendingAuctions.get(player.getClan().getHideoutId());
 					a.confirmAuction();
-					_pendingAuctions.remove(player.getClan().getHasHideout());
+					_pendingAuctions.remove(player.getClan().getHideoutId());
 				}
 				catch (Exception e)
 				{
@@ -268,7 +268,7 @@ public class AuctioneerInstance extends FolkInstance
 					return;
 				}
 				
-				if (((player.getClan().getAuctionBiddedAt() > 0) && (player.getClan().getAuctionBiddedAt() != Integer.parseInt(val))) || (player.getClan().getHasHideout() > 0))
+				if (((player.getClan().getAuctionBiddedAt() > 0) && (player.getClan().getAuctionBiddedAt() != Integer.parseInt(val))) || (player.getClan().getHideoutId() > 0))
 				{
 					player.sendMessage("You can't bid at more than one auction");
 					return;
@@ -386,7 +386,7 @@ public class AuctioneerInstance extends FolkInstance
 			}
 			else if (actualCommand.equalsIgnoreCase("selectedItems"))
 			{
-				if ((player.getClan() != null) && (player.getClan().getHasHideout() == 0) && (player.getClan().getAuctionBiddedAt() > 0))
+				if ((player.getClan() != null) && (player.getClan().getHideoutId() == 0) && (player.getClan().getAuctionBiddedAt() > 0))
 				{
 					final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 					final String filename = "data/html/auction/AgitBidInfo.htm";
@@ -417,13 +417,13 @@ public class AuctioneerInstance extends FolkInstance
 					
 					return;
 				}
-				else if ((player.getClan() != null) && (AuctionManager.getInstance().getAuction(player.getClan().getHasHideout()) != null))
+				else if ((player.getClan() != null) && (AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null))
 				{
 					final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 					final String filename = "data/html/auction/AgitSaleInfo.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(1);
 					html.setFile(filename);
-					final Auction a = AuctionManager.getInstance().getAuction(player.getClan().getHasHideout());
+					final Auction a = AuctionManager.getInstance().getAuction(player.getClan().getHideoutId());
 					if (a != null)
 					{
 						html.replace("%AGIT_NAME%", a.getItemName());
@@ -443,15 +443,15 @@ public class AuctioneerInstance extends FolkInstance
 					}
 					else
 					{
-						LOGGER.warning("Auctioneer Auction null for getHasHideout : " + player.getClan().getHasHideout());
+						LOGGER.warning("Auctioneer Auction null for getHideoutId : " + player.getClan().getHideoutId());
 					}
 					player.sendPacket(html);
 					
 					return;
 				}
-				else if ((player.getClan() != null) && (player.getClan().getHasHideout() != 0))
+				else if ((player.getClan() != null) && (player.getClan().getHideoutId() != 0))
 				{
-					final int ItemId = player.getClan().getHasHideout();
+					final int ItemId = player.getClan().getHideoutId();
 					final String filename = "data/html/auction/AgitInfo.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(1);
 					html.setFile(filename);
@@ -518,9 +518,9 @@ public class AuctioneerInstance extends FolkInstance
 			}
 			else if (actualCommand.equalsIgnoreCase("doCancelAuction"))
 			{
-				if (AuctionManager.getInstance().getAuction(player.getClan().getHasHideout()) != null)
+				if (AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null)
 				{
-					AuctionManager.getInstance().getAuction(player.getClan().getHasHideout()).cancelAuction();
+					AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()).cancelAuction();
 					player.sendMessage("Your auction has been canceled");
 				}
 				return;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuardInstance.java

@@ -188,7 +188,7 @@ public class FortSiegeGuardInstance extends Attackable
 				{
 					player = ((Summon) attacker).getOwner();
 				}
-				if ((player != null) && (player.getClan() != null) && (player.getClan().getHasFort() == getFort().getFortId()))
+				if ((player != null) && (player.getClan() != null) && (player.getClan().getFortId() == getFort().getFortId()))
 				{
 					return;
 				}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriestInstance.java

@@ -587,7 +587,7 @@ public class SignsPriestInstance extends FolkInstance
 				final Clan[] clanList = ClanTable.getInstance().getClans();
 				for (Clan clan : clanList)
 				{
-					if ((clan.getAllyId() == allyId) && (clan.getHasCastle() > 0))
+					if ((clan.getAllyId() == allyId) && (clan.getCastleId() > 0))
 					{
 						return true;
 					}
@@ -595,7 +595,7 @@ public class SignsPriestInstance extends FolkInstance
 			}
 		}
 		
-		return playerClan.getHasCastle() > 0;
+		return playerClan.getCastleId() > 0;
 	}
 	
 	private void showChatWindow(PlayerInstance player, int value, String suffix, boolean isDescription)

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java

@@ -581,7 +581,7 @@ public class VillageMasterInstance extends FolkInstance
 			return;
 		}
 		
-		if ((clan.getHasCastle() != 0) || (clan.getHasHideout() != 0) || (clan.getHasFort() != 0))
+		if ((clan.getCastleId() != 0) || (clan.getHideoutId() != 0) || (clan.getFortId() != 0))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_WHILE_OWNING_A_CLAN_HALL_OR_CASTLE);
 			return;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java

@@ -69,9 +69,9 @@ public class Clan
 	private String _allyName;
 	private int _allyId = 0;
 	private int _level;
-	private int _hasCastle;
+	private int _castleId;
-	private int _hasFort;
+	private int _fortId;
-	private int _hasHideout;
+	private int _hideoutId;
 	private boolean _hasCrest;
 	private int _hiredGuards;
 	private int _crestId;
@@ -428,7 +428,7 @@ public class Clan
 		exMember.saveApprenticeAndSponsor(0, 0);
 		if (Config.REMOVE_CASTLE_CIRCLETS)
 		{
-			CastleManager.getInstance().removeCirclet(exMember, getHasCastle());
+			CastleManager.getInstance().removeCirclet(exMember, getCastleId());
 		}
 		
 		if (exMember.isOnline())
@@ -610,19 +610,19 @@ public class Clan
 		return _level;
 	}
 	
-	public int getHasCastle()
+	public int getCastleId()
 	{
-		return _hasCastle;
+		return _castleId;
 	}
 	
-	public int getHasFort()
+	public int getFortId()
 	{
-		return _hasFort;
+		return _fortId;
 	}
 	
-	public int getHasHideout()
+	public int getHideoutId()
 	{
-		return _hasHideout;
+		return _hideoutId;
 	}
 	
 	/**
@@ -660,17 +660,17 @@ public class Clan
 	
 	public void setHasCastle(int hasCastle)
 	{
-		_hasCastle = hasCastle;
+		_castleId = hasCastle;
 	}
 	
 	public void setHasFort(int hasFort)
 	{
-		_hasFort = hasFort;
+		_fortId = hasFort;
 	}
 	
 	public void setHasHideout(int hasHideout)
 	{
-		_hasHideout = hasHideout;
+		_hideoutId = hasHideout;
 	}
 	
 	public void setLevel(int level)
@@ -726,7 +726,7 @@ public class Clan
 			statement.setInt(1, _clanId);
 			statement.setString(2, _name);
 			statement.setInt(3, _level);
-			statement.setInt(4, _hasCastle);
+			statement.setInt(4, _castleId);
 			statement.setInt(5, _allyId);
 			statement.setString(6, _allyName);
 			statement.setInt(7, getLeaderId());
@@ -2327,6 +2327,6 @@ public class Clan
 	@Override
 	public String toString()
 	{
-		return "Clan [_name=" + _name + ", _clanId=" + _clanId + ", _leader=" + _leader + ", _members=" + _members + ", _allyName=" + _allyName + ", _allyId=" + _allyId + ", _level=" + _level + ", _hasCastle=" + _hasCastle + ", _hasFort=" + _hasFort + ", _hasHideout=" + _hasHideout + ", _hasCrest=" + _hasCrest + ", _hiredGuards=" + _hiredGuards + ", _crestId=" + _crestId + ", _crestLargeId=" + _crestLargeId + ", _allyCrestId=" + _allyCrestId + ", _auctionBiddedAt=" + _auctionBiddedAt + ", _allyPenaltyExpiryTime=" + _allyPenaltyExpiryTime + ", _allyPenaltyType=" + _allyPenaltyType + ", _charPenaltyExpiryTime=" + _charPenaltyExpiryTime + ", _dissolvingExpiryTime=" + _dissolvingExpiryTime + ", _warehouse=" + _warehouse + ", _atWarWith=" + _atWarWith + ", _atWarAttackers=" + _atWarAttackers + ", _hasCrestLarge=" + _hasCrestLarge + ", _forum=" + _forum + ", _skillList=" + _skillList + ", _notice=" + _notice + ", _noticeEnabled=" + _noticeEnabled + ", _skills=" + _skills + ", _privs=" + _privs + ", _subPledges=" + _subPledges + ", _reputationScore=" + _reputationScore + ", _rank=" + _rank + "]";
+		return "Clan [_name=" + _name + ", _clanId=" + _clanId + ", _leader=" + _leader + ", _members=" + _members + ", _allyName=" + _allyName + ", _allyId=" + _allyId + ", _level=" + _level + ", _hasCastle=" + _castleId + ", _hasFort=" + _fortId + ", _hasHideout=" + _hideoutId + ", _hasCrest=" + _hasCrest + ", _hiredGuards=" + _hiredGuards + ", _crestId=" + _crestId + ", _crestLargeId=" + _crestLargeId + ", _allyCrestId=" + _allyCrestId + ", _auctionBiddedAt=" + _auctionBiddedAt + ", _allyPenaltyExpiryTime=" + _allyPenaltyExpiryTime + ", _allyPenaltyType=" + _allyPenaltyType + ", _charPenaltyExpiryTime=" + _charPenaltyExpiryTime + ", _dissolvingExpiryTime=" + _dissolvingExpiryTime + ", _warehouse=" + _warehouse + ", _atWarWith=" + _atWarWith + ", _atWarAttackers=" + _atWarAttackers + ", _hasCrestLarge=" + _hasCrestLarge + ", _forum=" + _forum + ", _skillList=" + _skillList + ", _notice=" + _notice + ", _noticeEnabled=" + _noticeEnabled + ", _skills=" + _skills + ", _privs=" + _privs + ", _subPledges=" + _subPledges + ", _reputationScore=" + _reputationScore + ", _rank=" + _rank + "]";
 	}
 }

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Auction.java

@@ -453,7 +453,7 @@ public class Auction
 		
 		for (Bidder b : _bidders.values())
 		{
-			if (ClanTable.getInstance().getClanByName(b.getClanName()).getHasHideout() == 0)
+			if (ClanTable.getInstance().getClanByName(b.getClanName()).getHideoutId() == 0)
 			{
 				returnItem(b.getClanName(), b.getBid(), true); // 10 % tax
 			}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/CastleUpdater.java

@@ -47,9 +47,9 @@ public class CastleUpdater implements Runnable
 		{
 			// Move current castle treasury to clan warehouse every 2 hour
 			final ItemContainer warehouse = _clan.getWarehouse();
-			if ((warehouse != null) && (_clan.getHasCastle() > 0))
+			if ((warehouse != null) && (_clan.getCastleId() > 0))
 			{
-				final Castle castle = CastleManager.getInstance().getCastleById(_clan.getHasCastle());
+				final Castle castle = CastleManager.getInstance().getCastleById(_clan.getCastleId());
 				if (!Config.ALT_MANOR_SAVE_ALL_ACTIONS && ((_runCount % Config.ALT_MANOR_SAVE_PERIOD_RATE) == 0))
 				{
 					castle.saveSeedData();

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/FortSiege.java

@@ -908,7 +908,7 @@ public class FortSiege
 	 */
 	public void removeSiegeClan(Clan clan)
 	{
-		if ((clan == null) || (clan.getHasFort() == getFort().getFortId()) || !FortSiegeManager.getInstance().checkIsRegistered(clan, getFort().getFortId()))
+		if ((clan == null) || (clan.getFortId() == getFort().getFortId()) || !FortSiegeManager.getInstance().checkIsRegistered(clan, getFort().getFortId()))
 		{
 			return;
 		}
@@ -1071,11 +1071,11 @@ public class FortSiege
 		{
 			player.sendMessage("Only clans with Level " + FortSiegeManager.getInstance().getSiegeClanMinLevel() + " and higher may register for a fort siege.");
 		}
-		else if (player.getClan().getHasFort() > 0)
+		else if (player.getClan().getFortId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a fort.");
 		}
-		else if (player.getClan().getHasCastle() > 0)
+		else if (player.getClan().getCastleId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a castle.");
 		}
@@ -1223,7 +1223,7 @@ public class FortSiege
 	 */
 	private void saveSiegeClan(Clan clan, int typeId, boolean isUpdateRegistration)
 	{
-		if (clan.getHasFort() > 0)
+		if (clan.getFortId() > 0)
 		{
 			return;
 		}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java

@@ -1047,7 +1047,7 @@ public class Siege
 	 */
 	public void removeSiegeClan(Clan clan)
 	{
-		if ((clan == null) || (clan.getHasCastle() == getCastle().getCastleId()) || !SiegeManager.getInstance().checkIsRegistered(clan, getCastle().getCastleId()))
+		if ((clan == null) || (clan.getCastleId() == getCastle().getCastleId()) || !SiegeManager.getInstance().checkIsRegistered(clan, getCastle().getCastleId()))
 		{
 			return;
 		}
@@ -1192,11 +1192,11 @@ public class Siege
 		{
 			player.sendMessage("Only clans with Level " + SiegeManager.getInstance().getSiegeClanMinLevel() + " and higher may register for a castle siege.");
 		}
-		else if (player.getClan().getHasCastle() > 0)
+		else if (player.getClan().getCastleId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a castle.");
 		}
-		else if (player.getClan().getHasFort() > 0)
+		else if (player.getClan().getFortId() > 0)
 		{
 			player.sendMessage("You cannot register because your clan already own a fort.");
 		}
@@ -1428,7 +1428,7 @@ public class Siege
 	 */
 	private void saveSiegeClan(Clan clan, int typeId, boolean isUpdateRegistration)
 	{
-		if (clan.getHasCastle() > 0)
+		if (clan.getCastleId() > 0)
 		{
 			return;
 		}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java

@@ -1016,7 +1016,7 @@ public class Formulas
 			
 			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null))
 			{
-				final int clanHallIndex = player.getClan().getHasHideout();
+				final int clanHallIndex = player.getClan().getHideoutId();
 				if (clanHallIndex > 0)
 				{
 					final ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);
@@ -1090,7 +1090,7 @@ public class Formulas
 			
 			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null))
 			{
-				final int clanHallIndex = player.getClan().getHasHideout();
+				final int clanHallIndex = player.getClan().getHideoutId();
 				if (clanHallIndex > 0)
 				{
 					final ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -884,9 +884,9 @@ public class EnterWorld extends GameClientPacket
 	private void notifyCastleOwner(PlayerInstance player)
 	{
 		final Clan clan = player.getClan();
-		if ((clan != null) && (clan.getHasCastle() > 0))
+		if ((clan != null) && (clan.getCastleId() > 0))
 		{
-			final Castle castle = CastleManager.getInstance().getCastleById(clan.getHasCastle());
+			final Castle castle = CastleManager.getInstance().getCastleById(clan.getCastleId());
 			if ((castle != null) && (player.getObjectId() == clan.getLeaderId()))
 			{
 				Announcements.getInstance().announceToAll("Lord " + player.getName() + " Ruler Of " + castle.getName() + " Castle is now Online!");

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java

@@ -91,7 +91,7 @@ public class RequestExSetPledgeCrestLarge extends GameClientPacket
 		
 		if ((player.getClanPrivileges() & Clan.CP_CL_REGISTER_CREST) == Clan.CP_CL_REGISTER_CREST)
 		{
-			if ((clan.getHasCastle() == 0) && (clan.getHasHideout() == 0))
+			if ((clan.getCastleId() == 0) && (clan.getHideoutId() == 0))
 			{
 				player.sendMessage("Only a clan that owns a clan hall or a castle can get their emblem displayed on clan related items"); // there is a system message for that but didnt found the id
 				return;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -131,7 +131,7 @@ public class RequestRestartPoint extends GameClientPacket
 					{
 						if (_player.getClan() != null)
 						{
-							if (_player.getClan().getHasHideout() == 0)
+							if (_player.getClan().getHideoutId() == 0)
 							{
 								// cheater
 								_player.sendMessage("You may not use this respawn point!");
@@ -162,7 +162,7 @@ public class RequestRestartPoint extends GameClientPacket
 						{
 							isInDefense = true;
 						}
-						if ((_player.getClan().getHasCastle() == 0) && (_player.getClan().getHasFort() == 0) && !isInDefense)
+						if ((_player.getClan().getCastleId() == 0) && (_player.getClan().getFortId() == 0) && !isInDefense)
 						{
 							// cheater
 							_player.sendMessage("You may not use this respawn point!");

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -197,14 +197,14 @@ public class UseItem extends GameClientPacket
 		
 		final Clan cl = player.getClan();
 		// A shield that can only be used by the members of a clan that owns a castle.
-		if (((cl == null) || (cl.getHasCastle() == 0)) && (itemId == 7015) && Config.CASTLE_SHIELD && !player.isGM())
+		if (((cl == null) || (cl.getCastleId() == 0)) && (itemId == 7015) && Config.CASTLE_SHIELD && !player.isGM())
 		{
 			player.sendMessage("You can't equip that.");
 			return;
 		}
 		
 		// A shield that can only be used by the members of a clan that owns a clan hall.
-		if (((cl == null) || (cl.getHasHideout() == 0)) && (itemId == 6902) && Config.CLANHALL_SHIELD && !player.isGM())
+		if (((cl == null) || (cl.getHideoutId() == 0)) && (itemId == 6902) && Config.CLANHALL_SHIELD && !player.isGM())
 		{
 			player.sendMessage("You can't equip that.");
 			return;
@@ -225,7 +225,7 @@ public class UseItem extends GameClientPacket
 		}
 		
 		// The Lord's Crown used by castle lords only
-		if ((itemId == 6841) && Config.CASTLE_CROWN && ((cl == null) || (cl.getHasCastle() == 0) || !player.isClanLeader()) && !player.isGM())
+		if ((itemId == 6841) && Config.CASTLE_CROWN && ((cl == null) || (cl.getCastleId() == 0) || !player.isClanLeader()) && !player.isGM())
 		{
 			player.sendMessage("You can't equip that.");
 			return;
@@ -246,7 +246,7 @@ public class UseItem extends GameClientPacket
 				return;
 			}
 			
-			final int circletId = CastleManager.getInstance().getCircletByCastleId(cl.getHasCastle());
+			final int circletId = CastleManager.getInstance().getCircletByCastleId(cl.getCastleId());
 			if ((player.getPledgeType() == -1) || (circletId != itemId))
 			{
 				player.sendMessage("You can't equip that.");

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -102,8 +102,8 @@ public class Die extends GameServerPacket
 				}
 			}
 			
-			writeD(_clan.getHasHideout() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away
+			writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away
-			writeD((_clan.getHasCastle() > 0) || (_clan.getHasFort() > 0) || isInDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle
+			writeD((_clan.getCastleId() > 0) || (_clan.getFortId() > 0) || isInDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle
 			writeD((siegeClan != null) && !isInDefense && !siegeClan.getFlag().isEmpty() ? 0x01 : 0x00); // 6d 03 00 00 00 - to siege HQ
 		}
 		else

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java

@@ -48,8 +48,8 @@ public class GMViewPledgeInfo extends GameServerPacket
 		writeS(_clan.getLeaderName());
 		writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
+		writeD(_clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(TOP);
 		writeD(_clan.getReputationScore());
 		writeD(0);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java

@@ -41,8 +41,8 @@ public class PledgeShowInfoUpdate extends GameServerPacket
 		writeD(_clan.getClanId());
 		writeD(_clan.getCrestId());
 		writeD(_clan.getLevel()); // clan level
-		writeD(_clan.getHasFort() != 0 ? _clan.getHasFort() : _clan.getHasCastle());
+		writeD(_clan.getFortId() != 0 ? _clan.getFortId() : _clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(TOP);
 		writeD(_clan.getReputationScore()); // clan reputation score
 		writeD(0);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java

@@ -83,8 +83,8 @@ public class PledgeShowMemberListAll extends GameServerPacket
 		
 		writeD(_clan.getCrestId()); // crest id .. is used again
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
+		writeD(_clan.getCastleId());
-		writeD(_clan.getHasHideout());
+		writeD(_clan.getHideoutId());
 		writeD(TOP);
 		writeD(_clan.getReputationScore()); // was activechar lvl
 		writeD(0); // 0

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java

@@ -443,7 +443,7 @@ public class AuctioneerInstance extends Npc
 					}
 					else
 					{
-						LOGGER.warning("Auctioneer Auction null for getHasHideout : " + player.getClan().getHideoutId());
+						LOGGER.warning("Auctioneer Auction null for getHideoutId : " + player.getClan().getHideoutId());
 					}
 					
 					player.sendPacket(html);

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java

@@ -443,7 +443,7 @@ public class AuctioneerInstance extends Npc
 					}
 					else
 					{
-						LOGGER.warning("Auctioneer Auction null for getHasHideout : " + player.getClan().getHideoutId());
+						LOGGER.warning("Auctioneer Auction null for getHideoutId : " + player.getClan().getHideoutId());
 					}
 					
 					player.sendPacket(html);