首页 发现 帮助
注册 登录
L2j
/
l2j-server-game
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

BETA: Adding more interfaces:
* ISpawnable
* IStorable
* IRestorable
* IDeletable
* Patch by: UnAfraid
* INamable
* Enforcing IIdentifiable on Macro, L2Clan
* Patch by: xban1x

* Reviewed by: Nos

xban1x 11 年之前
父节点
00f7762ac2
当前提交
522a682236
共有 77 个文件被更改，包括 401 次插入 和 231 次删除
合并视图 显示文件统计
  1. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/Shutdown.java
  2. 4 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/ClanBBSManager.java
  3. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java
  4. 5 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ClanTable.java
  5. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CrestTable.java
  6. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java
  7. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManager.java
  8. 4 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java
  9. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java
  10. 8 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java
  11. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java
  12. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
  13. 4 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java
  14. 48 44
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java
  15. 9 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java
  16. 6 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/Macro.java
  17. 6 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/MacroList.java
  18. 3 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/PartyMatchRoom.java
  19. 7 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/ShortCuts.java
  20. 5 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java
  21. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java
  22. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Playable.java
  23. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java
  24. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
  25. 7 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java
  26. 7 11
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableAirShipInstance.java
  27. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableMobInstance.java
  28. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java
  29. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FlameTowerInstance.java
  30. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java
  31. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java
  32. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java
  33. 16 23
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  34. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
  35. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java
  36. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
  37. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java
  38. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
  39. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java
  40. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
  41. 4 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java
  42. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java
  43. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java
  44. 9 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java
  45. 14 14
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java
  46. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
  47. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java
  48. 27 0
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IDeletable.java
  49. 28 0
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/INamable.java
  50. 27 0
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IRestorable.java
  51. 27 0
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/ISpawnable.java
  52. 27 0
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IStorable.java
  53. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ClanWarehouse.java
  54. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java
  55. 3 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/variables/AbstractVariables.java
  56. 8 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/variables/AccountVariables.java
  57. 8 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/variables/PlayerVariables.java
  58. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/L2GameClient.java
  59. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java
  60. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java
  61. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSetAllyCrest.java
  62. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java
  63. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java
  64. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
  65. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/writepackets/InitWorldInfo.java
  66. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/writepackets/WorldInfo.java
  67. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java
  68. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewPledgeInfo.java
  69. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeInfo.java
  70. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
  71. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
  72. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java
  73. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java
  74. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java
  75. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SiegeDefenderList.java
  76. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java
  77. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/util/Evolve.java

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/Shutdown.java
查看文件 

@@ -552,7 +552,7 @@ public class Shutdown extends Thread
 
 		_log.info("Quest Manager: Data saved(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");

 		_log.info("Quest Manager: Data saved(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");

 		

 		

 		// Save all global variables data

 		// Save all global variables data

-		GlobalVariablesManager.getInstance().store();

+		GlobalVariablesManager.getInstance().storeMe();

 		_log.info("Global Variables Manager: Variables saved(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");

 		_log.info("Global Variables Manager: Variables saved(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");

 		

 		

 		// Save items on ground before closing

 		// Save items on ground before closing

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/ClanBBSManager.java
查看文件 

@@ -161,7 +161,7 @@ public class ClanBBSManager extends BaseBBSManager
 
 		}

 		}

 		

 		

 		// header

 		// header

-		final StringBuilder html = StringUtil.startAppend(2000, "<html><body><br><br><center><br1><br1><table border=0 cellspacing=0 cellpadding=0><tr><td FIXWIDTH=15>&nbsp;</td><td width=610 height=30 align=left><a action=\"bypass _bbsclan_clanlist\"> CLAN COMMUNITY </a></td></tr></table><table border=0 cellspacing=0 cellpadding=0 width=610 bgcolor=434343><tr><td height=10></td></tr><tr><td fixWIDTH=5></td><td fixWIDTH=600><a action=\"bypass _bbsclan_clanhome;", String.valueOf((activeChar.getClan() != null) ? activeChar.getClan().getClanId() : 0), "\">[GO TO MY CLAN]</a>&nbsp;&nbsp;</td><td fixWIDTH=5></td></tr><tr><td height=10></td></tr></table><br><table border=0 cellspacing=0 cellpadding=2 bgcolor=5A5A5A width=610><tr><td FIXWIDTH=5></td><td FIXWIDTH=200 align=center>CLAN NAME</td><td FIXWIDTH=200 align=center>CLAN LEADER</td><td FIXWIDTH=100 align=center>CLAN LEVEL</td><td FIXWIDTH=100 align=center>CLAN MEMBERS</td><td FIXWIDTH=5></td></tr></table><img src=\"L2UI.Squareblank\" width=\"1\" height=\"5\">");

+		final StringBuilder html = StringUtil.startAppend(2000, "<html><body><br><br><center><br1><br1><table border=0 cellspacing=0 cellpadding=0><tr><td FIXWIDTH=15>&nbsp;</td><td width=610 height=30 align=left><a action=\"bypass _bbsclan_clanlist\"> CLAN COMMUNITY </a></td></tr></table><table border=0 cellspacing=0 cellpadding=0 width=610 bgcolor=434343><tr><td height=10></td></tr><tr><td fixWIDTH=5></td><td fixWIDTH=600><a action=\"bypass _bbsclan_clanhome;", String.valueOf((activeChar.getClan() != null) ? activeChar.getClan().getId() : 0), "\">[GO TO MY CLAN]</a>&nbsp;&nbsp;</td><td fixWIDTH=5></td></tr><tr><td height=10></td></tr></table><br><table border=0 cellspacing=0 cellpadding=2 bgcolor=5A5A5A width=610><tr><td FIXWIDTH=5></td><td FIXWIDTH=200 align=center>CLAN NAME</td><td FIXWIDTH=200 align=center>CLAN LEADER</td><td FIXWIDTH=100 align=center>CLAN LEVEL</td><td FIXWIDTH=100 align=center>CLAN MEMBERS</td><td FIXWIDTH=5></td></tr></table><img src=\"L2UI.Squareblank\" width=\"1\" height=\"5\">");

 		

 		

 		int i = 0;

 		int i = 0;

 		for (L2Clan cl : ClanTable.getInstance().getClans())

 		for (L2Clan cl : ClanTable.getInstance().getClans())

@@ -173,7 +173,7 @@ public class ClanBBSManager extends BaseBBSManager
 
 			

 			

 			if (i++ >= ((index - 1) * 7))

 			if (i++ >= ((index - 1) * 7))

 			{

 			{

-				StringUtil.append(html, "<img src=\"L2UI.SquareBlank\" width=\"610\" height=\"3\"><table border=0 cellspacing=0 cellpadding=0 width=610><tr> <td FIXWIDTH=5></td><td FIXWIDTH=200 align=center><a action=\"bypass _bbsclan_clanhome;", String.valueOf(cl.getClanId()), "\">", cl.getName(), "</a></td><td FIXWIDTH=200 align=center>", cl.getLeaderName(), "</td><td FIXWIDTH=100 align=center>", String.valueOf(cl.getLevel()), "</td><td FIXWIDTH=100 align=center>", String.valueOf(cl.getMembersCount()), "</td><td FIXWIDTH=5></td></tr><tr><td height=5></td></tr></table><img src=\"L2UI.SquareBlank\" width=\"610\" height=\"3\"><img src=\"L2UI.SquareGray\" width=\"610\" height=\"1\">");

+				StringUtil.append(html, "<img src=\"L2UI.SquareBlank\" width=\"610\" height=\"3\"><table border=0 cellspacing=0 cellpadding=0 width=610><tr> <td FIXWIDTH=5></td><td FIXWIDTH=200 align=center><a action=\"bypass _bbsclan_clanhome;", String.valueOf(cl.getId()), "\">", cl.getName(), "</a></td><td FIXWIDTH=200 align=center>", cl.getLeaderName(), "</td><td FIXWIDTH=100 align=center>", String.valueOf(cl.getLevel()), "</td><td FIXWIDTH=100 align=center>", String.valueOf(cl.getMembersCount()), "</td><td FIXWIDTH=5></td></tr><tr><td height=5></td></tr></table><img src=\"L2UI.SquareBlank\" width=\"610\" height=\"3\"><img src=\"L2UI.SquareGray\" width=\"610\" height=\"1\">");

 			}

 			}

 		}

 		}

 		

 		

@@ -226,7 +226,7 @@ public class ClanBBSManager extends BaseBBSManager
 
 	 */

 	 */

 	private void clanhome(L2PcInstance activeChar)

 	private void clanhome(L2PcInstance activeChar)

 	{

 	{

-		clanhome(activeChar, activeChar.getClan().getClanId());

+		clanhome(activeChar, activeChar.getClan().getId());

 	}

 	}

 	

 	

 	private static class SingletonHolder

 	private static class SingletonHolder

@@ -270,7 +270,7 @@ public class ClanBBSManager extends BaseBBSManager
 
 		if (ar1.equals("Set"))

 		if (ar1.equals("Set"))

 		{

 		{

 			activeChar.getClan().setNotice(ar4);

 			activeChar.getClan().setNotice(ar4);

-			parsecmd("_bbsclan_clanhome;" + activeChar.getClan().getClanId(), activeChar);

+			parsecmd("_bbsclan_clanhome;" + activeChar.getClan().getId(), activeChar);

 		}

 		}

 	}

 	}

 }
 
 }

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java
查看文件 

@@ -162,7 +162,7 @@ public class CharSummonTable
 
 		

 		

 		if (!pet.isRespawned())

 		if (!pet.isRespawned())

 		{

 		{

-			pet.store();

+			pet.storeMe();

 		}

 		}

 		

 		

 		activeChar.setPet(pet);

 		activeChar.setPet(pet);

+ 5 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ClanTable.java
查看文件 

@@ -100,7 +100,7 @@ public class ClanTable
 
 				clan = getClan(clanId);

 				clan = getClan(clanId);

 				if (clan.getDissolvingExpiryTime() != 0)

 				if (clan.getDissolvingExpiryTime() != 0)

 				{

 				{

-					scheduleRemoveClan(clan.getClanId());

+					scheduleRemoveClan(clan.getId());

 				}

 				}

 				clanCount++;

 				clanCount++;

 			}

 			}

@@ -201,7 +201,7 @@ public class ClanTable
 
 		player.setPledgeClass(L2ClanMember.calculatePledgeClass(player));

 		player.setPledgeClass(L2ClanMember.calculatePledgeClass(player));

 		player.setClanPrivileges(L2Clan.CP_ALL);

 		player.setClanPrivileges(L2Clan.CP_ALL);

 		

 		

-		_clans.put(Integer.valueOf(clan.getClanId()), clan);

+		_clans.put(Integer.valueOf(clan.getId()), clan);

 		

 		

 		// should be update packet only

 		// should be update packet only

 		player.sendPacket(new PledgeShowInfoUpdate(clan));

 		player.sendPacket(new PledgeShowInfoUpdate(clan));

@@ -254,7 +254,7 @@ public class ClanTable
 
 		Auction auction = AuctionManager.getInstance().getAuction(clan.getAuctionBiddedAt());

 		Auction auction = AuctionManager.getInstance().getAuction(clan.getAuctionBiddedAt());

 		if (auction != null)

 		if (auction != null)

 		{

 		{

-			auction.cancelBid(clan.getClanId());

+			auction.cancelBid(clan.getId());

 		}

 		}

 		

 		

 		L2ClanMember leaderMember = clan.getLeader();

 		L2ClanMember leaderMember = clan.getLeader();

@@ -478,7 +478,7 @@ public class ClanTable
 
 			}

 			}

 			clan1.deleteEnemyClan(clan2);

 			clan1.deleteEnemyClan(clan2);

 			clan2.deleteEnemyClan(clan1);

 			clan2.deleteEnemyClan(clan1);

-			deleteclanswars(clan1.getClanId(), clan2.getClanId());

+			deleteclanswars(clan1.getId(), clan2.getId());

 		}

 		}

 	}

 	}

 	

 	

@@ -518,7 +518,7 @@ public class ClanTable
 
 		for (L2Clan clan : _clans.values())

 		for (L2Clan clan : _clans.values())

 		{

 		{

 			int allyId = clan.getAllyId();

 			int allyId = clan.getAllyId();

-			if ((allyId != 0) && (clan.getClanId() != allyId))

+			if ((allyId != 0) && (clan.getId() != allyId))

 			{

 			{

 				if (!_clans.containsKey(allyId))

 				if (!_clans.containsKey(allyId))

 				{

 				{

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CrestTable.java
查看文件 

@@ -126,7 +126,7 @@ public final class CrestTable
 
 			{

 			{

 				if (getCrest(clan.getCrestId()) == null)

 				if (getCrest(clan.getCrestId()) == null)

 				{

 				{

-					_log.info("Removing non-existent crest for clan " + clan.getName() + " [" + clan.getClanId() + "], crestId:" + clan.getCrestId());

+					_log.info("Removing non-existent crest for clan " + clan.getName() + " [" + clan.getId() + "], crestId:" + clan.getCrestId());

 					clan.setCrestId(0);

 					clan.setCrestId(0);

 					clan.changeClanCrest(0);

 					clan.changeClanCrest(0);

 				}

 				}

@@ -136,7 +136,7 @@ public final class CrestTable
 
 			{

 			{

 				if (getCrest(clan.getCrestLargeId()) == null)

 				if (getCrest(clan.getCrestLargeId()) == null)

 				{

 				{

-					_log.info("Removing non-existent large crest for clan " + clan.getName() + " [" + clan.getClanId() + "], crestLargeId:" + clan.getCrestLargeId());

+					_log.info("Removing non-existent large crest for clan " + clan.getName() + " [" + clan.getId() + "], crestLargeId:" + clan.getCrestLargeId());

 					clan.setCrestLargeId(0);

 					clan.setCrestLargeId(0);

 					clan.changeLargeCrest(0);

 					clan.changeLargeCrest(0);

 				}

 				}

@@ -146,7 +146,7 @@ public final class CrestTable
 
 			{

 			{

 				if (getCrest(clan.getAllyCrestId()) == null)

 				if (getCrest(clan.getAllyCrestId()) == null)

 				{

 				{

-					_log.info("Removing non-existent ally crest for clan " + clan.getName() + " [" + clan.getClanId() + "], allyCrestId:" + clan.getAllyCrestId());

+					_log.info("Removing non-existent ally crest for clan " + clan.getName() + " [" + clan.getId() + "], allyCrestId:" + clan.getAllyCrestId());

 					clan.setAllyCrestId(0);

 					clan.setAllyCrestId(0);

 					clan.changeAllyCrest(0, true);

 					clan.changeAllyCrest(0, true);

 				}

 				}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java
查看文件 

@@ -143,7 +143,7 @@ public final class CHSiegeManager
 
 		{

 		{

 			player.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);

 			player.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);

 		}

 		}

-		else if (hall.getOwnerId() == clan.getClanId())

+		else if (hall.getOwnerId() == clan.getId())

 		{

 		{

 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);

 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);

 		}

 		}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManager.java
查看文件 

@@ -104,7 +104,7 @@ public final class CastleManager implements InstanceListManager
 
 	{

 	{

 		for (Castle temp : getCastles())

 		for (Castle temp : getCastles())

 		{

 		{

-			if (temp.getOwnerId() == clan.getClanId())

+			if (temp.getOwnerId() == clan.getId())

 			{

 			{

 				return temp;

 				return temp;

 			}

 			}

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java
查看文件 

@@ -191,7 +191,7 @@ public final class ClanHallManager
 
 		{

 		{

 			_clanHall.get(chId).free();

 			_clanHall.get(chId).free();

 		}

 		}

-		ClanTable.getInstance().getClan(clan.getClanId()).setHideoutId(chId);

+		ClanTable.getInstance().getClan(clan.getId()).setHideoutId(chId);

 		_clanHall.get(chId).setOwner(clan);

 		_clanHall.get(chId).setOwner(clan);

 	}

 	}

 	

 	

@@ -277,7 +277,7 @@ public final class ClanHallManager
 
 	{

 	{

 		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet())

 		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet())

 		{

 		{

-			if (clan.getClanId() == ch.getValue().getOwnerId())

+			if (clan.getId() == ch.getValue().getOwnerId())

 			{

 			{

 				return ch.getValue();

 				return ch.getValue();

 			}

 			}

@@ -290,14 +290,14 @@ public final class ClanHallManager
 
 		// Separate loops to avoid iterating over free clan halls

 		// Separate loops to avoid iterating over free clan halls

 		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet())

 		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet())

 		{

 		{

-			if (clan.getClanId() == ch.getValue().getOwnerId())

+			if (clan.getId() == ch.getValue().getOwnerId())

 			{

 			{

 				return ch.getValue();

 				return ch.getValue();

 			}

 			}

 		}

 		}

 		for (Map.Entry<Integer, SiegableHall> ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet())

 		for (Map.Entry<Integer, SiegableHall> ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet())

 		{

 		{

-			if (clan.getClanId() == ch.getValue().getOwnerId())

+			if (clan.getId() == ch.getValue().getOwnerId())

 			{

 			{

 				return ch.getValue();

 				return ch.getValue();

 			}

 			}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java
查看文件 

@@ -131,7 +131,7 @@ public final class FortSiegeManager
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans where clan_id=? and fort_id=?"))

 			PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans where clan_id=? and fort_id=?"))

 		{

 		{

-			ps.setInt(1, clan.getClanId());

+			ps.setInt(1, clan.getId());

 			ps.setInt(2, fortid);

 			ps.setInt(2, fortid);

 			try (ResultSet rs = ps.executeQuery())

 			try (ResultSet rs = ps.executeQuery())

 			{

 			{

+ 8 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java
查看文件 

@@ -45,11 +45,11 @@ public final class GlobalVariablesManager extends AbstractVariables
 
 	

 	

 	protected GlobalVariablesManager()

 	protected GlobalVariablesManager()

 	{

 	{

-		load();

+		restoreMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

-	protected void load()

+	public boolean restoreMe()

 	{

 	{

 		// Restore previous variables.

 		// Restore previous variables.

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

@@ -64,21 +64,23 @@ public final class GlobalVariablesManager extends AbstractVariables
 
 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore global variables");

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore global variables");

+			return false;

 		}

 		}

 		finally

 		finally

 		{

 		{

 			compareAndSetChanges(true, false);

 			compareAndSetChanges(true, false);

 		}

 		}

 		_log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + getSet().size() + " variables.");

 		_log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + getSet().size() + " variables.");

+		return true;

 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void store()

+	public boolean storeMe()

 	{

 	{

 		// No changes, nothing to store.

 		// No changes, nothing to store.

 		if (!hasChanges())

 		if (!hasChanges())

 		{

 		{

-			return;

+			return false;

 		}

 		}

 		

 		

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

@@ -100,12 +102,14 @@ public final class GlobalVariablesManager extends AbstractVariables
 
 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't save global variables to database.", e);

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't save global variables to database.", e);

+			return false;

 		}

 		}

 		finally

 		finally

 		{

 		{

 			compareAndSetChanges(true, false);

 			compareAndSetChanges(true, false);

 		}

 		}

 		_log.log(Level.INFO, getClass().getSimpleName() + ": Stored " + getSet().size() + " variables.");

 		_log.log(Level.INFO, getClass().getSimpleName() + ": Stored " + getSet().size() + " variables.");

+		return true;

 	}

 	}

 	

 	

 	/**

 	/**

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java
查看文件 

@@ -134,7 +134,7 @@ public final class SiegeManager
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement statement = con.prepareStatement("SELECT clan_id FROM siege_clans where clan_id=? and castle_id=?"))

 			PreparedStatement statement = con.prepareStatement("SELECT clan_id FROM siege_clans where clan_id=? and castle_id=?"))

 		{

 		{

-			statement.setInt(1, clan.getClanId());

+			statement.setInt(1, clan.getId());

 			statement.setInt(2, castleid);

 			statement.setInt(2, castleid);

 			try (ResultSet rs = statement.executeQuery())

 			try (ResultSet rs = statement.executeQuery())

 			{

 			{

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
查看文件 

@@ -325,7 +325,7 @@ public final class TerritoryWarManager implements Siegable
 
 		}

 		}

 		

 		

 		_registeredClans.get(castleId).add(clan);

 		_registeredClans.get(castleId).add(clan);

-		changeRegistration(castleId, clan.getClanId(), false);

+		changeRegistration(castleId, clan.getId(), false);

 	}

 	}

 	

 	

 	public void registerMerc(int castleId, L2PcInstance player)

 	public void registerMerc(int castleId, L2PcInstance player)

@@ -352,7 +352,7 @@ public final class TerritoryWarManager implements Siegable
 
 		else if ((_registeredClans.get(castleId) != null) && _registeredClans.get(castleId).contains(clan))

 		else if ((_registeredClans.get(castleId) != null) && _registeredClans.get(castleId).contains(clan))

 		{

 		{

 			_registeredClans.get(castleId).remove(clan);

 			_registeredClans.get(castleId).remove(clan);

-			changeRegistration(castleId, clan.getClanId(), true);

+			changeRegistration(castleId, clan.getId(), true);

 		}

 		}

 	}

 	}

 	

 	

@@ -1167,7 +1167,7 @@ public final class TerritoryWarManager implements Siegable
 
 		{

 		{

 			for (L2Clan clan : _registeredClans.get(castleId))

 			for (L2Clan clan : _registeredClans.get(castleId))

 			{

 			{

-				changeRegistration(castleId, clan.getClanId(), true);

+				changeRegistration(castleId, clan.getId(), true);

 			}

 			}

 		}

 		}

 		for (Integer castleId : _registeredMercenaries.keySet())

 		for (Integer castleId : _registeredMercenaries.keySet())

+ 4 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java
查看文件 

@@ -36,6 +36,7 @@ import com.l2jserver.gameserver.model.L2Party.messageType;
 
 import com.l2jserver.gameserver.model.actor.L2Attackable;

 import com.l2jserver.gameserver.model.actor.L2Attackable;

 import com.l2jserver.gameserver.model.actor.L2Character;

 import com.l2jserver.gameserver.model.actor.L2Character;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

+import com.l2jserver.gameserver.model.interfaces.INamable;

 import com.l2jserver.gameserver.model.items.L2Item;

 import com.l2jserver.gameserver.model.items.L2Item;

 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

 import com.l2jserver.gameserver.model.skills.L2Skill;

 import com.l2jserver.gameserver.model.skills.L2Skill;

@@ -51,7 +52,7 @@ import com.l2jserver.gameserver.util.Broadcast;
 
 import com.l2jserver.gameserver.util.Point3D;

 import com.l2jserver.gameserver.util.Point3D;

 import com.l2jserver.util.Rnd;

 import com.l2jserver.util.Rnd;

 

 

-public class CursedWeapon

+public class CursedWeapon implements INamable

 {

 {

 	private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName());

 	private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName());

 	

 	

@@ -110,7 +111,7 @@ public class CursedWeapon
 
 				

 				

 				// Remove

 				// Remove

 				_player.getInventory().unEquipItemInBodySlot(L2Item.SLOT_LR_HAND);

 				_player.getInventory().unEquipItemInBodySlot(L2Item.SLOT_LR_HAND);

-				_player.store();

+				_player.storeMe();

 				

 				

 				// Destroy

 				// Destroy

 				L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);

 				L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);

@@ -645,6 +646,7 @@ public class CursedWeapon
 
 		return _endTime;

 		return _endTime;

 	}

 	}

 	

 	

+	@Override

 	public String getName()

 	public String getName()

 	{

 	{

 		return _name;

 		return _name;

+ 48 - 44
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java
查看文件 

@@ -45,6 +45,8 @@ import com.l2jserver.gameserver.instancemanager.SiegeManager;
 
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;

 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;

 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;

 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;

+import com.l2jserver.gameserver.model.interfaces.INamable;

 import com.l2jserver.gameserver.model.itemcontainer.ClanWarehouse;

 import com.l2jserver.gameserver.model.itemcontainer.ClanWarehouse;

 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;

 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;

 import com.l2jserver.gameserver.model.skills.L2Skill;

 import com.l2jserver.gameserver.model.skills.L2Skill;

@@ -77,7 +79,7 @@ import com.l2jserver.gameserver.scripting.scriptengine.listeners.clan.ClanCreati
 
 import com.l2jserver.gameserver.scripting.scriptengine.listeners.clan.ClanMembershipListener;

 import com.l2jserver.gameserver.scripting.scriptengine.listeners.clan.ClanMembershipListener;

 import com.l2jserver.gameserver.util.Util;

 import com.l2jserver.gameserver.util.Util;

 

 

-public class L2Clan

+public class L2Clan implements IIdentifiable, INamable

 {

 {

 	private static final Logger _log = Logger.getLogger(L2Clan.class.getName());

 	private static final Logger _log = Logger.getLogger(L2Clan.class.getName());

 	

 	

@@ -218,7 +220,8 @@ public class L2Clan
 
 	/**

 	/**

 	 * @return Returns the clanId.

 	 * @return Returns the clanId.

 	 */

 	 */

-	public int getClanId()

+	@Override

+	public int getId()

 	{

 	{

 		return _clanId;

 		return _clanId;

 	}

 	}

@@ -362,6 +365,7 @@ public class L2Clan
 
 	/**

 	/**

 	 * @return the clan name.

 	 * @return the clan name.

 	 */

 	 */

+	@Override

 	public String getName()

 	public String getName()

 	{

 	{

 		return _name;

 		return _name;

@@ -749,7 +753,7 @@ public class L2Clan
 
 				_forum = forum.getChildByName(_name);

 				_forum = forum.getChildByName(_name);

 				if (_forum == null)

 				if (_forum == null)

 				{

 				{

-					_forum = ForumsBBSManager.getInstance().createNewForum(_name, ForumsBBSManager.getInstance().getForumByName("ClanRoot"), Forum.CLAN, Forum.CLANMEMBERONLY, getClanId());

+					_forum = ForumsBBSManager.getInstance().createNewForum(_name, ForumsBBSManager.getInstance().getForumByName("ClanRoot"), Forum.CLAN, Forum.CLANMEMBERONLY, getId());

 				}

 				}

 			}

 			}

 		}

 		}

@@ -895,7 +899,7 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?"))

 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?"))

 		{

 		{

 			ps.setInt(1, getBloodAllianceCount());

 			ps.setInt(1, getBloodAllianceCount());

-			ps.setInt(2, getClanId());

+			ps.setInt(2, getId());

 			ps.execute();

 			ps.execute();

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -939,7 +943,7 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?"))

 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?"))

 		{

 		{

 			ps.setInt(1, getBloodOathCount());

 			ps.setInt(1, getBloodOathCount());

-			ps.setInt(2, getClanId());

+			ps.setInt(2, getId());

 			ps.execute();

 			ps.execute();

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -957,7 +961,7 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?"))

 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?"))

 		{

 		{

 			ps.setInt(1, getReputationScore());

 			ps.setInt(1, getReputationScore());

-			ps.setInt(2, getClanId());

+			ps.setInt(2, getId());

 			ps.execute();

 			ps.execute();

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -994,11 +998,11 @@ public class L2Clan
 
 			ps.setLong(7, getCharPenaltyExpiryTime());

 			ps.setLong(7, getCharPenaltyExpiryTime());

 			ps.setLong(8, getDissolvingExpiryTime());

 			ps.setLong(8, getDissolvingExpiryTime());

 			ps.setInt(9, getNewLeaderId());

 			ps.setInt(9, getNewLeaderId());

-			ps.setInt(10, getClanId());

+			ps.setInt(10, getId());

 			ps.execute();

 			ps.execute();

 			if (Config.DEBUG)

 			if (Config.DEBUG)

 			{

 			{

-				_log.fine("New clan leader saved in db: " + getClanId());

+				_log.fine("New clan leader saved in db: " + getId());

 			}

 			}

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -1027,7 +1031,7 @@ public class L2Clan
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA))

 			PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA))

 		{

 		{

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			ps.setString(2, getName());

 			ps.setString(2, getName());

 			ps.setInt(3, getLevel());

 			ps.setInt(3, getLevel());

 			ps.setInt(4, getCastleId());

 			ps.setInt(4, getCastleId());

@@ -1043,7 +1047,7 @@ public class L2Clan
 
 			ps.execute();

 			ps.execute();

 			if (Config.DEBUG)

 			if (Config.DEBUG)

 			{

 			{

-				_log.fine("New clan saved in db: " + getClanId());

+				_log.fine("New clan saved in db: " + getId());

 			}

 			}

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -1071,7 +1075,7 @@ public class L2Clan
 
 			ps1.execute();

 			ps1.execute();

 			if (Config.DEBUG)

 			if (Config.DEBUG)

 			{

 			{

-				_log.fine("clan member removed in db: " + getClanId());

+				_log.fine("clan member removed in db: " + getId());

 			}

 			}

 			// Remove apprentice.

 			// Remove apprentice.

 			ps2.setInt(1, member.getObjectId());

 			ps2.setInt(1, member.getObjectId());

@@ -1091,7 +1095,7 @@ public class L2Clan
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA))

 			PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA))

 		{

 		{

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			try (ResultSet clanData = ps.executeQuery())

 			try (ResultSet clanData = ps.executeQuery())

 			{

 			{

 				if (clanData.next())

 				if (clanData.next())

@@ -1129,7 +1133,7 @@ public class L2Clan
 
 					

 					

 					try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?"))

 					try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?"))

 					{

 					{

-						select.setInt(1, getClanId());

+						select.setInt(1, getId());

 						try (ResultSet clanMember = select.executeQuery())

 						try (ResultSet clanMember = select.executeQuery())

 						{

 						{

 							L2ClanMember member = null;

 							L2ClanMember member = null;

@@ -1171,7 +1175,7 @@ public class L2Clan
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?"))

 			PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?"))

 		{

 		{

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			try (ResultSet noticeData = ps.executeQuery())

 			try (ResultSet noticeData = ps.executeQuery())

 			{

 			{

 				while (noticeData.next())

 				while (noticeData.next())

@@ -1202,7 +1206,7 @@ public class L2Clan
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?"))

 			PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?"))

 		{

 		{

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			ps.setString(2, notice);

 			ps.setString(2, notice);

 			if (enabled)

 			if (enabled)

 			{

 			{

@@ -1262,7 +1266,7 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?"))

 			PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?"))

 		{

 		{

 			// Retrieve all skills of this L2PcInstance from the database

 			// Retrieve all skills of this L2PcInstance from the database

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			try (ResultSet rset = ps.executeQuery())

 			try (ResultSet rset = ps.executeQuery())

 			{

 			{

 				// Go though the recordset of this SQL query

 				// Go though the recordset of this SQL query

@@ -1390,7 +1394,7 @@ public class L2Clan
 
 					{

 					{

 						ps.setInt(1, newSkill.getLevel());

 						ps.setInt(1, newSkill.getLevel());

 						ps.setInt(2, oldSkill.getId());

 						ps.setInt(2, oldSkill.getId());

-						ps.setInt(3, getClanId());

+						ps.setInt(3, getId());

 						ps.execute();

 						ps.execute();

 					}

 					}

 				}

 				}

@@ -1398,7 +1402,7 @@ public class L2Clan
 
 				{

 				{

 					try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)"))

 					try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)"))

 					{

 					{

-						ps.setInt(1, getClanId());

+						ps.setInt(1, getId());

 						ps.setInt(2, newSkill.getId());

 						ps.setInt(2, newSkill.getId());

 						ps.setInt(3, newSkill.getLevel());

 						ps.setInt(3, newSkill.getLevel());

 						ps.setString(4, newSkill.getName());

 						ps.setString(4, newSkill.getName());

@@ -1641,7 +1645,7 @@ public class L2Clan
 
 	@Override

 	@Override

 	public String toString()

 	public String toString()

 	{

 	{

-		return getName() + "[" + getClanId() + "]";

+		return getName() + "[" + getId() + "]";

 	}

 	}

 	

 	

 	public ItemContainer getWarehouse()

 	public ItemContainer getWarehouse()

@@ -1669,7 +1673,7 @@ public class L2Clan
 
 		}

 		}

 		if (!_atWarWith.isEmpty())

 		if (!_atWarWith.isEmpty())

 		{

 		{

-			if (_atWarWith.contains(clan.getClanId()))

+			if (_atWarWith.contains(clan.getId()))

 			{

 			{

 				return true;

 				return true;

 			}

 			}

@@ -1691,7 +1695,7 @@ public class L2Clan
 
 	

 	

 	public void setEnemyClan(L2Clan clan)

 	public void setEnemyClan(L2Clan clan)

 	{

 	{

-		Integer id = clan.getClanId();

+		Integer id = clan.getId();

 		_atWarWith.add(id);

 		_atWarWith.add(id);

 	}

 	}

 	

 	

@@ -1702,7 +1706,7 @@ public class L2Clan
 
 	

 	

 	public void setAttackerClan(L2Clan clan)

 	public void setAttackerClan(L2Clan clan)

 	{

 	{

-		Integer id = clan.getClanId();

+		Integer id = clan.getId();

 		_atWarAttackers.add(id);

 		_atWarAttackers.add(id);

 	}

 	}

 	

 	

@@ -1713,13 +1717,13 @@ public class L2Clan
 
 	

 	

 	public void deleteEnemyClan(L2Clan clan)

 	public void deleteEnemyClan(L2Clan clan)

 	{

 	{

-		Integer id = clan.getClanId();

+		Integer id = clan.getId();

 		_atWarWith.remove(id);

 		_atWarWith.remove(id);

 	}

 	}

 	

 	

 	public void deleteAttackerClan(L2Clan clan)

 	public void deleteAttackerClan(L2Clan clan)

 	{

 	{

-		Integer id = clan.getClanId();

+		Integer id = clan.getId();

 		_atWarAttackers.remove(id);

 		_atWarAttackers.remove(id);

 	}

 	}

 	

 	

@@ -1856,7 +1860,7 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?"))

 			PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?"))

 		{

 		{

 			// Retrieve all subpledges of this clan from the database

 			// Retrieve all subpledges of this clan from the database

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			try (ResultSet rset = ps.executeQuery())

 			try (ResultSet rset = ps.executeQuery())

 			{

 			{

 				while (rset.next())

 				while (rset.next())

@@ -1960,7 +1964,7 @@ public class L2Clan
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)"))

 			PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)"))

 		{

 		{

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			ps.setInt(2, pledgeType);

 			ps.setInt(2, pledgeType);

 			ps.setString(3, subPledgeName);

 			ps.setString(3, subPledgeName);

 			ps.setInt(4, pledgeType != -1 ? leaderId : 0);

 			ps.setInt(4, pledgeType != -1 ? leaderId : 0);

@@ -1986,7 +1990,7 @@ public class L2Clan
 
 			

 			

 			if (Config.DEBUG)

 			if (Config.DEBUG)

 			{

 			{

-				_log.fine("New sub_clan saved in db: " + getClanId() + "; " + pledgeType);

+				_log.fine("New sub_clan saved in db: " + getId() + "; " + pledgeType);

 			}

 			}

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -2036,12 +2040,12 @@ public class L2Clan
 
 		{

 		{

 			ps.setInt(1, getSubPledge(pledgeType).getLeaderId());

 			ps.setInt(1, getSubPledge(pledgeType).getLeaderId());

 			ps.setString(2, getSubPledge(pledgeType).getName());

 			ps.setString(2, getSubPledge(pledgeType).getName());

-			ps.setInt(3, getClanId());

+			ps.setInt(3, getId());

 			ps.setInt(4, pledgeType);

 			ps.setInt(4, pledgeType);

 			ps.execute();

 			ps.execute();

 			if (Config.DEBUG)

 			if (Config.DEBUG)

 			{

 			{

-				_log.fine("Subpledge updated in db: " + getClanId());

+				_log.fine("Subpledge updated in db: " + getId());

 			}

 			}

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -2056,7 +2060,7 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?"))

 			PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?"))

 		{

 		{

 			// Retrieve all skills of this L2PcInstance from the database

 			// Retrieve all skills of this L2PcInstance from the database

-			ps.setInt(1, getClanId());

+			ps.setInt(1, getId());

 			// _log.warning("clanPrivs restore for ClanId : "+getClanId());

 			// _log.warning("clanPrivs restore for ClanId : "+getClanId());

 			try (ResultSet rset = ps.executeQuery())

 			try (ResultSet rset = ps.executeQuery())

 			{

 			{

@@ -2111,7 +2115,7 @@ public class L2Clan
 
 				PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?"))

 				PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?"))

 			{

 			{

 				// Retrieve all skills of this L2PcInstance from the database

 				// Retrieve all skills of this L2PcInstance from the database

-				ps.setInt(1, getClanId());

+				ps.setInt(1, getId());

 				ps.setInt(2, rank);

 				ps.setInt(2, rank);

 				ps.setInt(3, 0);

 				ps.setInt(3, 0);

 				ps.setInt(4, privs);

 				ps.setInt(4, privs);

@@ -2148,7 +2152,7 @@ public class L2Clan
 
 				PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)"))

 				PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)"))

 			{

 			{

 				// Retrieve all skills of this L2PcInstance from the database

 				// Retrieve all skills of this L2PcInstance from the database

-				ps.setInt(1, getClanId());

+				ps.setInt(1, getId());

 				ps.setInt(2, rank);

 				ps.setInt(2, rank);

 				ps.setInt(3, 0);

 				ps.setInt(3, 0);

 				ps.setInt(4, privs);

 				ps.setInt(4, privs);

@@ -2272,7 +2276,7 @@ public class L2Clan
 
 				PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?"))

 				PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?"))

 			{

 			{

 				ps.setInt(1, id);

 				ps.setInt(1, id);

-				ps.setInt(2, getClanId());

+				ps.setInt(2, getId());

 				ps.execute();

 				ps.execute();

 			}

 			}

 			catch (Exception e)

 			catch (Exception e)

@@ -2433,7 +2437,7 @@ public class L2Clan
 
 			activeChar.sendPacket(SystemMessageId.OPPOSING_CLAN_IS_PARTICIPATING_IN_SIEGE);

 			activeChar.sendPacket(SystemMessageId.OPPOSING_CLAN_IS_PARTICIPATING_IN_SIEGE);

 			return false;

 			return false;

 		}

 		}

-		if (leaderClan.isAtWarWith(targetClan.getClanId()))

+		if (leaderClan.isAtWarWith(targetClan.getId()))

 		{

 		{

 			activeChar.sendPacket(SystemMessageId.MAY_NOT_ALLY_CLAN_BATTLE);

 			activeChar.sendPacket(SystemMessageId.MAY_NOT_ALLY_CLAN_BATTLE);

 			return false;

 			return false;

@@ -2540,7 +2544,7 @@ public class L2Clan
 
 			return;

 			return;

 		}

 		}

 		

 		

-		setAllyId(getClanId());

+		setAllyId(getId());

 		setAllyName(allyName.trim());

 		setAllyName(allyName.trim());

 		setAllyPenaltyExpiryTime(0, 0);

 		setAllyPenaltyExpiryTime(0, 0);

 		updateClanInDB();

 		updateClanInDB();

@@ -2561,7 +2565,7 @@ public class L2Clan
 
 			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);

 			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);

 			return;

 			return;

 		}

 		}

-		if (!player.isClanLeader() || (getClanId() != getAllyId()))

+		if (!player.isClanLeader() || (getId() != getAllyId()))

 		{

 		{

 			player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);

 			player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);

 			return;

 			return;

@@ -2577,7 +2581,7 @@ public class L2Clan
 
 		long currentTime = System.currentTimeMillis();

 		long currentTime = System.currentTimeMillis();

 		for (L2Clan clan : ClanTable.getInstance().getClanAllies(getAllyId()))

 		for (L2Clan clan : ClanTable.getInstance().getClanAllies(getAllyId()))

 		{

 		{

-			if (clan.getClanId() != getClanId())

+			if (clan.getId() != getId())

 			{

 			{

 				clan.setAllyId(0);

 				clan.setAllyId(0);

 				clan.setAllyName(null);

 				clan.setAllyName(null);

@@ -2804,7 +2808,7 @@ public class L2Clan
 
 				boolean hasTerritory = false;

 				boolean hasTerritory = false;

 				for (Territory terr : TerritoryWarManager.getInstance().getAllTerritories())

 				for (Territory terr : TerritoryWarManager.getInstance().getAllTerritories())

 				{

 				{

-					if (terr.getOwnerClan().getClanId() == getClanId())

+					if (terr.getOwnerClan().getId() == getId())

 					{

 					{

 						hasTerritory = true;

 						hasTerritory = true;

 						break;

 						break;

@@ -2848,7 +2852,7 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?"))

 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?"))

 		{

 		{

 			ps.setInt(1, level);

 			ps.setInt(1, level);

-			ps.setInt(2, getClanId());

+			ps.setInt(2, getId());

 			ps.execute();

 			ps.execute();

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -2902,12 +2906,12 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?"))

 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?"))

 		{

 		{

 			ps.setInt(1, crestId);

 			ps.setInt(1, crestId);

-			ps.setInt(2, getClanId());

+			ps.setInt(2, getId());

 			ps.executeUpdate();

 			ps.executeUpdate();

 		}

 		}

 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

-			_log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getClanId() + "] : " + e.getMessage(), e);

+			_log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e);

 		}

 		}

 		

 		

 		for (L2PcInstance member : getOnlineMembers(0))

 		for (L2PcInstance member : getOnlineMembers(0))

@@ -2924,7 +2928,7 @@ public class L2Clan
 
 	public void changeAllyCrest(int crestId, boolean onlyThisClan)

 	public void changeAllyCrest(int crestId, boolean onlyThisClan)

 	{

 	{

 		String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?";

 		String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?";

-		int allyId = getClanId();

+		int allyId = getId();

 		if (!onlyThisClan)

 		if (!onlyThisClan)

 		{

 		{

 			if (getAllyCrestId() != 0)

 			if (getAllyCrestId() != 0)

@@ -2985,12 +2989,12 @@ public class L2Clan
 
 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?"))

 			PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?"))

 		{

 		{

 			ps.setInt(1, crestId);

 			ps.setInt(1, crestId);

-			ps.setInt(2, getClanId());

+			ps.setInt(2, getId());

 			ps.executeUpdate();

 			ps.executeUpdate();

 		}

 		}

 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

-			_log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getClanId() + "] : " + e.getMessage(), e);

+			_log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e);

 		}

 		}

 		

 		

 		for (L2PcInstance member : getOnlineMembers(0))

 		for (L2PcInstance member : getOnlineMembers(0))

+ 9 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java
查看文件 

@@ -37,6 +37,8 @@ import com.l2jserver.gameserver.model.actor.poly.ObjectPoly;
 
 import com.l2jserver.gameserver.model.actor.position.ObjectPosition;

 import com.l2jserver.gameserver.model.actor.position.ObjectPosition;

 import com.l2jserver.gameserver.model.entity.Instance;

 import com.l2jserver.gameserver.model.entity.Instance;

 import com.l2jserver.gameserver.model.interfaces.IIdentifiable;

 import com.l2jserver.gameserver.model.interfaces.IIdentifiable;

+import com.l2jserver.gameserver.model.interfaces.INamable;

+import com.l2jserver.gameserver.model.interfaces.ISpawnable;

 import com.l2jserver.gameserver.model.zone.ZoneId;

 import com.l2jserver.gameserver.model.zone.ZoneId;

 import com.l2jserver.gameserver.network.SystemMessageId;

 import com.l2jserver.gameserver.network.SystemMessageId;

 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

@@ -50,7 +52,7 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 
  * <BR>

  * <BR>

  * <li>L2Character</li> <li>L2ItemInstance</li>

  * <li>L2Character</li> <li>L2ItemInstance</li>

  */

  */

-public abstract class L2Object extends ObjectPosition implements IIdentifiable

+public abstract class L2Object extends ObjectPosition implements IIdentifiable, INamable, ISpawnable

 {

 {

 	private boolean _isVisible; // Object visibility

 	private boolean _isVisible; // Object visibility

 	private ObjectKnownList _knownList;

 	private ObjectKnownList _knownList;

@@ -289,7 +291,8 @@ public abstract class L2Object extends ObjectPosition implements IIdentifiable
 
 	 * <BR>

 	 * <BR>

 	 * <li>Create Door</li> <li>Spawn : Monster, Minion, CTs, Summon...</li><BR>

 	 * <li>Create Door</li> <li>Spawn : Monster, Minion, CTs, Summon...</li><BR>

 	 */

 	 */

-	public final void spawnMe()

+	@Override

+	public final boolean spawnMe()

 	{

 	{

 		assert (getWorldRegion() == null) && (getWorldPosition().getX() != 0) && (getWorldPosition().getY() != 0) && (getWorldPosition().getZ() != 0);

 		assert (getWorldRegion() == null) && (getWorldPosition().getX() != 0) && (getWorldPosition().getY() != 0) && (getWorldPosition().getZ() != 0);

 		

 		

@@ -306,12 +309,13 @@ public abstract class L2Object extends ObjectPosition implements IIdentifiable
 
 			getWorldRegion().addVisibleObject(this);

 			getWorldRegion().addVisibleObject(this);

 		}

 		}

 		

 		

-		// this can synchronize on others instances, so it's out of

-		// synchronized, to avoid deadlocks

+		// this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks

 		// Add the L2Object spawn in the world as a visible object

 		// Add the L2Object spawn in the world as a visible object

 		L2World.getInstance().addVisibleObject(this, getWorldRegion());

 		L2World.getInstance().addVisibleObject(this, getWorldRegion());

 		

 		

 		onSpawn();

 		onSpawn();

+		

+		return true;

 	}

 	}

 	

 	

 	public final void spawnMe(int x, int y, int z)

 	public final void spawnMe(int x, int y, int z)

@@ -418,6 +422,7 @@ public abstract class L2Object extends ObjectPosition implements IIdentifiable
 
 		_knownList = value;

 		_knownList = value;

 	}

 	}

 	

 	

+	@Override

 	public final String getName()

 	public final String getName()

 	{

 	{

 		return _name;

 		return _name;

+ 6 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/Macro.java
查看文件 

@@ -20,7 +20,10 @@ package com.l2jserver.gameserver.model;
 
 

 

 import java.util.List;

 import java.util.List;

 

 

-public class Macro

+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;

+import com.l2jserver.gameserver.model.interfaces.INamable;

+

+public class Macro implements IIdentifiable, INamable

 {

 {

 	public static final int CMD_TYPE_SKILL = 1;

 	public static final int CMD_TYPE_SKILL = 1;

 	public static final int CMD_TYPE_ACTION = 3;

 	public static final int CMD_TYPE_ACTION = 3;

@@ -43,6 +46,7 @@ public class Macro
 
 		_commands = list;

 		_commands = list;

 	}

 	}

 	

 	

+	@Override

 	public int getId()

 	public int getId()

 	{

 	{

 		return _id;

 		return _id;

@@ -58,6 +62,7 @@ public class Macro
 
 		return _icon;

 		return _icon;

 	}

 	}

 	

 	

+	@Override

 	public String getName()

 	public String getName()

 	{

 	{

 		return _name;

 		return _name;

+ 6 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/MacroList.java
查看文件 

@@ -33,10 +33,11 @@ import java.util.logging.Logger;
 
 

 

 import com.l2jserver.L2DatabaseFactory;

 import com.l2jserver.L2DatabaseFactory;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

+import com.l2jserver.gameserver.model.interfaces.IRestorable;

 import com.l2jserver.gameserver.network.serverpackets.SendMacroList;

 import com.l2jserver.gameserver.network.serverpackets.SendMacroList;

 import com.l2jserver.util.StringUtil;

 import com.l2jserver.util.StringUtil;

 

 

-public class MacroList

+public class MacroList implements IRestorable

 {

 {

 	private static final Logger _log = Logger.getLogger(MacroList.class.getName());

 	private static final Logger _log = Logger.getLogger(MacroList.class.getName());

 	

 	

@@ -177,7 +178,8 @@ public class MacroList
 
 		}

 		}

 	}

 	}

 	

 	

-	public void restore()

+	@Override

+	public boolean restoreMe()

 	{

 	{

 		_macroses.clear();

 		_macroses.clear();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

@@ -219,6 +221,8 @@ public class MacroList
 
 		catch (Exception e)

 		catch (Exception e)

 		{

 		{

 			_log.log(Level.WARNING, "could not store shortcuts:", e);

 			_log.log(Level.WARNING, "could not store shortcuts:", e);

+			return false;

 		}

 		}

+		return true;

 	}

 	}

 }

 }

+ 3 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/PartyMatchRoom.java
查看文件 

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 
 import java.util.List;

 import java.util.List;

 

 

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;

 import com.l2jserver.gameserver.network.SystemMessageId;

 import com.l2jserver.gameserver.network.SystemMessageId;

 import com.l2jserver.gameserver.network.serverpackets.ExManagePartyRoomMember;

 import com.l2jserver.gameserver.network.serverpackets.ExManagePartyRoomMember;

 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;

 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;

@@ -29,7 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**

 /**

  * @author Gnacik

  * @author Gnacik

  */

  */

-public class PartyMatchRoom

+public class PartyMatchRoom implements IIdentifiable

 {

 {

 	private final int _id;

 	private final int _id;

 	private String _title;

 	private String _title;

@@ -110,6 +111,7 @@ public class PartyMatchRoom
 
 		}

 		}

 	}

 	}

 	

 	

+	@Override

 	public int getId()

 	public int getId()

 	{

 	{

 		return _id;

 		return _id;

+ 7 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/ShortCuts.java
查看文件 

@@ -28,13 +28,14 @@ import java.util.logging.Logger;
 
 

 

 import com.l2jserver.L2DatabaseFactory;

 import com.l2jserver.L2DatabaseFactory;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

+import com.l2jserver.gameserver.model.interfaces.IRestorable;

 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;

 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;

 import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;

 import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;

 import com.l2jserver.gameserver.network.serverpackets.ShortCutInit;

 import com.l2jserver.gameserver.network.serverpackets.ShortCutInit;

 import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;

 import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;

 

 

-public class ShortCuts

+public class ShortCuts implements IRestorable

 {

 {

 	private static Logger _log = Logger.getLogger(ShortCuts.class.getName());

 	private static Logger _log = Logger.getLogger(ShortCuts.class.getName());

 	private static final int MAX_SHORTCUTS_PER_BAR = 12;

 	private static final int MAX_SHORTCUTS_PER_BAR = 12;

@@ -172,7 +173,8 @@ public class ShortCuts
 
 		}

 		}

 	}

 	}

 	

 	

-	public void restore()

+	@Override

+	public boolean restoreMe()

 	{

 	{

 		_shortCuts.clear();

 		_shortCuts.clear();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

@@ -198,6 +200,7 @@ public class ShortCuts
 
 		catch (Exception e)

 		catch (Exception e)

 		{

 		{

 			_log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e);

 			_log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e);

+			return false;

 		}

 		}

 		

 		

 		// Verify shortcuts

 		// Verify shortcuts

@@ -216,6 +219,8 @@ public class ShortCuts
 
 				}

 				}

 			}

 			}

 		}

 		}

+		

+		return true;

 	}

 	}

 	

 	

 	/**

 	/**

+ 5 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java
查看文件 

@@ -92,6 +92,7 @@ import com.l2jserver.gameserver.model.entity.Instance;
 
 import com.l2jserver.gameserver.model.holders.SkillHolder;

 import com.l2jserver.gameserver.model.holders.SkillHolder;

 import com.l2jserver.gameserver.model.holders.SkillUseHolder;

 import com.l2jserver.gameserver.model.holders.SkillUseHolder;

 import com.l2jserver.gameserver.model.interfaces.IChanceSkillTrigger;

 import com.l2jserver.gameserver.model.interfaces.IChanceSkillTrigger;

+import com.l2jserver.gameserver.model.interfaces.IDeletable;

 import com.l2jserver.gameserver.model.interfaces.IPositionable;

 import com.l2jserver.gameserver.model.interfaces.IPositionable;

 import com.l2jserver.gameserver.model.interfaces.ISkillsHolder;

 import com.l2jserver.gameserver.model.interfaces.ISkillsHolder;

 import com.l2jserver.gameserver.model.itemcontainer.Inventory;

 import com.l2jserver.gameserver.model.itemcontainer.Inventory;

@@ -159,7 +160,7 @@ import com.l2jserver.util.Rnd;
 
  * This link is stored in {@link #_template}

  * This link is stored in {@link #_template}

  * @version $Revision: 1.53.2.45.2.34 $ $Date: 2005/04/11 10:06:08 $

  * @version $Revision: 1.53.2.45.2.34 $ $Date: 2005/04/11 10:06:08 $

  */

  */

-public abstract class L2Character extends L2Object implements ISkillsHolder

+public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable

 {

 {

 	public static final Logger _log = Logger.getLogger(L2Character.class.getName());

 	public static final Logger _log = Logger.getLogger(L2Character.class.getName());

 	

 	

@@ -2364,7 +2365,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 
 		return true;

 		return true;

 	}

 	}

 	

 	

-	public void deleteMe()

+	@Override

+	public boolean deleteMe()

 	{

 	{

 		setDebug(null);

 		setDebug(null);

 		

 		

@@ -2372,6 +2374,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 
 		{

 		{

 			getAI().stopAITask();

 			getAI().stopAITask();

 		}

 		}

+		return true;

 	}

 	}

 	

 	

 	protected void calculateRewards(L2Character killer)

 	protected void calculateRewards(L2Character killer)

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java
查看文件 

@@ -1507,7 +1507,7 @@ public class L2Npc extends L2Character
 
 	 * UnAfraid: TODO: Add Listener here

 	 * UnAfraid: TODO: Add Listener here

 	 */

 	 */

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		L2WorldRegion oldRegion = getWorldRegion();

 		L2WorldRegion oldRegion = getWorldRegion();

 		

 		

@@ -1556,7 +1556,7 @@ public class L2Npc extends L2Character
 
 		// Remove L2Object object from _allObjects of L2World

 		// Remove L2Object object from _allObjects of L2World

 		L2World.getInstance().removeObject(this);

 		L2World.getInstance().removeObject(this);

 		

 		

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	/**

 	/**

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Playable.java
查看文件 

@@ -356,7 +356,7 @@ public abstract class L2Playable extends L2Character
 
 	

 	

 	public abstract boolean useMagic(L2Skill skill, boolean forceUse, boolean dontMove);

 	public abstract boolean useMagic(L2Skill skill, boolean forceUse, boolean dontMove);

 	

 	

-	public abstract void store();

+	public abstract void storeMe();

 	

 	

 	public abstract void storeEffect(boolean storeEffects);

 	public abstract void storeEffect(boolean storeEffects);

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java
查看文件 

@@ -452,7 +452,7 @@ public abstract class L2Summon extends L2Playable
 
 				getOwner().setPetInvItems(false);

 				getOwner().setPetInvItems(false);

 			}

 			}

 			

 			

-			store();

+			storeMe();

 			storeEffect(true);

 			storeEffect(true);

 			owner.setPet(null);

 			owner.setPet(null);

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
查看文件 

@@ -410,7 +410,7 @@ public abstract class L2Vehicle extends L2Character
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		_engine = null;

 		_engine = null;

 		

 		

@@ -463,7 +463,7 @@ public abstract class L2Vehicle extends L2Character
 
 		// Remove L2Object object from _allObjects of L2World

 		// Remove L2Object object from _allObjects of L2World

 		L2World.getInstance().removeObject(this);

 		L2World.getInstance().removeObject(this);

 		

 		

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 7 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java
查看文件 

@@ -159,10 +159,15 @@ public class L2AirShipInstance extends L2Vehicle
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

-		super.deleteMe();

+		if (!super.deleteMe())

+		{

+			return false;

+		}

+		

 		AirShipManager.getInstance().removeAirShip(this);

 		AirShipManager.getInstance().removeAirShip(this);

+		return true;

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 7 - 11
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableAirShipInstance.java
查看文件 

@@ -19,7 +19,6 @@
 
 package com.l2jserver.gameserver.model.actor.instance;

 package com.l2jserver.gameserver.model.actor.instance;

 

 

 import java.util.concurrent.Future;

 import java.util.concurrent.Future;

-import java.util.logging.Level;

 

 

 import com.l2jserver.gameserver.ThreadPoolManager;

 import com.l2jserver.gameserver.ThreadPoolManager;

 import com.l2jserver.gameserver.enums.InstanceType;

 import com.l2jserver.gameserver.enums.InstanceType;

@@ -260,9 +259,12 @@ public class L2ControllableAirShipInstance extends L2AirShipInstance
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

-		super.deleteMe();

+		if (!super.deleteMe())

+		{

+			return false;

+		}

 		

 		

 		if (_checkTask != null)

 		if (_checkTask != null)

 		{

 		{

@@ -275,14 +277,8 @@ public class L2ControllableAirShipInstance extends L2AirShipInstance
 
 			_consumeFuelTask = null;

 			_consumeFuelTask = null;

 		}

 		}

 		

 		

-		try

-		{

-			broadcastPacket(new DeleteObject(_helmId));

-		}

-		catch (Exception e)

-		{

-			_log.log(Level.SEVERE, "Failed decayMe():" + e.getMessage());

-		}

+		broadcastPacket(new DeleteObject(_helmId));

+		return true;

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableMobInstance.java
查看文件 

@@ -108,10 +108,10 @@ public class L2ControllableMobInstance extends L2MonsterInstance
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		removeAI();

 		removeAI();

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	/**

 	/**

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java
查看文件 

@@ -438,7 +438,7 @@ public class L2DoorInstance extends L2Character
 
 		else if (isCastle)

 		else if (isCastle)

 		{

 		{

 			L2Clan clan = actingPlayer.getClan();

 			L2Clan clan = actingPlayer.getClan();

-			if ((clan != null) && (clan.getClanId() == getCastle().getOwnerId()))

+			if ((clan != null) && (clan.getId() == getCastle().getOwnerId()))

 			{

 			{

 				return false;

 				return false;

 			}

 			}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FlameTowerInstance.java
查看文件 

@@ -50,10 +50,10 @@ public class L2FlameTowerInstance extends L2Tower
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		enableZones(false);

 		enableZones(false);

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	public final void enableZones(boolean state)

 	public final void enableZones(boolean state)

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java
查看文件 

@@ -86,7 +86,7 @@ public class L2FortDoormenInstance extends L2DoormenInstance
 
 	{

 	{

 		if ((player.getClan() != null) && (getFort() != null) && (getFort().getOwnerClan() != null))

 		if ((player.getClan() != null) && (getFort() != null) && (getFort().getOwnerClan() != null))

 		{

 		{

-			if (player.getClanId() == getFort().getOwnerClan().getClanId())

+			if (player.getClanId() == getFort().getOwnerClan().getId())

 			{

 			{

 				return true;

 				return true;

 			}

 			}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java
查看文件 

@@ -1003,7 +1003,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 
 				{

 				{

 					return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege

 					return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege

 				}

 				}

-				else if ((getFort().getOwnerClan() != null) && (getFort().getOwnerClan().getClanId() == player.getClanId()))

+				else if ((getFort().getOwnerClan() != null) && (getFort().getOwnerClan().getId() == player.getClanId()))

 				{

 				{

 					return COND_OWNER; // Owner

 					return COND_OWNER; // Owner

 				}

 				}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java
查看文件 

@@ -182,7 +182,7 @@ public class L2MonsterInstance extends L2Attackable
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		if (_maintenanceTask != null)

 		if (_maintenanceTask != null)

 		{

 		{

@@ -200,7 +200,7 @@ public class L2MonsterInstance extends L2Attackable
 
 			getLeader().getMinionList().onMinionDie(this, 0);

 			getLeader().getMinionList().onMinionDie(this, 0);

 		}

 		}

 		

 		

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 16 - 23
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
查看文件 

@@ -1048,10 +1048,10 @@ public final class L2PcInstance extends L2Playable
 
 		}

 		}

 		if ((getClan() != null) && (target.getClan() != null))

 		if ((getClan() != null) && (target.getClan() != null))

 		{

 		{

-			if ((target.getPledgeType() != L2Clan.SUBUNIT_ACADEMY) && (getPledgeType() != L2Clan.SUBUNIT_ACADEMY) && target.getClan().isAtWarWith(getClan().getClanId()))

+			if ((target.getPledgeType() != L2Clan.SUBUNIT_ACADEMY) && (getPledgeType() != L2Clan.SUBUNIT_ACADEMY) && target.getClan().isAtWarWith(getClan().getId()))

 			{

 			{

 				result |= RelationChanged.RELATION_1SIDED_WAR;

 				result |= RelationChanged.RELATION_1SIDED_WAR;

-				if (getClan().isAtWarWith(target.getClan().getClanId()))

+				if (getClan().isAtWarWith(target.getClan().getId()))

 				{

 				{

 					result |= RelationChanged.RELATION_MUTUAL_WAR;

 					result |= RelationChanged.RELATION_MUTUAL_WAR;

 				}

 				}

@@ -5538,7 +5538,7 @@ public final class L2PcInstance extends L2Playable
 
 					{

 					{

 						if ((pk != null) && (pk.getClan() != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember()))

 						if ((pk != null) && (pk.getClan() != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember()))

 						{

 						{

-							if ((_clan.isAtWarWith(pk.getClanId()) && pk.getClan().isAtWarWith(_clan.getClanId())) || (isInSiege() && pk.isInSiege()))

+							if ((_clan.isAtWarWith(pk.getClanId()) && pk.getClan().isAtWarWith(_clan.getId())) || (isInSiege() && pk.isInSiege()))

 							{

 							{

 								if (AntiFeedManager.getInstance().check(killer, this))

 								if (AntiFeedManager.getInstance().check(killer, this))

 								{

 								{

@@ -6418,7 +6418,7 @@ public final class L2PcInstance extends L2Playable
 
 			return;

 			return;

 		}

 		}

 		

 		

-		_clanId = clan.getClanId();

+		_clanId = clan.getId();

 		if (_isOnline)

 		if (_isOnline)

 		{

 		{

 			CommunityServerThread.getInstance().sendPacket(new WorldInfo(this, null, WorldInfo.TYPE_UPDATE_PLAYER_DATA));

 			CommunityServerThread.getInstance().sendPacket(new WorldInfo(this, null, WorldInfo.TYPE_UPDATE_PLAYER_DATA));

@@ -7507,10 +7507,10 @@ public final class L2PcInstance extends L2Playable
 
 		restoreSkills();

 		restoreSkills();

 		

 		

 		// Retrieve from the database all macroses of this L2PcInstance and add them to _macros.

 		// Retrieve from the database all macroses of this L2PcInstance and add them to _macros.

-		_macros.restore();

+		_macros.restoreMe();

 		

 		

 		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.

 		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.

-		_shortCuts.restore();

+		_shortCuts.restoreMe();

 		

 		

 		// Retrieve from the database all henna of this L2PcInstance and add them to _henna.

 		// Retrieve from the database all henna of this L2PcInstance and add them to _henna.

 		restoreHenna();

 		restoreHenna();

@@ -7674,18 +7674,18 @@ public final class L2PcInstance extends L2Playable
 
 		final PlayerVariables vars = getScript(PlayerVariables.class);

 		final PlayerVariables vars = getScript(PlayerVariables.class);

 		if (vars != null)

 		if (vars != null)

 		{

 		{

-			vars.store();

+			vars.storeMe();

 		}

 		}

 		

 		

 		final AccountVariables aVars = getScript(AccountVariables.class);

 		final AccountVariables aVars = getScript(AccountVariables.class);

 		if (aVars != null)

 		if (aVars != null)

 		{

 		{

-			aVars.store();

+			aVars.storeMe();

 		}

 		}

 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void store()

+	public void storeMe()

 	{

 	{

 		store(true);

 		store(true);

 	}

 	}

@@ -9347,7 +9347,7 @@ public final class L2PcInstance extends L2Playable
 
 			{

 			{

 				if ((getClan() != null) && (targetPlayer.getClan() != null))

 				if ((getClan() != null) && (targetPlayer.getClan() != null))

 				{

 				{

-					if (getClan().isAtWarWith(targetPlayer.getClan().getClanId()) && targetPlayer.getClan().isAtWarWith(getClan().getClanId()))

+					if (getClan().isAtWarWith(targetPlayer.getClan().getId()) && targetPlayer.getClan().isAtWarWith(getClan().getId()))

 					{

 					{

 						return true;

 						return true;

 					}

 					}

@@ -10661,7 +10661,7 @@ public final class L2PcInstance extends L2Playable
 
 			// Clear resurrect xp calculation

 			// Clear resurrect xp calculation

 			setExpBeforeDeath(0);

 			setExpBeforeDeath(0);

 			

 			

-			_shortCuts.restore();

+			_shortCuts.restoreMe();

 			sendPacket(new ShortCutInit(this));

 			sendPacket(new ShortCutInit(this));

 			

 			

 			broadcastPacket(new SocialAction(getObjectId(), SocialAction.LEVEL_UP));

 			broadcastPacket(new SocialAction(getObjectId(), SocialAction.LEVEL_UP));

@@ -11447,11 +11447,11 @@ public final class L2PcInstance extends L2Playable
 
 	 * </ul>

 	 * </ul>

 	 */

 	 */

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		cleanup();

 		cleanup();

-		store();

-		super.deleteMe();

+		storeMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	private synchronized void cleanup()

 	private synchronized void cleanup()

@@ -14262,7 +14262,7 @@ public final class L2PcInstance extends L2Playable
 
 				{

 				{

 					return false;

 					return false;

 				}

 				}

-				if (getClan().isAtWarWith(target.getClan().getClanId()) && target.getClan().isAtWarWith(getClan().getClanId()))

+				if (getClan().isAtWarWith(target.getClan().getId()) && target.getClan().isAtWarWith(getClan().getId()))

 				{

 				{

 					return true;

 					return true;

 				}

 				}

@@ -14309,14 +14309,7 @@ public final class L2PcInstance extends L2Playable
 
 			statement.setInt(1, getObjectId());

 			statement.setInt(1, getObjectId());

 			try (ResultSet rset = statement.executeQuery())

 			try (ResultSet rset = statement.executeQuery())

 			{

 			{

-				if (rset.next() && (rset.getInt("object_id") > 0))

-				{

-					setPetInvItems(true);

-				}

-				else

-				{

-					setPetInvItems(false);

-				}

+				setPetInvItems(rset.next() && (rset.getInt("object_id") > 0));

 			}

 			}

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
查看文件 

@@ -982,7 +982,7 @@ public class L2PetInstance extends L2Summon
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void store()

+	public void storeMe()

 	{

 	{

 		if (getControlObjectId() == 0)

 		if (getControlObjectId() == 0)

 		{

 		{

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java
查看文件 

@@ -270,7 +270,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		if (_victimSpawnKeyBoxTask != null)

 		if (_victimSpawnKeyBoxTask != null)

 		{

 		{

@@ -283,7 +283,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 
 			_onDeadEventTask = null;

 			_onDeadEventTask = null;

 		}

 		}

 		

 		

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	private void giveCup(L2Character killer)

 	private void giveCup(L2Character killer)

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
查看文件 

@@ -86,7 +86,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		if (_closeTask != null)

 		if (_closeTask != null)

 		{

 		{

@@ -103,7 +103,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 
 			_spawnMonsterTask.cancel(true);

 			_spawnMonsterTask.cancel(true);

 			_spawnMonsterTask = null;

 			_spawnMonsterTask = null;

 		}

 		}

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java
查看文件 

@@ -324,7 +324,7 @@ public class L2ServitorInstance extends L2Summon
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void store()

+	public void storeMe()

 	{

 	{

 		if ((_referenceSkill == 0) || isDead())

 		if ((_referenceSkill == 0) || isDead())

 		{

 		{

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
查看文件 

@@ -303,7 +303,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		if (_buffTask != null)

 		if (_buffTask != null)

 		{

 		{

@@ -325,7 +325,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 
 		_remainingTime = 0;

 		_remainingTime = 0;

 		

 		

 		// remove the spawn

 		// remove the spawn

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	// notification triggered by the owner when the owner is attacked.

 	// notification triggered by the owner when the owner is attacked.

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java
查看文件 

@@ -225,14 +225,14 @@ public final class L2TrapInstance extends L2Npc
 
 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void deleteMe()

+	public boolean deleteMe()

 	{

 	{

 		if (_owner != null)

 		if (_owner != null)

 		{

 		{

 			_owner.setTrap(null);

 			_owner.setTrap(null);

 			_owner = null;

 			_owner = null;

 		}

 		}

-		super.deleteMe();

+		return super.deleteMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
查看文件 

@@ -943,7 +943,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 
 		clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000L)); // 24*60*60*1000 = 86400000

 		clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000L)); // 24*60*60*1000 = 86400000

 		clan.updateClanInDB();

 		clan.updateClanInDB();

 		

 		

-		ClanTable.getInstance().scheduleRemoveClan(clan.getClanId());

+		ClanTable.getInstance().scheduleRemoveClan(clan.getId());

 		

 		

 		// The clan leader should take the XP penalty of a full death.

 		// The clan leader should take the XP penalty of a full death.

 		player.deathPenalty(false, false, false);

 		player.deathPenalty(false, false, false);

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java
查看文件 

@@ -303,12 +303,12 @@ public class Castle
 
 		{

 		{

 			return;

 			return;

 		}

 		}

-		_engrave.put(target.getObjectId(), clan.getClanId());

+		_engrave.put(target.getObjectId(), clan.getId());

 		if (_engrave.size() == _artefacts.size())

 		if (_engrave.size() == _artefacts.size())

 		{

 		{

 			for (L2ArtefactInstance art : _artefacts)

 			for (L2ArtefactInstance art : _artefacts)

 			{

 			{

-				if (_engrave.get(art.getObjectId()) != clan.getClanId())

+				if (_engrave.get(art.getObjectId()) != clan.getId())

 				{

 				{

 					return;

 					return;

 				}

 				}

@@ -539,7 +539,7 @@ public class Castle
 
 	public void setOwner(L2Clan clan)

 	public void setOwner(L2Clan clan)

 	{

 	{

 		// Remove old owner

 		// Remove old owner

-		if ((getOwnerId() > 0) && ((clan == null) || (clan.getClanId() != getOwnerId())))

+		if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId())))

 		{

 		{

 			L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance

 			L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance

 			if (oldOwner != null)

 			if (oldOwner != null)

@@ -906,7 +906,7 @@ public class Castle
 
 	{

 	{

 		if (clan != null)

 		if (clan != null)

 		{

 		{

-			_ownerId = clan.getClanId(); // Update owner id property

+			_ownerId = clan.getId(); // Update owner id property

 		}

 		}

 		else

 		else

 		{

 		{

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java
查看文件 

@@ -367,7 +367,7 @@ public abstract class ClanHall
 
 		{

 		{

 			return;

 			return;

 		}

 		}

-		_ownerId = clan.getClanId();

+		_ownerId = clan.getId();

 		_isFree = false;

 		_isFree = false;

 		clan.setHideoutId(getId());

 		clan.setHideoutId(getId());

 		// Announce to Online member new ClanHall

 		// Announce to Online member new ClanHall

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java
查看文件 

@@ -346,7 +346,7 @@ public class Fort
 
 	 */

 	 */

 	public void banishForeigners()

 	public void banishForeigners()

 	{

 	{

-		getFortZone().banishForeigners(getOwnerClan().getClanId());

+		getFortZone().banishForeigners(getOwnerClan().getId());

 	}

 	}

 	

 	

 	/**

 	/**

@@ -872,7 +872,7 @@ public class Fort
 
 		int clanId = 0;

 		int clanId = 0;

 		if (clan != null)

 		if (clan != null)

 		{

 		{

-			clanId = clan.getClanId();

+			clanId = clan.getId();

 			_lastOwnedTime.setTimeInMillis(System.currentTimeMillis());

 			_lastOwnedTime.setTimeInMillis(System.currentTimeMillis());

 		}

 		}

 		else

 		else

+ 9 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java
查看文件 

@@ -276,7 +276,7 @@ public class FortSiege implements Siegable
 
 			int ownerId = -1;

 			int ownerId = -1;

 			if (getFort().getOwnerClan() != null)

 			if (getFort().getOwnerClan() != null)

 			{

 			{

-				ownerId = getFort().getOwnerClan().getClanId();

+				ownerId = getFort().getOwnerClan().getId();

 			}

 			}

 			getFort().getZone().banishForeigners(ownerId);

 			getFort().getZone().banishForeigners(ownerId);

 			getFort().getZone().setIsActive(false);

 			getFort().getZone().setIsActive(false);

@@ -389,7 +389,7 @@ public class FortSiege implements Siegable
 
 		}

 		}

 		if (getFort().getOwnerClan() != null)

 		if (getFort().getOwnerClan() != null)

 		{

 		{

-			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getClanId());

+			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId());

 			for (L2PcInstance member : clan.getOnlineMembers(0))

 			for (L2PcInstance member : clan.getOnlineMembers(0))

 			{

 			{

 				if (member != null)

 				if (member != null)

@@ -441,7 +441,7 @@ public class FortSiege implements Siegable
 
 		}

 		}

 		if (getFort().getOwnerClan() != null)

 		if (getFort().getOwnerClan() != null)

 		{

 		{

-			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getClanId());

+			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId());

 			for (L2PcInstance member : clan.getOnlineMembers(0))

 			for (L2PcInstance member : clan.getOnlineMembers(0))

 			{

 			{

 				if (member == null)

 				if (member == null)

@@ -529,7 +529,7 @@ public class FortSiege implements Siegable
 
 			{

 			{

 				try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?"))

 				try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?"))

 				{

 				{

-					delete.setInt(1, getFort().getOwnerClan().getClanId());

+					delete.setInt(1, getFort().getOwnerClan().getId());

 					delete.execute();

 					delete.execute();

 				}

 				}

 			}

 			}

@@ -605,7 +605,7 @@ public class FortSiege implements Siegable
 
 		L2Clan clan;

 		L2Clan clan;

 		if (getFort().getOwnerClan() != null)

 		if (getFort().getOwnerClan() != null)

 		{

 		{

-			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getClanId());

+			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId());

 			if (clan != getFort().getOwnerClan())

 			if (clan != getFort().getOwnerClan())

 			{

 			{

 				return null;

 				return null;

@@ -813,7 +813,7 @@ public class FortSiege implements Siegable
 
 			return;

 			return;

 		}

 		}

 		

 		

-		removeSiegeClan(clan.getClanId());

+		removeSiegeClan(clan.getId());

 	}

 	}

 	

 	

 	/**

 	/**

@@ -1139,11 +1139,11 @@ public class FortSiege implements Siegable
 
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 			PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)"))

 			PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)"))

 		{

 		{

-			statement.setInt(1, clan.getClanId());

+			statement.setInt(1, clan.getId());

 			statement.setInt(2, getFort().getFortId());

 			statement.setInt(2, getFort().getFortId());

 			statement.execute();

 			statement.execute();

 			

 			

-			addAttacker(clan.getClanId());

+			addAttacker(clan.getId());

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

 		{

 		{

@@ -1227,7 +1227,7 @@ public class FortSiege implements Siegable
 
 			return null;

 			return null;

 		}

 		}

 		

 		

-		return getAttackerClan(clan.getClanId());

+		return getAttackerClan(clan.getId());

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 14 - 14
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java
查看文件 

@@ -268,7 +268,7 @@ public class Siege implements Siegable
 
 				sm.addCastleId(getCastle().getCastleId());

 				sm.addCastleId(getCastle().getCastleId());

 				Announcements.getInstance().announceToAll(sm);

 				Announcements.getInstance().announceToAll(sm);

 				

 				

-				if (clan.getClanId() == _firstOwnerClanId)

+				if (clan.getId() == _firstOwnerClanId)

 				{

 				{

 					// Owner is unchanged

 					// Owner is unchanged

 					clan.increaseBloodAllianceCount();

 					clan.increaseBloodAllianceCount();

@@ -425,7 +425,7 @@ public class Siege implements Siegable
 
 				// The player's clan is in an alliance

 				// The player's clan is in an alliance

 				for (L2Clan clan : ClanTable.getInstance().getClanAllies(allyId))

 				for (L2Clan clan : ClanTable.getInstance().getClanAllies(allyId))

 				{

 				{

-					final L2SiegeClan sc = getAttackerClan(clan.getClanId());

+					final L2SiegeClan sc = getAttackerClan(clan.getId());

 					if (sc != null)

 					if (sc != null)

 					{

 					{

 						removeAttacker(sc);

 						removeAttacker(sc);

@@ -795,7 +795,7 @@ public class Siege implements Siegable
 
 		for (L2SiegeClan siegeclan : getDefenderClans())

 		for (L2SiegeClan siegeclan : getDefenderClans())

 		{

 		{

 			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());

 			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());

-			if (clan.getClanId() == getCastle().getOwnerId())

+			if (clan.getId() == getCastle().getOwnerId())

 			{

 			{

 				continue;

 				continue;

 			}

 			}

@@ -833,7 +833,7 @@ public class Siege implements Siegable
 
 		for (L2SiegeClan siegeclan : getDefenderClans())

 		for (L2SiegeClan siegeclan : getDefenderClans())

 		{

 		{

 			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());

 			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());

-			if (clan.getClanId() != getCastle().getOwnerId())

+			if (clan.getId() != getCastle().getOwnerId())

 			{

 			{

 				continue;

 				continue;

 			}

 			}

@@ -1011,7 +1011,7 @@ public class Siege implements Siegable
 
 		{

 		{

 			return;

 			return;

 		}

 		}

-		removeSiegeClan(clan.getClanId());

+		removeSiegeClan(clan.getId());

 	}

 	}

 	

 	

 	/**

 	/**

@@ -1143,7 +1143,7 @@ public class Siege implements Siegable
 
 		{

 		{

 			player.sendPacket(SystemMessageId.ONLY_CLAN_LEVEL_5_ABOVE_MAY_SIEGE);

 			player.sendPacket(SystemMessageId.ONLY_CLAN_LEVEL_5_ABOVE_MAY_SIEGE);

 		}

 		}

-		else if (player.getClan().getClanId() == getCastle().getOwnerId())

+		else if (player.getClan().getId() == getCastle().getOwnerId())

 		{

 		{

 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);

 			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);

 		}

 		}

@@ -1401,7 +1401,7 @@ public class Siege implements Siegable
 
 			{

 			{

 				try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)"))

 				try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)"))

 				{

 				{

-					statement.setInt(1, clan.getClanId());

+					statement.setInt(1, clan.getId());

 					statement.setInt(2, getCastle().getCastleId());

 					statement.setInt(2, getCastle().getCastleId());

 					statement.setInt(3, typeId);

 					statement.setInt(3, typeId);

 					statement.execute();

 					statement.execute();

@@ -1413,22 +1413,22 @@ public class Siege implements Siegable
 
 				{

 				{

 					statement.setInt(1, typeId);

 					statement.setInt(1, typeId);

 					statement.setInt(2, getCastle().getCastleId());

 					statement.setInt(2, getCastle().getCastleId());

-					statement.setInt(3, clan.getClanId());

+					statement.setInt(3, clan.getId());

 					statement.execute();

 					statement.execute();

 				}

 				}

 			}

 			}

 			

 			

 			if ((typeId == DEFENDER) || (typeId == OWNER))

 			if ((typeId == DEFENDER) || (typeId == OWNER))

 			{

 			{

-				addDefender(clan.getClanId());

+				addDefender(clan.getId());

 			}

 			}

 			else if (typeId == ATTACKER)

 			else if (typeId == ATTACKER)

 			{

 			{

-				addAttacker(clan.getClanId());

+				addAttacker(clan.getId());

 			}

 			}

 			else if (typeId == DEFENDER_NOT_APPROWED)

 			else if (typeId == DEFENDER_NOT_APPROWED)

 			{

 			{

-				addDefenderWaiting(clan.getClanId());

+				addDefenderWaiting(clan.getId());

 			}

 			}

 		}

 		}

 		catch (Exception e)

 		catch (Exception e)

@@ -1572,7 +1572,7 @@ public class Siege implements Siegable
 
 		{

 		{

 			return null;

 			return null;

 		}

 		}

-		return getAttackerClan(clan.getClanId());

+		return getAttackerClan(clan.getId());

 	}

 	}

 	

 	

 	@Override

 	@Override

@@ -1619,7 +1619,7 @@ public class Siege implements Siegable
 
 		{

 		{

 			return null;

 			return null;

 		}

 		}

-		return getDefenderClan(clan.getClanId());

+		return getDefenderClan(clan.getId());

 	}

 	}

 	

 	

 	@Override

 	@Override

@@ -1651,7 +1651,7 @@ public class Siege implements Siegable
 
 		{

 		{

 			return null;

 			return null;

 		}

 		}

-		return getDefenderWaitingClan(clan.getClanId());

+		return getDefenderWaitingClan(clan.getId());

 	}

 	}

 	

 	

 	public final L2SiegeClan getDefenderWaitingClan(int clanId)

 	public final L2SiegeClan getDefenderWaitingClan(int clanId)

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
查看文件 

@@ -234,7 +234,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 
 			return false;

 			return false;

 		}

 		}

 		

 		

-		return _attackers.containsKey(clan.getClanId());

+		return _attackers.containsKey(clan.getId());

 	}

 	}

 	

 	

 	@Override

 	@Override

@@ -252,7 +252,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 
 	@Override

 	@Override

 	public L2SiegeClan getAttackerClan(L2Clan clan)

 	public L2SiegeClan getAttackerClan(L2Clan clan)

 	{

 	{

-		return getAttackerClan(clan.getClanId());

+		return getAttackerClan(clan.getId());

 	}

 	}

 	

 	

 	@Override

 	@Override

@@ -272,7 +272,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 
 		for (L2PcInstance pc : list)

 		for (L2PcInstance pc : list)

 		{

 		{

 			final L2Clan clan = pc.getClan();

 			final L2Clan clan = pc.getClan();

-			if ((clan != null) && getAttackers().containsKey(clan.getClanId()))

+			if ((clan != null) && getAttackers().containsKey(clan.getId()))

 			{

 			{

 				attackers.add(pc);

 				attackers.add(pc);

 			}

 			}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java
查看文件 

@@ -193,7 +193,7 @@ public final class SiegableHall extends ClanHall
 
 	{

 	{

 		if (getSiege() != null)

 		if (getSiege() != null)

 		{

 		{

-			getSiege().getAttackers().put(clan.getClanId(), new L2SiegeClan(clan.getClanId(), SiegeClanType.ATTACKER));

+			getSiege().getAttackers().put(clan.getId(), new L2SiegeClan(clan.getId(), SiegeClanType.ATTACKER));

 		}

 		}

 	}

 	}

 	

 	

@@ -201,7 +201,7 @@ public final class SiegableHall extends ClanHall
 
 	{

 	{

 		if (getSiege() != null)

 		if (getSiege() != null)

 		{

 		{

-			getSiege().getAttackers().remove(clan.getClanId());

+			getSiege().getAttackers().remove(clan.getId());

 		}

 		}

 	}

 	}

+ 27 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IDeletable.java
查看文件 

@@ -0,0 +1,27 @@
 
+/*

+ * Copyright (C) 2004-2013 L2J Server

+ * 

+ * This file is part of L2J Server.

+ * 

+ * L2J Server is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ * 

+ * L2J Server is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ * 

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+package com.l2jserver.gameserver.model.interfaces;

+

+/**

+ * @author UnAfraid

+ */

+public interface IDeletable

+{

+	public boolean deleteMe();

+}

+ 28 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/INamable.java
查看文件 

@@ -0,0 +1,28 @@
 
+/*

+ * Copyright (C) 2004-2013 L2J Server

+ * 

+ * This file is part of L2J Server.

+ * 

+ * L2J Server is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ * 

+ * L2J Server is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ * 

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+package com.l2jserver.gameserver.model.interfaces;

+

+/**

+ * Interface for objects with name.

+ * @author xban1x

+ */

+public interface INamable

+{

+	public String getName();

+}

+ 27 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IRestorable.java
查看文件 

@@ -0,0 +1,27 @@
 
+/*

+ * Copyright (C) 2004-2013 L2J Server

+ * 

+ * This file is part of L2J Server.

+ * 

+ * L2J Server is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ * 

+ * L2J Server is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ * 

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+package com.l2jserver.gameserver.model.interfaces;

+

+/**

+ * @author UnAfraid

+ */

+public interface IRestorable

+{

+	public boolean restoreMe();

+}

+ 27 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/ISpawnable.java
查看文件 

@@ -0,0 +1,27 @@
 
+/*

+ * Copyright (C) 2004-2013 L2J Server

+ * 

+ * This file is part of L2J Server.

+ * 

+ * L2J Server is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ * 

+ * L2J Server is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ * 

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+package com.l2jserver.gameserver.model.interfaces;

+

+/**

+ * @author UnAfraid

+ */

+public interface ISpawnable

+{

+	public boolean spawnMe();

+}

+ 27 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IStorable.java
查看文件 

@@ -0,0 +1,27 @@
 
+/*

+ * Copyright (C) 2004-2013 L2J Server

+ * 

+ * This file is part of L2J Server.

+ * 

+ * L2J Server is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ * 

+ * L2J Server is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ * 

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+package com.l2jserver.gameserver.model.interfaces;

+

+/**

+ * @author UnAfraid

+ */

+public interface IStorable

+{

+	public boolean storeMe();

+}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ClanWarehouse.java
查看文件 

@@ -50,7 +50,7 @@ public final class ClanWarehouse extends Warehouse
 
 	@Override

 	@Override

 	public int getOwnerId()

 	public int getOwnerId()

 	{

 	{

-		return _clan.getClanId();

+		return _clan.getId();

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java
查看文件 

@@ -576,7 +576,7 @@ public final class Formulas
 
 			return 0;

 			return 0;

 		}

 		}

 		

 		

-		L2SiegeClan siegeClan = siege.getAttackerClan(activeChar.getClan().getClanId());

+		L2SiegeClan siegeClan = siege.getAttackerClan(activeChar.getClan().getId());

 		if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, activeChar, siegeClan.getFlag().get(0), true))

 		if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, activeChar, siegeClan.getFlag().get(0), true))

 		{

 		{

 			return 0;

 			return 0;

+ 3 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/model/variables/AbstractVariables.java
查看文件 

@@ -21,18 +21,16 @@ package com.l2jserver.gameserver.model.variables;
 
 import java.util.concurrent.atomic.AtomicBoolean;

 import java.util.concurrent.atomic.AtomicBoolean;

 

 

 import com.l2jserver.gameserver.model.StatsSet;

 import com.l2jserver.gameserver.model.StatsSet;

+import com.l2jserver.gameserver.model.interfaces.IRestorable;

+import com.l2jserver.gameserver.model.interfaces.IStorable;

 

 

 /**

 /**

  * @author UnAfraid

  * @author UnAfraid

  */

  */

-public abstract class AbstractVariables extends StatsSet

+public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable

 {

 {

 	private final AtomicBoolean _hasChanges = new AtomicBoolean(false);

 	private final AtomicBoolean _hasChanges = new AtomicBoolean(false);

 	

 	

-	protected abstract void load();

-	

-	public abstract void store();

-	

 	/**

 	/**

 	 * Overriding following methods to prevent from doing useless database operations if there is no changes since player's login.

 	 * Overriding following methods to prevent from doing useless database operations if there is no changes since player's login.

 	 */

 	 */

+ 8 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/variables/AccountVariables.java
查看文件 

@@ -45,11 +45,11 @@ public class AccountVariables extends AbstractVariables
 
 	public AccountVariables(String accountName)

 	public AccountVariables(String accountName)

 	{

 	{

 		_accountName = accountName;

 		_accountName = accountName;

-		load();

+		restoreMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

-	protected void load()

+	public boolean restoreMe()

 	{

 	{

 		// Restore previous variables.

 		// Restore previous variables.

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

@@ -67,20 +67,22 @@ public class AccountVariables extends AbstractVariables
 
 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e);

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e);

+			return false;

 		}

 		}

 		finally

 		finally

 		{

 		{

 			compareAndSetChanges(true, false);

 			compareAndSetChanges(true, false);

 		}

 		}

+		return true;

 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void store()

+	public boolean storeMe()

 	{

 	{

 		// No changes, nothing to store.

 		// No changes, nothing to store.

 		if (!hasChanges())

 		if (!hasChanges())

 		{

 		{

-			return;

+			return false;

 		}

 		}

 		

 		

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection())

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection())

@@ -108,10 +110,12 @@ public class AccountVariables extends AbstractVariables
 
 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e);

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e);

+			return false;

 		}

 		}

 		finally

 		finally

 		{

 		{

 			compareAndSetChanges(true, false);

 			compareAndSetChanges(true, false);

 		}

 		}

+		return true;

 	}

 	}

 }

 }

+ 8 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/variables/PlayerVariables.java
查看文件 

@@ -47,11 +47,11 @@ public class PlayerVariables extends AbstractVariables
 
 	public PlayerVariables(int objectId)

 	public PlayerVariables(int objectId)

 	{

 	{

 		_objectId = objectId;

 		_objectId = objectId;

-		load();

+		restoreMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

-	protected void load()

+	public boolean restoreMe()

 	{

 	{

 		// Restore previous variables.

 		// Restore previous variables.

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();

@@ -69,20 +69,22 @@ public class PlayerVariables extends AbstractVariables
 
 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e);

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e);

+			return false;

 		}

 		}

 		finally

 		finally

 		{

 		{

 			compareAndSetChanges(true, false);

 			compareAndSetChanges(true, false);

 		}

 		}

+		return true;

 	}

 	}

 	

 	

 	@Override

 	@Override

-	public void store()

+	public boolean storeMe()

 	{

 	{

 		// No changes, nothing to store.

 		// No changes, nothing to store.

 		if (!hasChanges())

 		if (!hasChanges())

 		{

 		{

-			return;

+			return false;

 		}

 		}

 		

 		

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection())

 		try (Connection con = L2DatabaseFactory.getInstance().getConnection())

@@ -110,11 +112,13 @@ public class PlayerVariables extends AbstractVariables
 
 		catch (SQLException e)

 		catch (SQLException e)

 		{

 		{

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e);

 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e);

+			return false;

 		}

 		}

 		finally

 		finally

 		{

 		{

 			compareAndSetChanges(true, false);

 			compareAndSetChanges(true, false);

 		}

 		}

+		return true;

 	}

 	}

 	

 	

 	public L2PcInstance getPlayer()

 	public L2PcInstance getPlayer()

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/L2GameClient.java
查看文件 

@@ -372,7 +372,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 
 		{

 		{

 			if (getActiveChar() != null)

 			if (getActiveChar() != null)

 			{

 			{

-				getActiveChar().store();

+				getActiveChar().storeMe();

 				getActiveChar().storeRecommendations();

 				getActiveChar().storeRecommendations();

 				if (Config.UPDATE_ITEMS_ON_CHAR_STORE)

 				if (Config.UPDATE_ITEMS_ON_CHAR_STORE)

 				{

 				{

@@ -923,7 +923,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 
 					saveCharToDisk();

 					saveCharToDisk();

 					if (player.hasSummon())

 					if (player.hasSummon())

 					{

 					{

-						player.getSummon().store();

+						player.getSummon().storeMe();

 					}

 					}

 				}

 				}

 			}

 			}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java
查看文件 

@@ -61,7 +61,7 @@ public final class AllyDismiss extends L2GameClientPacket
 
 			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);

 			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);

 			return;

 			return;

 		}

 		}

-		if (!player.isClanLeader() || (leaderClan.getClanId() != leaderClan.getAllyId()))

+		if (!player.isClanLeader() || (leaderClan.getId() != leaderClan.getAllyId()))

 		{

 		{

 			player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);

 			player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);

 			return;

 			return;

@@ -72,7 +72,7 @@ public final class AllyDismiss extends L2GameClientPacket
 
 			player.sendPacket(SystemMessageId.CLAN_DOESNT_EXISTS);

 			player.sendPacket(SystemMessageId.CLAN_DOESNT_EXISTS);

 			return;

 			return;

 		}

 		}

-		if (clan.getClanId() == leaderClan.getClanId())

+		if (clan.getId() == leaderClan.getId())

 		{

 		{

 			player.sendPacket(SystemMessageId.ALLIANCE_LEADER_CANT_WITHDRAW);

 			player.sendPacket(SystemMessageId.ALLIANCE_LEADER_CANT_WITHDRAW);

 			return;

 			return;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java
查看文件 

@@ -58,7 +58,7 @@ public final class AllyLeave extends L2GameClientPacket
 
 			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);

 			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);

 			return;

 			return;

 		}

 		}

-		if (clan.getClanId() == clan.getAllyId())

+		if (clan.getId() == clan.getAllyId())

 		{

 		{

 			player.sendPacket(SystemMessageId.ALLIANCE_LEADER_CANT_WITHDRAW);

 			player.sendPacket(SystemMessageId.ALLIANCE_LEADER_CANT_WITHDRAW);

 			return;

 			return;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSetAllyCrest.java
查看文件 

@@ -78,7 +78,7 @@ public final class RequestSetAllyCrest extends L2GameClientPacket
 
 		

 		

 		final L2Clan leaderClan = ClanTable.getInstance().getClan(activeChar.getAllyId());

 		final L2Clan leaderClan = ClanTable.getInstance().getClan(activeChar.getAllyId());

 		

 		

-		if ((activeChar.getClanId() != leaderClan.getClanId()) || !activeChar.isClanLeader())

+		if ((activeChar.getClanId() != leaderClan.getId()) || !activeChar.isClanLeader())

 		{

 		{

 			activeChar.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);

 			activeChar.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);

 			return;

 			return;

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java
查看文件 

@@ -98,7 +98,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket
 
 			sm = null;

 			sm = null;

 			return;

 			return;

 		}

 		}

-		else if (_clan.isAtWarWith(clan.getClanId()))

+		else if (_clan.isAtWarWith(clan.getId()))

 		{

 		{

 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ALREADY_AT_WAR_WITH_S1_WAIT_5_DAYS); // msg id 628

 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ALREADY_AT_WAR_WITH_S1_WAIT_5_DAYS); // msg id 628

 			sm.addString(clan.getName());

 			sm.addString(clan.getName());

@@ -142,7 +142,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket
 
 		// player.setTransactionRequester(leader);

 		// player.setTransactionRequester(leader);

 		// leader.sendPacket(new StartPledgeWar(_clan.getName(),player.getName()));

 		// leader.sendPacket(new StartPledgeWar(_clan.getName(),player.getName()));

 		

 		

-		ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getClanId());

+		ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getId());

 		L2World.getInstance().forEachPlayer(new ForEachPlayerBroadcastUserInfo(player, clan));

 		L2World.getInstance().forEachPlayer(new ForEachPlayerBroadcastUserInfo(player, clan));

 	}

 	}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java
查看文件 

@@ -64,7 +64,7 @@ public final class RequestStopPledgeWar extends L2GameClientPacket
 
 			return;

 			return;

 		}

 		}

 		

 		

-		if (!playerClan.isAtWarWith(clan.getClanId()))

+		if (!playerClan.isAtWarWith(clan.getId()))

 		{

 		{

 			player.sendMessage("You aren't at war with this clan.");

 			player.sendMessage("You aren't at war with this clan.");

 			player.sendPacket(ActionFailed.STATIC_PACKET);

 			player.sendPacket(ActionFailed.STATIC_PACKET);

@@ -110,7 +110,7 @@ public final class RequestStopPledgeWar extends L2GameClientPacket
 
 			}

 			}

 		}

 		}

 		

 		

-		ClanTable.getInstance().deleteclanswars(playerClan.getClanId(), clan.getClanId());

+		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());

 		L2World.getInstance().forEachPlayer(new ForEachPlayerBroadcastUserInfo(clan, player));

 		L2World.getInstance().forEachPlayer(new ForEachPlayerBroadcastUserInfo(clan, player));

 	}

 	}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
查看文件 

@@ -63,7 +63,7 @@ public final class RequestSurrenderPledgeWar extends L2GameClientPacket
 
 		

 		

 		_log.info("RequestSurrenderPledgeWar by " + getClient().getActiveChar().getClan().getName() + " with " + _pledgeName);

 		_log.info("RequestSurrenderPledgeWar by " + getClient().getActiveChar().getClan().getName() + " with " + _pledgeName);

 		

 		

-		if (!_clan.isAtWarWith(clan.getClanId()))

+		if (!_clan.isAtWarWith(clan.getId()))

 		{

 		{

 			_activeChar.sendMessage("You aren't at war with this clan.");

 			_activeChar.sendMessage("You aren't at war with this clan.");

 			_activeChar.sendPacket(ActionFailed.STATIC_PACKET);

 			_activeChar.sendPacket(ActionFailed.STATIC_PACKET);

@@ -75,7 +75,7 @@ public final class RequestSurrenderPledgeWar extends L2GameClientPacket
 
 		_activeChar.sendPacket(msg);

 		_activeChar.sendPacket(msg);

 		msg = null;

 		msg = null;

 		_activeChar.deathPenalty(false, false, false);

 		_activeChar.deathPenalty(false, false, false);

-		ClanTable.getInstance().deleteclanswars(_clan.getClanId(), clan.getClanId());

+		ClanTable.getInstance().deleteclanswars(_clan.getId(), clan.getId());

 		// Zoey76: TODO: Implement or cleanup.

 		// Zoey76: TODO: Implement or cleanup.

 		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());

 		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());

 		// if ((leader != null) && (leader.isOnline() == 0))

 		// if ((leader != null) && (leader.isOnline() == 0))

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/writepackets/InitWorldInfo.java
查看文件 

@@ -72,14 +72,14 @@ public final class InitWorldInfo extends BaseWritePacket
 
 					{

 					{

 						break;

 						break;

 					}

 					}

-					super.writeD(c.getClanId());

+					super.writeD(c.getId());

 					super.writeS(c.getName());

 					super.writeS(c.getName());

 					super.writeD(c.getLevel());

 					super.writeD(c.getLevel());

 					if (c.getLeader() == null)

 					if (c.getLeader() == null)

 					{

 					{

 						writeD(0);

 						writeD(0);

 						writeS("");

 						writeS("");

-						_log.info("Clan Id: " + c.getClanId() + " has null clan leader!");

+						_log.info("Clan Id: " + c.getId() + " has null clan leader!");

 					}

 					}

 					else

 					else

 					{

 					{

@@ -94,7 +94,7 @@ public final class InitWorldInfo extends BaseWritePacket
 
 					super.writeD(clanAllies.size());

 					super.writeD(clanAllies.size());

 					for (L2Clan allies : clanAllies)

 					for (L2Clan allies : clanAllies)

 					{

 					{

-						super.writeD(allies.getClanId());

+						super.writeD(allies.getId());

 					}

 					}

 				}

 				}

 				break;

 				break;

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/writepackets/WorldInfo.java
查看文件 

@@ -84,7 +84,7 @@ public final class WorldInfo extends BaseWritePacket
 
 			case TYPE_UPDATE_CLAN_DATA:

 			case TYPE_UPDATE_CLAN_DATA:

 			{

 			{

 				super.writeC(0x02);

 				super.writeC(0x02);

-				super.writeD(clan.getClanId());

+				super.writeD(clan.getId());

 				super.writeS(clan.getName());

 				super.writeS(clan.getName());

 				super.writeD(clan.getLevel());

 				super.writeD(clan.getLevel());

 				super.writeD(clan.getLeader().getObjectId());

 				super.writeD(clan.getLeader().getObjectId());

@@ -97,7 +97,7 @@ public final class WorldInfo extends BaseWritePacket
 
 				{

 				{

 					for (L2Clan c : ClanTable.getInstance().getClanAllies(clan.getAllyId()))

 					for (L2Clan c : ClanTable.getInstance().getClanAllies(clan.getAllyId()))

 					{

 					{

-						allyClanIdList.add(c.getClanId());

+						allyClanIdList.add(c.getId());

 					}

 					}

 				}

 				}

 				super.writeD(allyClanIdList.size());

 				super.writeD(allyClanIdList.size());

@@ -110,7 +110,7 @@ public final class WorldInfo extends BaseWritePacket
 
 			}

 			}

 			case TYPE_SEND_CLAN_NOTICE:

 			case TYPE_SEND_CLAN_NOTICE:

 				super.writeC(0x03);

 				super.writeC(0x03);

-				super.writeD(clan.getClanId());

+				super.writeD(clan.getId());

 				super.writeS(clan.getNotice());

 				super.writeS(clan.getNotice());

 				break;

 				break;

 		}

 		}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java
查看文件 

@@ -131,7 +131,7 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 
 				{

 				{

 					L2Clan clan = ClanTable.getInstance().getClan(cha.getCastle().getOwnerId());

 					L2Clan clan = ClanTable.getInstance().getClan(cha.getCastle().getOwnerId());

 					_clanCrest = clan.getCrestId();

 					_clanCrest = clan.getCrestId();

-					_clanId = clan.getClanId();

+					_clanId = clan.getId();

 					_allyCrest = clan.getAllyCrestId();

 					_allyCrest = clan.getAllyCrestId();

 					_allyId = clan.getAllyId();

 					_allyId = clan.getAllyId();

 				}

 				}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewPledgeInfo.java
查看文件 

@@ -38,7 +38,7 @@ public class GMViewPledgeInfo extends L2GameServerPacket
 
 	{

 	{

 		writeC(0x96);

 		writeC(0x96);

 		writeS(_activeChar.getName());

 		writeS(_activeChar.getName());

-		writeD(_clan.getClanId());

+		writeD(_clan.getId());

 		writeD(0x00);

 		writeD(0x00);

 		writeS(_clan.getName());

 		writeS(_clan.getName());

 		writeS(_clan.getLeaderName());

 		writeS(_clan.getLeaderName());

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeInfo.java
查看文件 

@@ -33,7 +33,7 @@ public class PledgeInfo extends L2GameServerPacket
 
 	protected final void writeImpl()

 	protected final void writeImpl()

 	{

 	{

 		writeC(0x89);

 		writeC(0x89);

-		writeD(_clan.getClanId());

+		writeD(_clan.getId());

 		writeS(_clan.getName());

 		writeS(_clan.getName());

 		writeS(_clan.getAllyName());

 		writeS(_clan.getAllyName());

 	}

 	}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
查看文件 

@@ -60,7 +60,7 @@ public class PledgeReceiveSubPledgeCreated extends L2GameServerPacket
 
 		}

 		}

 		else if (_clan.getClanMember(LeaderId) == null)

 		else if (_clan.getClanMember(LeaderId) == null)

 		{

 		{

-			_log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getClanId() + "]");

+			_log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]");

 			return "";

 			return "";

 		}

 		}

 		else

 		else

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
查看文件 

@@ -34,7 +34,7 @@ public class PledgeShowInfoUpdate extends L2GameServerPacket
 
 	{

 	{

 		writeC(0x8E);

 		writeC(0x8E);

 		// sending empty data so client will ask all the info in response ;)

 		// sending empty data so client will ask all the info in response ;)

-		writeD(_clan.getClanId());

+		writeD(_clan.getId());

 		writeD(_clan.getCrestId());

 		writeD(_clan.getCrestId());

 		writeD(_clan.getLevel()); // clan level

 		writeD(_clan.getLevel()); // clan level

 		writeD(_clan.getCastleId());

 		writeD(_clan.getCastleId());

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java
查看文件 

@@ -69,7 +69,7 @@ public class PledgeShowMemberListAll extends L2GameServerPacket
 
 		writeC(0x5a);

 		writeC(0x5a);

 		

 		

 		writeD(mainOrSubpledge);

 		writeD(mainOrSubpledge);

-		writeD(_clan.getClanId());

+		writeD(_clan.getId());

 		writeD(_pledgeType);

 		writeD(_pledgeType);

 		writeS(_clan.getName());

 		writeS(_clan.getName());

 		writeS(_clan.getLeaderName());

 		writeS(_clan.getLeaderName());

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java
查看文件 

@@ -34,7 +34,7 @@ public final class PledgeStatusChanged extends L2GameServerPacket
 
 	{

 	{

 		writeC(0xCD);

 		writeC(0xCD);

 		writeD(_clan.getLeaderId());

 		writeD(_clan.getLeaderId());

-		writeD(_clan.getClanId());

+		writeD(_clan.getId());

 		writeD(_clan.getCrestId());

 		writeD(_clan.getCrestId());

 		writeD(_clan.getAllyId());

 		writeD(_clan.getAllyId());

 		writeD(_clan.getAllyCrestId());

 		writeD(_clan.getAllyCrestId());

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java
查看文件 

@@ -89,7 +89,7 @@ public final class SiegeAttackerList extends L2GameServerPacket
 
 						continue;

 						continue;

 					}

 					}

 					

 					

-					writeD(clan.getClanId());

+					writeD(clan.getId());

 					writeS(clan.getName());

 					writeS(clan.getName());

 					writeS(clan.getLeaderName());

 					writeS(clan.getLeaderName());

 					writeD(clan.getCrestId());

 					writeD(clan.getCrestId());

@@ -126,7 +126,7 @@ public final class SiegeAttackerList extends L2GameServerPacket
 
 						continue;

 						continue;

 					}

 					}

 					

 					

-					writeD(clan.getClanId());

+					writeD(clan.getId());

 					writeS(clan.getName());

 					writeS(clan.getName());

 					writeS(clan.getLeaderName());

 					writeS(clan.getLeaderName());

 					writeD(clan.getCrestId());

 					writeD(clan.getCrestId());

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SiegeDefenderList.java
查看文件 

@@ -79,7 +79,7 @@ public final class SiegeDefenderList extends L2GameServerPacket
 
 					continue;

 					continue;

 				}

 				}

 				

 				

-				writeD(clan.getClanId());

+				writeD(clan.getId());

 				writeS(clan.getName());

 				writeS(clan.getName());

 				writeS(clan.getLeaderName());

 				writeS(clan.getLeaderName());

 				writeD(clan.getCrestId());

 				writeD(clan.getCrestId());

@@ -107,7 +107,7 @@ public final class SiegeDefenderList extends L2GameServerPacket
 
 			for (L2SiegeClan siegeclan : _castle.getSiege().getDefenderWaitingClans())

 			for (L2SiegeClan siegeclan : _castle.getSiege().getDefenderWaitingClans())

 			{

 			{

 				clan = ClanTable.getInstance().getClan(siegeclan.getClanId());

 				clan = ClanTable.getInstance().getClan(siegeclan.getClanId());

-				writeD(clan.getClanId());

+				writeD(clan.getId());

 				writeS(clan.getName());

 				writeS(clan.getName());

 				writeS(clan.getLeaderName());

 				writeS(clan.getLeaderName());

 				writeD(clan.getCrestId());

 				writeD(clan.getCrestId());

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java
查看文件 

@@ -40,7 +40,7 @@ public class TaskGlobalVariablesSave extends Task
 
 	@Override

 	@Override

 	public void onTimeElapsed(ExecutedTask task)

 	public void onTimeElapsed(ExecutedTask task)

 	{

 	{

-		GlobalVariablesManager.getInstance().store();

+		GlobalVariablesManager.getInstance().storeMe();

 	}

 	}

 	

 	

 	@Override

 	@Override

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/util/Evolve.java
查看文件 

@@ -131,7 +131,7 @@ public final class Evolve
 
 		petSummon.setTitle(player.getName());

 		petSummon.setTitle(player.getName());

 		petSummon.setName(oldname);

 		petSummon.setName(oldname);

 		petSummon.setRunning();

 		petSummon.setRunning();

-		petSummon.store();

+		petSummon.storeMe();

 		

 		

 		player.setPet(petSummon);

 		player.setPet(petSummon);

 		

 		

@@ -219,7 +219,7 @@ public final class Evolve
 
 		petSummon.setCurrentFed(petSummon.getMaxFed());

 		petSummon.setCurrentFed(petSummon.getMaxFed());

 		petSummon.setTitle(player.getName());

 		petSummon.setTitle(player.getName());

 		petSummon.setRunning();

 		petSummon.setRunning();

-		petSummon.store();

+		petSummon.storeMe();

 		

 		

 		player.setPet(petSummon);

 		player.setPet(petSummon);