ソースを参照

BETA: Fixing few methods naming:
* getHasFort() to getFortId()
* getHasCastle() to getCastleId()
* getHasHideout() to getHideoutId()
* setHasFort(..) to setFortId(..)
* setHasCastle(..) to setCastleId(..)
* getHasHideout(..) to setHideoutId(..)
* Fixed JavaDocs related to those methods.

Zoey76 13 年 前
コミット
8324ee0aa1
34 ファイル変更133 行追加135 行削除
  1. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/CastleUpdater.java
  2. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java
  3. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ClanTable.java
  4. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java
  5. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java
  6. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java
  7. 8 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
  8. 27 27
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java
  9. 13 13
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java
  10. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortEnvoyInstance.java
  11. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  12. 4 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java
  13. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
  14. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasCastle.java
  15. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasClanHall.java
  16. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFort.java
  17. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Auction.java
  18. 4 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java
  19. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java
  20. 5 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java
  21. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java
  22. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java
  23. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
  24. 4 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java
  25. 12 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java
  26. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
  27. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java
  28. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
  29. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
  30. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java
  31. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/Die.java
  32. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewPledgeInfo.java
  33. 6 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
  34. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/CastleUpdater.java

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

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java

@@ -134,7 +134,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 				player = ((L2PcInstance)target);
 			else if (target instanceof L2Summon)
 				player = ((L2Summon) target).getOwner();
-			if (player == null || (player.getClan() != null && player.getClan().getHasFort() == ((L2Npc) _actor).getFort().getFortId()))
+			if (player == null || (player.getClan() != null && player.getClan().getFortId() == ((L2Npc) _actor).getFort().getFortId()))
 				return false;
 		}
 		

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ClanTable.java

@@ -228,7 +228,7 @@ public class ClanTable
 		}
 		
 		clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_HAS_DISPERSED));
-		int castleId = clan.getHasCastle();
+		int castleId = clan.getCastleId();
 		if (castleId == 0)
 		{
 			for (Siege siege : SiegeManager.getInstance().getSieges())
@@ -236,7 +236,7 @@ public class ClanTable
 				siege.removeSiegeClan(clan);
 			}
 		}
-		int fortId = clan.getHasFort();
+		int fortId = clan.getFortId();
 		if (fortId == 0)
 		{
 			for (FortSiege siege : FortSiegeManager.getInstance().getSieges())
@@ -244,7 +244,7 @@ public class ClanTable
 				siege.removeSiegeClan(clan);
 			}
 		}
-		int hallId = clan.getHasHideout();
+		int hallId = clan.getHideoutId();
 		if(hallId == 0)
 		{
 			for(SiegableHall hall : CHSiegeManager.getInstance().getConquerableHalls().values())

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java

@@ -154,7 +154,7 @@ public final class CHSiegeManager
 			player.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
 		else if(hall.getOwnerId() == clan.getClanId())
 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);
-		else if(clan.getHasCastle() != 0 || clan.getHasHideout() != 0)
+		else if(clan.getCastleId() != 0 || clan.getHideoutId() != 0)
 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_CANNOT_PARTICIPATE_OTHER_SIEGE);
 		else if(hall.getSiege().checkIsAttacker(clan))
 			player.sendPacket(SystemMessageId.ALREADY_REQUESTED_SIEGE_BATTLE);

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java

@@ -186,7 +186,7 @@ public final class ClanHallManager
 	public final synchronized void setFree(int chId)
 	{
 		_freeClanHall.put(chId, _clanHall.get(chId));
-		ClanTable.getInstance().getClan(_freeClanHall.get(chId).getOwnerId()).setHasHideout(0);
+		ClanTable.getInstance().getClan(_freeClanHall.get(chId).getOwnerId()).setHideoutId(0);
 		_freeClanHall.get(chId).free();
 		_clanHall.remove(chId);
 	}
@@ -205,7 +205,7 @@ public final class ClanHallManager
 		}
 		else
 			_clanHall.get(chId).free();
-		ClanTable.getInstance().getClan(clan.getClanId()).setHasHideout(chId);
+		ClanTable.getInstance().getClan(clan.getClanId()).setHideoutId(chId);
 		_clanHall.get(chId).setOwner(clan);
 	}
 	

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java

@@ -72,7 +72,7 @@ public class SiegeManager
 	
 	public final void addSiegeSkills(L2PcInstance character)
 	{
-		for (L2Skill sk : SkillTable.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getHasCastle() > 0))
+		for (L2Skill sk : SkillTable.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0))
 		{
 			character.addSkill(sk, false);
 		}
@@ -116,7 +116,7 @@ public class SiegeManager
 		if (clan == null)
 			return false;
 		
-		if (clan.getHasCastle() > 0)
+		if (clan.getCastleId() > 0)
 			return true;
 		
 		Connection con = null;
@@ -151,7 +151,7 @@ public class SiegeManager
 	
 	public final void removeSiegeSkills(L2PcInstance character)
 	{
-		for (L2Skill sk : SkillTable.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getHasCastle() > 0))
+		for (L2Skill sk : SkillTable.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0))
 		{
 			character.removeSkill(sk);
 		}

+ 8 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

@@ -134,8 +134,8 @@ public class TerritoryWarManager implements Siegable
 			return 0;
 		if (player.getClan() != null)
 		{
-			if (player.getClan().getHasCastle() > 0)
-				return player.getClan().getHasCastle() + 80;
+			if (player.getClan().getCastleId() > 0)
+				return player.getClan().getCastleId() + 80;
 			for(int cId:_registeredClans.keySet())
 				if (_registeredClans.get(cId).contains(player.getClan()))
 					return cId + 80;
@@ -169,8 +169,8 @@ public class TerritoryWarManager implements Siegable
 		if (clan == null)
 			return false;
 		
-		if (clan.getHasCastle() > 0)
-			return (castleId == -1 ? true : (clan.getHasCastle() == castleId));
+		if (clan.getCastleId() > 0)
+			return (castleId == -1 ? true : (clan.getCastleId() == castleId));
 		
 		if (castleId == -1)
 		{
@@ -420,8 +420,8 @@ public class TerritoryWarManager implements Siegable
 	
 	public L2SiegeFlagInstance getHQForClan(L2Clan clan)
 	{
-		if (clan.getHasCastle() > 0)
-			return _territoryList.get(clan.getHasCastle()).getHQ();
+		if (clan.getCastleId() > 0)
+			return _territoryList.get(clan.getCastleId()).getHQ();
 		return null;
 	}
 	
@@ -434,8 +434,8 @@ public class TerritoryWarManager implements Siegable
 	
 	public void setHQForClan(L2Clan clan, L2SiegeFlagInstance hq)
 	{
-		if (clan.getHasCastle() > 0)
-			_territoryList.get(clan.getHasCastle()).setHQ(hq);
+		if (clan.getCastleId() > 0)
+			_territoryList.get(clan.getCastleId()).setHQ(hq);
 	}
 	
 	public void addClanFlag(L2Clan clan, L2SiegeFlagInstance flag)

+ 27 - 27
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -89,9 +89,9 @@ public class L2Clan
 	private String _allyName;
 	private int _allyId;
 	private int _level;
-	private int _hasCastle;
-	private int _hasFort;
-	private int _hasHideout;
+	private int _castleId;
+	private int _fortId;
+	private int _hideoutId;
 	private int _hiredGuards;
 	private int _crestId;
 	private int _crestLargeId;
@@ -301,7 +301,7 @@ public class L2Clan
 			if (!exLeader.getSkillReuseTimeStamps().isEmpty())
 			{
 				TimeStamp t;
-				for (L2Skill sk : SkillTable.getInstance().getSiegeSkills(newLeader.isNoble(), getHasCastle() > 0))
+				for (L2Skill sk : SkillTable.getInstance().getSiegeSkills(newLeader.isNoble(), getCastleId() > 0))
 				{
 					if (exLeader.hasSkillReuse(sk.getReuseHashCode()))
 					{
@@ -485,7 +485,7 @@ public class L2Clan
 		exMember.saveApprenticeAndSponsor(0, 0);
 		if (Config.REMOVE_CASTLE_CIRCLETS)
 		{
-			CastleManager.getInstance().removeCirclet(exMember, getHasCastle());
+			CastleManager.getInstance().removeCirclet(exMember, getCastleId());
 		}
 		if (exMember.isOnline())
 		{
@@ -506,9 +506,9 @@ public class L2Clan
 			removeSkillEffects(player);
 			
 			// remove Residential skills
-			if (player.getClan().getHasCastle() > 0)
+			if (player.getClan().getCastleId() > 0)
 				CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
-			if (player.getClan().getHasFort() > 0)
+			if (player.getClan().getFortId() > 0)
 				FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
 			player.sendSkillList();
 			
@@ -716,27 +716,27 @@ public class L2Clan
 	}
 	
 	/**
-	 * @return {code true} if the clan has a castle.
+	 * @return the castle Id for this clan if owns a castle, zero otherwise.
 	 */
-	public int getHasCastle()
+	public int getCastleId()
 	{
-		return _hasCastle;
+		return _castleId;
 	}
 	
 	/**
-	 * @return {code true} if the clan has a fort.
+	 * @return the fort Id for this clan if owns a fort, zero otherwise.
 	 */
-	public int getHasFort()
+	public int getFortId()
 	{
-		return _hasFort;
+		return _fortId;
 	}
 	
 	/**
-	 * @return {code true} if the clan has a hideout.
+	 * @return the hideout Id for this clan if owns a hideout, zero otherwise.
 	 */
-	public int getHasHideout()
+	public int getHideoutId()
 	{
-		return _hasHideout;
+		return _hideoutId;
 	}
 	
 	/**
@@ -788,27 +788,27 @@ public class L2Clan
 	}
 	
 	/**
-	 * @param hasCastle The hasCastle to set.
+	 * @param castleId the castle Id to set.
 	 */
-	public void setHasCastle(int hasCastle)
+	public void setCastleId(int castleId)
 	{
-		_hasCastle = hasCastle;
+		_castleId = castleId;
 	}
 	
 	/**
-	 * @param hasFort The hasFort to set.
+	 * @param fortId the fort Id to set.
 	 */
-	public void setHasFort(int hasFort)
+	public void setFortId(int fortId)
 	{
-		_hasFort = hasFort;
+		_fortId = fortId;
 	}
 	
 	/**
-	 * @param hasHideout The hasHideout to set.
+	 * @param hideoutId the hideout Id to set.
 	 */
-	public void setHasHideout(int hasHideout)
+	public void setHideoutId(int hideoutId)
 	{
-		_hasHideout = hasHideout;
+		_hideoutId = hideoutId;
 	}
 	
 	/**
@@ -915,7 +915,7 @@ public class L2Clan
 			statement.setInt(1, getClanId());
 			statement.setString(2, getName());
 			statement.setInt(3, getLevel());
-			statement.setInt(4, getHasCastle());
+			statement.setInt(4, getCastleId());
 			statement.setInt(5, getAllyId());
 			statement.setString(6, getAllyName());
 			statement.setInt(7, getLeaderId());
@@ -1016,7 +1016,7 @@ public class L2Clan
 			{
 				setName(clanData.getString("clan_name"));
 				setLevel(clanData.getInt("clan_level"));
-				setHasCastle(clanData.getInt("hasCastle"));
+				setCastleId(clanData.getInt("hasCastle"));
 				setAllyId(clanData.getInt("ally_id"));
 				setAllyName(clanData.getString("ally_name"));
 				setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type"));

+ 13 - 13
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java

@@ -93,7 +93,7 @@ public final class L2AuctioneerInstance extends L2Npc
 						if (st.countTokens() >= 1)
 							bid = Math.min(Long.parseLong(st.nextToken()), MAX_ADENA);
 						
-						Auction a = new Auction(player.getClan().getHasHideout(), player.getClan(), days*86400000L, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName());
+						Auction a = new Auction(player.getClan().getHideoutId(), player.getClan(), days*86400000L, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName());
 						if (_pendingAuctions.get(a.getId()) != null)
 							_pendingAuctions.remove(a.getId());
 						
@@ -126,9 +126,9 @@ public final class L2AuctioneerInstance extends L2Npc
 			{
 				try
 				{
-					Auction a = _pendingAuctions.get(player.getClan().getHasHideout());
+					Auction a = _pendingAuctions.get(player.getClan().getHideoutId());
 					a.confirmAuction();
-					_pendingAuctions.remove(player.getClan().getHasHideout());
+					_pendingAuctions.remove(player.getClan().getHideoutId());
 				}
 				catch (Exception e)
 				{
@@ -223,7 +223,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				if (val.isEmpty())
 					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.sendPacket(SystemMessageId.ALREADY_SUBMITTED_BID);
 					return;
@@ -371,7 +371,7 @@ public final class L2AuctioneerInstance extends L2Npc
 			}
 			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)
 				{
 					SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 					String filename = "data/html/auction/AgitBidInfo.htm";
@@ -400,13 +400,13 @@ public final class L2AuctioneerInstance extends L2Npc
 					player.sendPacket(html);
 					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)
 				{
 					SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 					String filename = "data/html/auction/AgitSaleInfo.htm";
 					NpcHtmlMessage html = new NpcHtmlMessage(1);
 					html.setFile(player.getHtmlPrefix(), filename);
-					Auction a = AuctionManager.getInstance().getAuction(player.getClan().getHasHideout());
+					Auction a = AuctionManager.getInstance().getAuction(player.getClan().getHideoutId());
 					if (a != null)
 					{
 						html.replace("%AGIT_NAME%", a.getItemName());
@@ -425,14 +425,14 @@ public final class L2AuctioneerInstance extends L2Npc
 						html.replace("%objectId%", String.valueOf(getObjectId()));
 					}
 					else
-						_log.warning("Auctioneer Auction null for getHasHideout : "+player.getClan().getHasHideout());
+						_log.warning("Auctioneer Auction null for getHasHideout : "+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)
 				{
-					int ItemId = player.getClan().getHasHideout();
+					int ItemId = player.getClan().getHideoutId();
 					String filename = "data/html/auction/AgitInfo.htm";
 					NpcHtmlMessage html = new NpcHtmlMessage(1);
 					html.setFile(player.getHtmlPrefix(), filename);
@@ -453,7 +453,7 @@ public final class L2AuctioneerInstance extends L2Npc
 					player.sendPacket(html);
 					return;
 				}
-				else if (player.getClan() != null && player.getClan().getHasHideout() == 0)
+				else if (player.getClan() != null && player.getClan().getHideoutId() == 0)
 				{
 					player.sendPacket(SystemMessageId.NO_OFFERINGS_OWN_OR_MADE_BID_FOR);
 					return;
@@ -508,9 +508,9 @@ public final class L2AuctioneerInstance extends L2Npc
 			}
 			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;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortEnvoyInstance.java

@@ -37,7 +37,7 @@ public class L2FortEnvoyInstance extends L2Npc
 		
 		String filename;
 		
-		if (!player.isClanLeader() || getFort().getFortId() != player.getClan().getHasFort())
+		if (!player.isClanLeader() || getFort().getFortId() != player.getClan().getFortId())
 			filename = "data/html/fortress/envoy-noclan.htm";
 		else if (getFort().getFortState() == 0)
 			filename = "data/html/fortress/envoy.htm";

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -2904,9 +2904,9 @@ public final class L2PcInstance extends L2Playable
 			
 			if (clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel() && isClanLeader())
 				SiegeManager.getInstance().addSiegeSkills(this);
-			if (getClan().getHasCastle() > 0)
+			if (getClan().getCastleId() > 0)
 				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
-			if (getClan().getHasFort() > 0)
+			if (getClan().getFortId() > 0)
 				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
 		}
 		

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java

@@ -145,7 +145,7 @@ public class L2SignsPriestInstance extends L2Npc
 					else if (cabal == SevenSigns.CABAL_DUSK && Config.ALT_GAME_CASTLE_DUSK) //dusk
 					{
 						// castle owners cannot participate with dusk side
-						if (player.getClan() != null && player.getClan().getHasCastle() > 0)
+						if (player.getClan() != null && player.getClan().getCastleId() > 0)
 						{
 							showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_33_dusk_no.htm");
 							break;
@@ -154,7 +154,7 @@ public class L2SignsPriestInstance extends L2Npc
 					else if (cabal == SevenSigns.CABAL_DAWN && Config.ALT_GAME_CASTLE_DAWN) //dawn
 					{
 						// clans without castle need to pay participation fee
-						if (player.getClan() == null || player.getClan().getHasCastle() == 0)
+						if (player.getClan() == null || player.getClan().getCastleId() == 0)
 						{
 							showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_33_dawn_fee.htm");
 							break;
@@ -193,7 +193,7 @@ public class L2SignsPriestInstance extends L2Npc
 					{
 						if (cabal == SevenSigns.CABAL_DUSK && Config.ALT_GAME_CASTLE_DUSK)
 						{
-							if (player.getClan() != null && player.getClan().getHasCastle() > 0) // even if in htmls is said that ally can have castle too, but its not
+							if (player.getClan() != null && player.getClan().getCastleId() > 0) // even if in htmls is said that ally can have castle too, but its not
 							{
 								showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_33_dusk_no.htm");
 								return;
@@ -209,7 +209,7 @@ public class L2SignsPriestInstance extends L2Npc
 						{
 							boolean allowJoinDawn = false;
 							
-							if (player.getClan() != null && player.getClan().getHasCastle() > 0) // castle owner don't need to pay anything
+							if (player.getClan() != null && player.getClan().getCastleId() > 0) // castle owner don't need to pay anything
 								allowJoinDawn = true;
 							else if (player.destroyItemByItemId("SevenSigns", SevenSigns.CERTIFICATE_OF_APPROVAL_ID, 1, this, true))
 								allowJoinDawn = true;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -807,7 +807,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_IN_WAR);
 			return;
 		}
-		if (clan.getHasCastle() !=0 || clan.getHasHideout() != 0 || clan.getHasFort() != 0)
+		if (clan.getCastleId() != 0 || clan.getHideoutId() != 0 || clan.getFortId() != 0)
 		{
 			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_OWNING_CLAN_HALL_OR_CASTLE);
 			return;

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasCastle.java

@@ -58,8 +58,8 @@ public final class ConditionPlayerHasCastle extends Condition
 		// Any castle
 		if (_castle == -1)
 		{
-			return clan.getHasCastle() > 0;
+			return clan.getCastleId() > 0;
 		}
-		return clan.getHasCastle() == _castle;
+		return clan.getCastleId() == _castle;
 	}
 }

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasClanHall.java

@@ -59,8 +59,8 @@ public final class ConditionPlayerHasClanHall extends Condition
 		// All Clan Hall
 		if ((_clanHall.size() == 1) && (_clanHall.get(0) == -1))
 		{
-			return clan.getHasHideout() > 0;
+			return clan.getHideoutId() > 0;
 		}
-		return _clanHall.contains(clan.getHasHideout());
+		return _clanHall.contains(clan.getHideoutId());
 	}
 }

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFort.java

@@ -57,8 +57,8 @@ public final class ConditionPlayerHasFort extends Condition
 		// Any fortress
 		if (_fort == -1)
 		{
-			return clan.getHasFort() > 0;
+			return clan.getFortId() > 0;
 		}
-		return clan.getHasFort() == _fort;
+		return clan.getFortId() == _fort;
 	}
 }

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Auction.java

@@ -435,7 +435,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
 			else
 			{

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -539,7 +539,7 @@ public class Castle
 				{
 					_log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e);
 				}
-				oldOwner.setHasCastle(0); // Unset has castle flag for old owner
+				oldOwner.setCastleId(0); // Unset has castle flag for old owner
 				for (L2PcInstance member : oldOwner.getOnlineMembers(0))
 				{
 					removeResidentialSkills(member);
@@ -552,7 +552,7 @@ public class Castle
 		setShowNpcCrest(false);
 		
 		// if clan have fortress, remove it
-		if (clan.getHasFort() > 0)
+		if (clan.getFortId() > 0)
 			FortManager.getInstance().getFortByOwner(clan).removeOwner(true);
 		
 		if (getSiege().getIsInProgress()) // If siege in progress
@@ -581,7 +581,7 @@ public class Castle
 				removeResidentialSkills(member);
 				member.sendSkillList();
 			}
-			clan.setHasCastle(0);
+			clan.setCastleId(0);
 			clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 		}
 		
@@ -999,7 +999,7 @@ public class Castle
 			// Announce to clan memebers
 			if (clan != null)
 			{
-				clan.setHasCastle(getCastleId()); // Set has castle flag for new owner
+				clan.setCastleId(getCastleId()); // Set has castle flag for new owner
 				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 				clan.broadcastToOnlineMembers(new PlaySound(1, "Siege_Victory", 0, 0, 0, 0, 0));
 				ThreadPoolManager.getInstance().scheduleGeneral(new CastleUpdater(clan, 1), 3600000); // Schedule owner tasks to start running

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java

@@ -220,7 +220,7 @@ public abstract class ClanHall
 		{
 			L2Clan clan = ClanTable.getInstance().getClan(_ownerId);
 			if(clan != null)
-				clan.setHasHideout(getId());
+				clan.setHideoutId(getId());
 			else
 				free();
 		}
@@ -353,8 +353,8 @@ public abstract class ClanHall
 			return;
 		_ownerId = clan.getClanId();
 		_isFree = false;
-		clan.setHasHideout(getId());
-		// Annonce to Online member new ClanHall
+		clan.setHideoutId(getId());
+		// Announce to Online member new ClanHall
 		clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 		updateDb();
 	}

+ 5 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -457,7 +457,7 @@ public class Fort
 		setFortState(0, 0); // initialize fort state
 		
 		//	if clan already have castle, don't store him in fortress
-		if (clan.getHasCastle() > 0)
+		if (clan.getCastleId() > 0)
 		{
 			getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.NPCS_RECAPTURED_FORTRESS));
 			return false;
@@ -470,7 +470,7 @@ public class Fort
 		spawnSpecialEnvoys();
 		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSpecialEnvoysDeSpawn(this), 1 * 60 * 60 * 1000); // Prepare 1hr task for special envoys despawn
 		// if clan have already fortress, remove it
-		if (clan.getHasFort() > 0)
+		if (clan.getFortId() > 0)
 			FortManager.getInstance().getFortByOwner(clan).removeOwner(true);
 		
 		setBloodOathReward(0);
@@ -500,7 +500,7 @@ public class Fort
 				removeResidentialSkills(member);
 				member.sendSkillList();
 			}
-			clan.setHasFort(0);
+			clan.setFortId(0);
 			clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 			setOwnerClan(null);
 			setBloodOathReward(0);
@@ -646,7 +646,7 @@ public class Fort
 			if (ownerId > 0)
 			{
 				L2Clan clan = ClanTable.getInstance().getClan(ownerId); // Try to find clan instance
-				clan.setHasFort(getFortId());
+				clan.setFortId(getFortId());
 				setOwnerClan(clan);
 				int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60);
 				long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis();
@@ -966,7 +966,7 @@ public class Fort
 			// Announce to clan memebers
 			if (clan != null)
 			{
-				clan.setHasFort(getFortId()); // Set has fort flag for new owner
+				clan.setFortId(getFortId()); // Set has fort flag for new owner
 				SystemMessage sm;
 				sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_IS_VICTORIOUS_IN_THE_FORTRESS_BATTLE_OF_S2);
 				sm.addString(clan.getName());

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -746,7 +746,7 @@ public class FortSiege implements Siegable
 	 */
 	public void removeSiegeClan(L2Clan 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;
 		
 		removeSiegeClan(clan.getClanId());
@@ -882,7 +882,7 @@ public class FortSiege implements Siegable
 			b = false;
 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);
 		}
-		else if (getFort().getOwnerClan() != null && player.getClan().getHasCastle() > 0 && player.getClan().getHasCastle() == getFort().getCastleId())
+		else if (getFort().getOwnerClan() != null && player.getClan().getCastleId() > 0 && player.getClan().getCastleId() == getFort().getCastleId())
 		{
 			b = false;
 			player.sendPacket(SystemMessageId.CANT_REGISTER_TO_SIEGE_DUE_TO_CONTRACT);

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java

@@ -943,7 +943,7 @@ public class Siege implements Siegable
 	 */
 	public void removeSiegeClan(L2Clan 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;
 		removeSiegeClan(clan.getClanId());
 	}
@@ -1064,7 +1064,7 @@ public class Siege implements Siegable
 			player.sendPacket(SystemMessageId.ONLY_CLAN_LEVEL_5_ABOVE_MAY_SIEGE);
 		else if (player.getClan().getClanId() == getCastle().getOwnerId())
 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);
-		else if (player.getClan().getHasCastle() > 0)
+		else if (player.getClan().getCastleId() > 0)
 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_CANNOT_PARTICIPATE_OTHER_SIEGE);
 		else if (SiegeManager.getInstance().checkIsRegistered(player.getClan(), getCastle().getCastleId()))
 			player.sendPacket(SystemMessageId.ALREADY_REQUESTED_SIEGE_BATTLE);
@@ -1301,7 +1301,7 @@ public class Siege implements Siegable
 	 */
 	private void saveSiegeClan(L2Clan clan, byte typeId, boolean isUpdateRegistration)
 	{
-		if (clan.getHasCastle() > 0)
+		if (clan.getCastleId() > 0)
 			return;
 		
 		Connection con = null;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -379,7 +379,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		if(_missionAccomplished && winner != null)
 		{
 			_hall.setOwner(winner);
-			winner.setHasHideout(_hall.getId());
+			winner.setHideoutId(_hall.getId());
 			finalMsg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_VICTORIOUS_OVER_S2_S_SIEGE);
 			finalMsg.addString(winner.getName());
 			finalMsg.addString(_hall.getName());

+ 4 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -45,9 +45,7 @@ import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * 
  * @author godson, GodKratos, Pere, DS
- *
  */
 public abstract class AbstractOlympiadGame
 {
@@ -215,9 +213,9 @@ public abstract class AbstractOlympiadGame
 			if (player.getClan() != null)
 			{
 				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getHasCastle() > 0)
+				if (player.getClan().getCastleId() > 0)
 					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
-				if (player.getClan().getHasFort() > 0)
+				if (player.getClan().getFortId() > 0)
 					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
 			}
 			// Abort casting if player casting
@@ -353,9 +351,9 @@ public abstract class AbstractOlympiadGame
 			if (player.getClan() != null)
 			{
 				player.getClan().addSkillEffects(player);
-				if (player.getClan().getHasCastle() > 0)
+				if (player.getClan().getCastleId() > 0)
 					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
-				if (player.getClan().getHasFort() > 0)
+				if (player.getClan().getFortId() > 0)
 					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
 			}
 			

+ 12 - 12
L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -1194,11 +1194,11 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CLANHALL) && (player.getClan() != null) && (player.getClan().getHasHideout() > 0))
+			if (player.isInsideZone(L2Character.ZONE_CLANHALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0))
 			{
 				L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class);
 				int posChIndex = zone == null ? -1 : zone.getClanHallId();
-				int clanHallIndex = player.getClan().getHasHideout();
+				int clanHallIndex = player.getClan().getHideoutId();
 				if ((clanHallIndex > 0) && (clanHallIndex == posChIndex))
 				{
 					ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);
@@ -1212,11 +1212,11 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CASTLE) && (player.getClan() != null) && (player.getClan().getHasCastle() > 0))
+			if (player.isInsideZone(L2Character.ZONE_CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0))
 			{
 				L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class);
 				int posCastleIndex = zone == null ? -1 : zone.getCastleId();
-				int castleIndex = player.getClan().getHasCastle();
+				int castleIndex = player.getClan().getCastleId();
 				if ((castleIndex > 0) && (castleIndex == posCastleIndex))
 				{
 					Castle castle = CastleManager.getInstance().getCastleById(castleIndex);
@@ -1230,11 +1230,11 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_FORT) && (player.getClan() != null) && (player.getClan().getHasFort() > 0))
+			if (player.isInsideZone(L2Character.ZONE_FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0))
 			{
 				L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class);
 				int posFortIndex = zone == null ? -1 : zone.getFortId();
-				int fortIndex = player.getClan().getHasFort();
+				int fortIndex = player.getClan().getFortId();
 				if ((fortIndex > 0) && (fortIndex == posFortIndex))
 				{
 					Fort fort = FortManager.getInstance().getFortById(fortIndex);
@@ -1318,11 +1318,11 @@ public final class Formulas
 				mpRegenBonus += mpBonus;
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CLANHALL) && (player.getClan() != null) && (player.getClan().getHasHideout() > 0))
+			if (player.isInsideZone(L2Character.ZONE_CLANHALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0))
 			{
 				L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class);
 				int posChIndex = zone == null ? -1 : zone.getClanHallId();
-				int clanHallIndex = player.getClan().getHasHideout();
+				int clanHallIndex = player.getClan().getHideoutId();
 				if ((clanHallIndex > 0) && (clanHallIndex == posChIndex))
 				{
 					ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);
@@ -1336,11 +1336,11 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_CASTLE) && (player.getClan() != null) && (player.getClan().getHasCastle() > 0))
+			if (player.isInsideZone(L2Character.ZONE_CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0))
 			{
 				L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class);
 				int posCastleIndex = zone == null ? -1 : zone.getCastleId();
-				int castleIndex = player.getClan().getHasCastle();
+				int castleIndex = player.getClan().getCastleId();
 				if ((castleIndex > 0) && (castleIndex == posCastleIndex))
 				{
 					Castle castle = CastleManager.getInstance().getCastleById(castleIndex);
@@ -1354,11 +1354,11 @@ public final class Formulas
 				}
 			}
 			
-			if (player.isInsideZone(L2Character.ZONE_FORT) && (player.getClan() != null) && (player.getClan().getHasFort() > 0))
+			if (player.isInsideZone(L2Character.ZONE_FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0))
 			{
 				L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class);
 				int posFortIndex = zone == null ? -1 : zone.getFortId();
-				int fortIndex = player.getClan().getHasFort();
+				int fortIndex = player.getClan().getFortId();
 				if ((fortIndex > 0) && (fortIndex == posFortIndex))
 				{
 					Fort fort = FortManager.getInstance().getFortById(fortIndex);

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

@@ -271,10 +271,10 @@ public class EnterWorld extends L2GameClientPacket
 			sendPacket(new PledgeStatusChanged(activeChar.getClan()));
 			
 			// Residential skills support
-			if (activeChar.getClan().getHasCastle() > 0)
+			if (activeChar.getClan().getCastleId() > 0)
 				CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).giveResidentialSkills(activeChar);
 			
-			if (activeChar.getClan().getHasFort() > 0)
+			if (activeChar.getClan().getFortId() > 0)
 				FortManager.getInstance().getFortByOwner(activeChar.getClan()).giveResidentialSkills(activeChar);
 			
 			showClanNotice = activeChar.getClan().isNoticeEnabled();

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -245,7 +245,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 				}
 				
 				final L2Clan clan = activeChar.getClan();
-				if ((clan.getHasFort() == 0) && (clan.getHasCastle() == 0))
+				if ((clan.getFortId() == 0) && (clan.getCastleId() == 0))
 				{
 					return;
 				}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -95,9 +95,9 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket
 				clan.broadcastToOnlineMembers(sm);
 				sm = null;
 				
-				if (activeChar.getClan().getHasCastle() > 0)
+				if (activeChar.getClan().getCastleId() > 0)
 					CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).giveResidentialSkills(activeChar);
-				if (activeChar.getClan().getHasFort() > 0)
+				if (activeChar.getClan().getFortId() > 0)
 					FortManager.getInstance().getFortByOwner(activeChar.getClan()).giveResidentialSkills(activeChar);
 				activeChar.sendSkillList();
 				

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java

@@ -87,7 +87,7 @@ public final class RequestExSetPledgeCrestLarge extends L2GameClientPacket
 			}
 			else
 			{
-				if (clan.getHasCastle() == 0 && clan.getHasHideout() == 0)
+				if (clan.getCastleId() == 0 && clan.getHideoutId() == 0)
 				{
 					activeChar.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;

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -132,7 +132,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 		switch (_requestedPointType)
 		{
 			case 1: // to clanhall
-				if (activeChar.getClan() == null || activeChar.getClan().getHasHideout() == 0)
+				if (activeChar.getClan() == null || activeChar.getClan().getHideoutId() == 0)
 				{
 					_log.warning("Player ["+activeChar.getName()+"] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!");
 					return;
@@ -165,7 +165,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 				}
 				else
 				{
-					if (activeChar.getClan() == null || activeChar.getClan().getHasCastle() == 0)
+					if (activeChar.getClan() == null || activeChar.getClan().getCastleId() == 0)
 						return;
 					loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, MapRegionManager.TeleportWhereType.Castle);
 				}
@@ -179,7 +179,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 			case 3: // to fortress
 				//fort = FortManager.getInstance().getFort(activeChar);
 				
-				if ((activeChar.getClan() == null || activeChar.getClan().getHasFort() == 0) && !isInDefense)
+				if ((activeChar.getClan() == null || activeChar.getClan().getFortId() == 0) && !isInDefense)
 				{
 					_log.warning("Player ["+activeChar.getName()+"] called RestartPointPacket - To Fortress and he doesn't have Fortress!");
 					return;

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/Die.java

@@ -114,8 +114,8 @@ public class Die extends L2GameServerPacket
 				}
 			}
 			
-			writeD(_clan.getHasHideout() > 0 ? 0x01 : 0x00);            // 6d 01 00 00 00 - to hide away
-			writeD(_clan.getHasCastle() > 0  ||
+			writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00);            // 6d 01 00 00 00 - to hide away
+			writeD(_clan.getCastleId() > 0  ||
 					isInCastleDefense? 0x01 : 0x00);             		// 6d 02 00 00 00 - to castle
 			writeD((TerritoryWarManager.getInstance().getFlagForClan(_clan) != null)
 					|| (siegeClan != null && !isInCastleDefense && !isInFortDefense
@@ -123,7 +123,7 @@ public class Die extends L2GameServerPacket
 						|| (hall != null && hall.getSiege().checkIsAttacker(_clan))? 0x01 : 0x00);       // 6d 03 00 00 00 - to siege HQ
 			writeD(_sweepable ? 0x01 : 0x00);                               // sweepable  (blue glow)
 			writeD(_access.allowFixedRes() ? 0x01: 0x00);                  // 6d 04 00 00 00 - to FIXED
-			writeD(_clan.getHasFort() > 0  || isInFortDefense? 0x01 : 0x00);    // 6d 05 00 00 00 - to fortress
+			writeD(_clan.getFortId() > 0  || isInFortDefense? 0x01 : 0x00);    // 6d 05 00 00 00 - to fortress
 		}
 		else
 		{

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewPledgeInfo.java

@@ -46,9 +46,9 @@ public class GMViewPledgeInfo extends L2GameServerPacket
 		writeS(_clan.getLeaderName());
 		writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
-		writeD(_clan.getHasHideout());
-		writeD(_clan.getHasFort());
+		writeD(_clan.getCastleId());
+		writeD(_clan.getHideoutId());
+		writeD(_clan.getFortId());
 		writeD(_clan.getRank());
 		writeD(_clan.getReputationScore());
 		writeD(0);

+ 6 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.L2Clan;
  */
 public class PledgeShowInfoUpdate extends L2GameServerPacket
 {
-	private static final String _S__A1_PLEDGESHOWINFOUPDATE = "[S] 8e PledgeShowInfoUpdate";
+	private static final String _S__8E_PLEDGESHOWINFOUPDATE = "[S] 8E PledgeShowInfoUpdate";
 	private L2Clan _clan;
 	
 	public PledgeShowInfoUpdate(L2Clan clan)
@@ -35,14 +35,14 @@ public class PledgeShowInfoUpdate extends L2GameServerPacket
 	protected final void writeImpl()
 	{
 		//dddddddddddSdd
-		writeC(0x8e);
+		writeC(0x8E);
 		//sending empty data so client will ask all the info in response ;)
 		writeD(_clan.getClanId());
 		writeD(_clan.getCrestId());
 		writeD(_clan.getLevel()); //clan level
-		writeD(_clan.getHasCastle());
-		writeD(_clan.getHasHideout());
-		writeD(_clan.getHasFort());
+		writeD(_clan.getCastleId());
+		writeD(_clan.getHideoutId());
+		writeD(_clan.getFortId());
 		writeD(_clan.getRank());
 		writeD(_clan.getReputationScore()); // clan reputation score
 		writeD(0);
@@ -56,7 +56,7 @@ public class PledgeShowInfoUpdate extends L2GameServerPacket
 	@Override
 	public String getType()
 	{
-		return _S__A1_PLEDGESHOWINFOUPDATE;
+		return _S__8E_PLEDGESHOWINFOUPDATE;
 	}
 	
 }

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java

@@ -112,9 +112,9 @@ public class PledgeShowMemberListAll extends L2GameServerPacket
 		
 		writeD(_clan.getCrestId()); // crest id .. is used again
 		writeD(_clan.getLevel());
-		writeD(_clan.getHasCastle());
-		writeD(_clan.getHasHideout());
-		writeD(_clan.getHasFort());
+		writeD(_clan.getCastleId());
+		writeD(_clan.getHideoutId());
+		writeD(_clan.getFortId());
 		writeD(_clan.getRank());
 		writeD(_clan.getReputationScore());
 		writeD(0); //0