Browse Source

BETA: Client Packets Update & Cleanup:
* All packets types updated.
* Added Attack packet, AttackRequest probably is deprecated.
* Removed deprecated packet RequestBuyProcure.
* Removed deprecated packet RequestSurrenderPersonally.
Thanks mrTJO for support!

Zoey76 14 năm trước cách đây
mục cha
commit
b317ea4622
100 tập tin đã thay đổi với 236 bổ sung835 xóa
  1. 8 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
  2. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Action.java
  3. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AddTradeItem.java
  4. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java
  5. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java
  6. 2 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java
  7. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
  8. 0 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java
  9. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java
  10. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java
  11. 102 0
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Attack.java
  12. 3 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AttackRequest.java
  13. 2 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java
  14. 0 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java
  15. 1 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java
  16. 2 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java
  17. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
  18. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
  19. 0 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java
  20. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java
  21. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java
  22. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java
  23. 0 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/DummyPacket.java
  24. 0 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java
  25. 2 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
  26. 0 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/ExGetOnAirShip.java
  27. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/FinishRotating.java
  28. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java
  29. 3 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Logout.java
  30. 2 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java
  31. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationAirShip.java
  32. 0 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationInAirShip.java
  33. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MoveWithDelta.java
  34. 2 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java
  35. 2 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/NewCharacter.java
  36. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java
  37. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java
  38. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
  39. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java
  40. 3 13
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAllAgitInfo.java
  41. 2 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java
  42. 2 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java
  43. 3 11
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java
  44. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java
  45. 2 15
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerFriendInvite.java
  46. 2 15
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
  47. 2 15
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java
  48. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
  49. 0 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
  50. 0 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java
  51. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBBSwrite.java
  52. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBlock.java
  53. 0 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
  54. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java
  55. 0 214
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyProcure.java
  56. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySeed.java
  57. 0 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySellUIClose.java
  58. 1 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java
  59. 0 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
  60. 0 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeNicknameColor.java
  61. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java
  62. 0 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java
  63. 0 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java
  64. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
  65. 0 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmTargetItem.java
  66. 2 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
  67. 3 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteMacro.java
  68. 2 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java
  69. 2 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java
  70. 0 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java
  71. 2 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java
  72. 0 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java
  73. 0 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelSurrender.java
  74. 2 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java
  75. 0 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
  76. 0 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
  77. 0 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
  78. 0 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExChangeName.java
  79. 1 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
  80. 2 18
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
  81. 0 14
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
  82. 0 14
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
  83. 0 14
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
  84. 0 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
  85. 0 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExFishRanking.java
  86. 0 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
  87. 0 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
  88. 1 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java
  89. 0 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
  90. 2 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java
  91. 0 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
  92. 1 11
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
  93. 0 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
  94. 0 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
  95. 0 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java
  96. 2 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
  97. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendDel.java
  98. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendInvite.java
  99. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendList.java
  100. 2 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java

+ 8 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java

@@ -137,7 +137,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 						msg = new Logout();
 						break;
 					case 0x01:
-						msg = new AttackRequest();
+						msg = new Attack();
 						break;
 					case 0x03:
 						msg = new RequestStartPledgeWar();
@@ -411,7 +411,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 					case 0x67:
 						msg = new RequestPledgeCrest();
 						break;
-					case 0x6b:
+					case 0x6b: //RequestSendL2FriendSay
 						msg = new RequestSendFriendMsg();
 						break;
 					case 0x6c:
@@ -477,7 +477,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 					case 0x81:
 						msg = new RequestPartyMatchDetail();
 						break;
-					case 0x83:
+					case 0x83: //SendPrivateStoreBuyList
 						msg = new RequestPrivateStoreBuy();
 						break;
 					case 0x85:
@@ -543,7 +543,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 					case 0x99:
 						msg = new RequestPrivateStoreManageBuy();
 						break;
-					case 0x9a:
+					case 0x9a: // SetPrivateStoreList
 						msg = new SetPrivateStoreListBuy ();
 						break;
 					case 0x9c:
@@ -573,16 +573,16 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 					case 0xaa:
 						msg = new RequestSiegeInfo();
 						break;
-					case 0xab:
+					case 0xab: // RequestCastleSiegeAttackerList
 						msg = new RequestSiegeAttackerList();
 						break;
 					case 0xac:
 						msg = new RequestSiegeDefenderList();
 						break;
-					case 0xad:
+					case 0xad: //RequestJoinCastleSiege
 						msg = new RequestJoinSiege();
 						break;
-					case 0xae:
+					case 0xae: //RequestConfirmCastleSiegeWaitingList
 						msg = new RequestConfirmSiegeWaitingList();
 						break;
 					case 0xaf:
@@ -633,7 +633,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 					case 0xbe:
 						msg = new RequestRecipeShopMakeInfo();
 						break;
-					case 0xbf:
+					case 0xbf: // RequestRecipeShopMakeDo
 						msg = new RequestRecipeShopMakeItem();
 						break;
 					case 0xc0: // RequestRecipeShopSellList
@@ -1073,7 +1073,6 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 								// RequestAddExpandQuestAlarm
 								break;
 							case 0x7e:
-								// RequestVoteNew
 								msg = new RequestVoteNew();
 								break;
 							case 0x84:

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

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class Action extends L2GameClientPacket
 {
-	private static final String ACTION__C__04 = "[C] 04 Action";
+	private static final String __C__1F_ACTION = "[C] 1F Action";
 	private static final Logger _log = Logger.getLogger(Action.class.getName());
 	
 	// cddddc
@@ -139,12 +139,9 @@ public final class Action extends L2GameClientPacket
 			getClient().sendPacket(ActionFailed.STATIC_PACKET);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return ACTION__C__04;
+		return __C__1F_ACTION;
 	}
 }

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

@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.network.serverpackets.TradeOwnAdd;
  */
 public final class AddTradeItem extends L2GameClientPacket
 {
-	private static final String _C__16_ADDTRADEITEM = "[C] 16 AddTradeItem";
+	private static final String _C__1B_ADDTRADEITEM = "[C] 1B AddTradeItem";
 	private static final Logger _log = Logger.getLogger(AddTradeItem.class.getName());
 	
 	private int _tradeId;
@@ -103,12 +103,9 @@ public final class AddTradeItem extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__16_ADDTRADEITEM;
+		return _C__1B_ADDTRADEITEM;
 	}
 }

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

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 public final class AllyDismiss extends L2GameClientPacket
 {
-	private static final String _C__85_ALLYDISMISS = "[C] 85 AllyDismiss";
+	private static final String _C__8F_ALLYDISMISS = "[C] 8F AllyDismiss";
 	
 	private String _clanName;
 	
@@ -98,6 +98,6 @@ public final class AllyDismiss extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__85_ALLYDISMISS;
+		return _C__8F_ALLYDISMISS;
 	}
 }

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

@@ -24,8 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 public final class AllyLeave extends L2GameClientPacket
 {
-	private static final String _C__84_ALLYLEAVE = "[C] 84 AllyLeave";
-	
+	private static final String _C__8E_ALLYLEAVE = "[C] 8E AllyLeave";
 	//private static Logger _log = Logger.getLogger(AllyLeave.class.getName());
 	
 	@Override
@@ -78,6 +77,6 @@ public final class AllyLeave extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__84_ALLYLEAVE;
+		return _C__8E_ALLYLEAVE;
 	}
 }

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

@@ -24,11 +24,10 @@ import com.l2jserver.gameserver.util.Util;
 
 /**
  * @author JIV
- *
  */
 public class AnswerCoupleAction extends L2GameClientPacket
 {
-	private static final String _S__D0_7A_ANSWERCOUPLEACTION = "[C] D0:7A AnswerCoupleAction";
+	private static final String _C__D0_7A_ANSWERCOUPLEACTION = "[C] D0:7A AnswerCoupleAction";
 	
 	private int _charObjId;
 	private int _actionId;
@@ -86,7 +85,6 @@ public class AnswerCoupleAction extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _S__D0_7A_ANSWERCOUPLEACTION;
+		return _C__D0_7A_ANSWERCOUPLEACTION;
 	}
-	
 }

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

@@ -16,8 +16,7 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 /**
  * Format: (ch) d
- * @author  -Wooden-
- *
+ * @author -Wooden-
  */
 public final class AnswerJoinPartyRoom extends L2GameClientPacket
 {
@@ -49,5 +48,4 @@ public final class AnswerJoinPartyRoom extends L2GameClientPacket
 	{
 		return _C__D0_30_ANSWERJOINPARTYROOM;
 	}
-	
 }

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

@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
  * @author JIV
- *
  */
 public class AnswerPartyLootModification extends L2GameClientPacket
 {
@@ -49,5 +48,4 @@ public class AnswerPartyLootModification extends L2GameClientPacket
 	{
 		return _C__D0_79_ANSWERPARTYLOOTMODIFICATION;
 	}
-	
 }

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.TradeDone;
  */
 public final class AnswerTradeRequest extends L2GameClientPacket
 {
-	private static final String _C__40_ANSWERTRADEREQUEST = "[C] 40 AnswerTradeRequest";
+	private static final String _C__55_ANSWERTRADEREQUEST = "[C] 55 AnswerTradeRequest";
 	//private static Logger _log = Logger.getLogger(AnswerTradeRequest.class.getName());
 	
 	private int _response;
@@ -90,12 +90,9 @@ public final class AnswerTradeRequest extends L2GameClientPacket
 		partner.onTransactionResponse();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__40_ANSWERTRADEREQUEST;
+		return _C__55_ANSWERTRADEREQUEST;
 	}
 }

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.UserInfo;
  */
 public final class Appearing extends L2GameClientPacket
 {
-	private static final String _C__30_APPEARING = "[C] 30 Appearing";
+	private static final String _C__3A_APPEARING = "[C] 3A Appearing";
 	
 	@Override
 	protected void readImpl()
@@ -47,13 +47,10 @@ public final class Appearing extends L2GameClientPacket
 		sendPacket(new ExBrExtraUserInfo(activeChar));
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__30_APPEARING;
+		return _C__3A_APPEARING;
 	}
 	
 	@Override

+ 102 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Attack.java

@@ -0,0 +1,102 @@
+/*
+ * This program 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.
+ * 
+ * This program 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.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+/**
+ * TODO: This class is a copy of AttackRequest, we should get proper structure for both.
+ */
+public final class Attack extends L2GameClientPacket
+{
+	private static final String _C__01_ATTACK = "[C] 01 Attack";
+	
+	// cddddc
+	private int _objectId;
+	@SuppressWarnings("unused")
+	private int _originX;
+	@SuppressWarnings("unused")
+	private int _originY;
+	@SuppressWarnings("unused")
+	private int _originZ;
+	@SuppressWarnings("unused")
+	private int _attackId;
+	
+	@Override
+	protected void readImpl()
+	{
+		_objectId  = readD();
+		_originX  = readD();
+		_originY  = readD();
+		_originZ  = readD();
+		_attackId  = readC(); 	 // 0 for simple click   1 for shift-click
+	}
+	
+	@Override
+	protected void runImpl()
+	{
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) return;
+		// avoid using expensive operations if not needed
+		final L2Object target;
+		if (activeChar.getTargetId() == _objectId)
+			target = activeChar.getTarget();
+		else
+			target = L2World.getInstance().findObject(_objectId);
+		if (target == null)
+			return;
+		
+		// Players can't attack objects in the other instances
+		// except from multiverse
+		if (target.getInstanceId() != activeChar.getInstanceId()
+				&& activeChar.getInstanceId() != -1)
+			return;
+		
+		// Only GMs can directly attack invisible characters
+		if (target instanceof L2PcInstance
+				&& ((L2PcInstance)target).getAppearance().getInvisible()
+				&& !activeChar.isGM())
+			return;
+		
+		if (activeChar.getTarget() != target)
+		{
+			target.onAction(activeChar);
+		}
+		else
+		{
+			if ((target.getObjectId() != activeChar.getObjectId())
+					&& activeChar.getPrivateStoreType() ==0
+					&& activeChar.getActiveRequester() ==null)
+			{
+				//_log.debug("Starting ForcedAttack");
+				target.onForcedAttack(activeChar);
+				//_log.debug("Ending ForcedAttack");
+			}
+			else
+			{
+				sendPacket(ActionFailed.STATIC_PACKET);
+			}
+		}
+	}
+	
+	@Override
+	public String getType()
+	{
+		return _C__01_ATTACK;
+	}
+}

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

@@ -26,6 +26,8 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
  */
 public final class AttackRequest extends L2GameClientPacket
 {
+	private static final String _C__32_ATTACKREQUEST = "[C] 32 AttackRequest";
+	
 	// cddddc
 	private int _objectId;
 	@SuppressWarnings("unused")
@@ -37,8 +39,6 @@ public final class AttackRequest extends L2GameClientPacket
 	@SuppressWarnings("unused")
 	private int _attackId;
 	
-	private static final String _C__0A_ATTACKREQUEST = "[C] 0A AttackRequest";
-	
 	@Override
 	protected void readImpl()
 	{
@@ -96,12 +96,9 @@ public final class AttackRequest extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__0A_ATTACKREQUEST;
+		return _C__32_ATTACKREQUEST;
 	}
 }

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

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.LoginServerThread.SessionKey;
 import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 
-
 /**
  * This class ...
  *
@@ -30,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
  */
 public final class AuthLogin extends L2GameClientPacket
 {
-	private static final String _C__08_AUTHLOGIN = "[C] 08 AuthLogin";
+	private static final String _C__2B_AUTHLOGIN = "[C] 2B AuthLogin";
 	private static Logger _log = Logger.getLogger(AuthLogin.class.getName());
 	
 	// loginName + keys must match what the loginserver used.
@@ -82,13 +81,9 @@ public final class AuthLogin extends L2GameClientPacket
 		}
 	}
 	
-	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__08_AUTHLOGIN;
+		return _C__2B_AUTHLOGIN;
 	}
 }

+ 0 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExBrLoadEventTopRankers;
  * Halloween rank list client packet.
  * 
  * Format: (ch)ddd
- *
  */
 public class BrEventRankerList extends L2GameClientPacket
 {
@@ -31,9 +30,6 @@ public class BrEventRankerList extends L2GameClientPacket
 	@SuppressWarnings("unused")
 	private int _ranking;
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
@@ -42,9 +38,6 @@ public class BrEventRankerList extends L2GameClientPacket
 		_ranking = readD();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -55,9 +48,6 @@ public class BrEventRankerList extends L2GameClientPacket
 		getClient().sendPacket(new ExBrLoadEventTopRankers(_eventId, _day, count, bestScore, myScore));
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.handler.IUserCommandHandler;
 import com.l2jserver.gameserver.handler.UserCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * This class ...
  *
@@ -28,7 +27,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class BypassUserCmd extends L2GameClientPacket
 {
-	private static final String _C__B3_BYPASSUSERCMD = "[C] b3 BypassUserCmd";
+	private static final String _C__B3_BYPASSUSERCMD = "[C] B3 BypassUserCmd";
 	static Logger _log = Logger.getLogger(BypassUserCmd.class.getName());
 	
 	private int _command;
@@ -60,9 +59,6 @@ public class BypassUserCmd extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.ai.CtrlEvent;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * This class ...
  *
@@ -29,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class CannotMoveAnymore extends L2GameClientPacket
 {
-	private static final String _C__36_STOPMOVE = "[C] 36 CannotMoveAnymore";
+	private static final String _C__47_STOPMOVE = "[C] 47 CannotMoveAnymore";
 	
 	private static Logger _log = Logger.getLogger(CannotMoveAnymore.class.getName());
 	
@@ -83,14 +82,9 @@ public final class CannotMoveAnymore extends L2GameClientPacket
 		// getClient().getActiveChar().broadcastPacket(sr);
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__36_STOPMOVE;
+		return _C__47_STOPMOVE;
 	}
 }

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

@@ -20,10 +20,11 @@ import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * @author Maktakien
- *
  */
 public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket
 {
+	private static final String _C__76_CANNOTMOVEANYMOREINVEHICLE = "[C] 76 CannotMoveAnymoreInVehicle";
+	
 	private int _x;
 	private int _y;
 	private int _z;
@@ -63,7 +64,6 @@ public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] 5D CannotMoveAnymoreInVehicle";
+		return _C__76_CANNOTMOVEANYMOREINVEHICLE;
 	}
-	
 }

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

@@ -48,7 +48,7 @@ import com.l2jserver.gameserver.util.Util;
 @SuppressWarnings("unused")
 public final class CharacterCreate extends L2GameClientPacket
 {
-	private static final String _C__0B_CHARACTERCREATE = "[C] 0B CharacterCreate";
+	private static final String _C__0C_CHARACTERCREATE = "[C] 0C CharacterCreate";
 	private static final Logger _log = Logger.getLogger(CharacterCreate.class.getName());
 	protected static final Logger _logAccounting = Logger.getLogger("accounting");
 	
@@ -325,6 +325,6 @@ public final class CharacterCreate extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__0B_CHARACTERCREATE;
+		return _C__0C_CHARACTERCREATE;
 	}
 }

+ 0 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.network.serverpackets.CharDeleteFail;
 import com.l2jserver.gameserver.network.serverpackets.CharDeleteSuccess;
 import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
 
-
 /**
  * This class ...
  *
@@ -84,9 +83,6 @@ public final class CharacterDelete extends L2GameClientPacket
 		getClient().setCharSelection(cl.getCharInfo());
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
  */
 public final class CharacterRestore extends L2GameClientPacket
 {
-	private static final String _C__62_CHARACTERRESTORE = "[C] 62 CharacterRestore";
+	private static final String _C__7B_CHARACTERRESTORE = "[C] 7B CharacterRestore";
 	//private static Logger _log = Logger.getLogger(CharacterRestore.class.getName());
 	
 	// cd
@@ -50,12 +50,9 @@ public final class CharacterRestore extends L2GameClientPacket
 		getClient().setCharSelection(cl.getCharInfo());
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__62_CHARACTERRESTORE;
+		return _C__7B_CHARACTERRESTORE;
 	}
 }

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

@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.network.serverpackets.ServerClose;
  */
 public class CharacterSelect extends L2GameClientPacket
 {
-	private static final String _C__0D_CHARACTERSELECT = "[C] 0D CharacterSelect";
+	private static final String _C__12_CHARACTERSELECT = "[C] 12 CharacterSelect";
 	private static final Logger _log = Logger.getLogger(CharacterSelect.class.getName());
 	protected static final Logger _logAccounting = Logger.getLogger("accounting");
 	
@@ -140,12 +140,9 @@ public class CharacterSelect extends L2GameClientPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__0D_CHARACTERSELECT;
+		return _C__12_CHARACTERSELECT;
 	}
 }

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

@@ -24,14 +24,13 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.GMAudit;
 
-
 /**
  * @author Dezmond_snz
  * Format: cddd
  */
 public final class DlgAnswer extends L2GameClientPacket
 {
-	private static final String _C__C5_DLGANSWER = "[C] C5 DlgAnswer";
+	private static final String _C__C6_DLGANSWER = "[C] C6 DlgAnswer";
 	private static Logger _log = Logger.getLogger(DlgAnswer.class.getName());
 	
 	private int _messageId;
@@ -92,6 +91,6 @@ public final class DlgAnswer extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__C5_DLGANSWER;
+		return _C__C6_DLGANSWER;
 	}
 }

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

@@ -14,7 +14,6 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-
 /**
  * @author zabbix
  * Lets drink to code!

+ 0 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java

@@ -19,7 +19,6 @@ import java.util.logging.Logger;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- * 
  * @author JIV
  */
 public final class EndScenePlayer extends L2GameClientPacket
@@ -55,9 +54,6 @@ public final class EndScenePlayer extends L2GameClientPacket
 		activeChar.setIsTeleporting(false, false);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -88,7 +88,6 @@ import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.Base64;
 
-
 /**
  * Enter World Packet Handler<p>
  * <p>
@@ -98,7 +97,7 @@ import com.l2jserver.util.Base64;
  */
 public class EnterWorld extends L2GameClientPacket
 {
-	private static final String _C__03_ENTERWORLD = "[C] 03 EnterWorld";
+	private static final String _C__11_ENTERWORLD = "[C] 11 EnterWorld";
 	
 	private static Logger _log = Logger.getLogger(EnterWorld.class.getName());
 	
@@ -620,13 +619,10 @@ public class EnterWorld extends L2GameClientPacket
 			qs.getQuest().notifyEvent("UC", null, player);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__03_ENTERWORLD;
+		return _C__11_ENTERWORLD;
 	}
 	
 	@Override

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

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 import java.util.logging.Logger;
 
-
 /**
  * Format: (c) dddd
  * d: dx

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

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.StopRotation;
  */
 public final class FinishRotating extends L2GameClientPacket
 {
-	private static final String _C__4B_FINISHROTATING = "[C] 4B FinishRotating";
+	private static final String _C__5C_FINISHROTATING = "[C] 5C FinishRotating";
 	
 	private int _degree;
 	@SuppressWarnings("unused")
@@ -58,12 +58,9 @@ public final class FinishRotating extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__4B_FINISHROTATING;
+		return _C__5C_FINISHROTATING;
 	}
 }

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

@@ -22,7 +22,6 @@ import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.network.L2GameClient;
 
-
 /**
  * Format: c dddd
  *
@@ -31,7 +30,7 @@ import com.l2jserver.gameserver.network.L2GameClient;
 public class GameGuardReply extends L2GameClientPacket
 {
 	protected static final Logger _log = Logger.getLogger(GameGuardReply.class.getName());
-	private static final String _C__CA_GAMEGUARDREPLY = "[C] CA GameGuardReply";
+	private static final String _C__CB_GAMEGUARDREPLY = "[C] CB GameGuardReply";
 	
 	private static final byte[] VALID =
 	{
@@ -72,7 +71,7 @@ public class GameGuardReply extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__CA_GAMEGUARDREPLY;
+		return _C__CB_GAMEGUARDREPLY;
 	}
 	
 	@Override

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

@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
 
-
 /**
  * This class ...
  *
@@ -36,7 +35,7 @@ import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
  */
 public final class Logout extends L2GameClientPacket
 {
-	private static final String _C__09_LOGOUT = "[C] 09 Logout";
+	private static final String _C__00_LOGOUT = "[C] 00 Logout";
 	private static final Logger _log = Logger.getLogger(Logout.class.getName());
 	protected static final Logger _logAccounting = Logger.getLogger("accounting");
 	
@@ -49,7 +48,7 @@ public final class Logout extends L2GameClientPacket
 	@Override
 	protected void runImpl()
 	{
-		// Dont allow leaving if player is fighting
+		// Don't allow leaving if player is fighting
 		final L2PcInstance player = getClient().getActiveChar();
 		
 		if (player == null)
@@ -111,12 +110,9 @@ public final class Logout extends L2GameClientPacket
 		player.logout();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__09_LOGOUT;
+		return _C__00_LOGOUT;
 	}
 }

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

@@ -32,6 +32,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class MoveBackwardToLocation extends L2GameClientPacket
 {
+	private static final String _C__0F_MOVEBACKWARDTOLOC = "[C] 0F MoveBackwardToLoc";
 	//private static Logger _log = Logger.getLogger(MoveBackwardToLocation.class.getName());
 	// cdddddd
 	private int _targetX;
@@ -53,8 +54,6 @@ public class MoveBackwardToLocation extends L2GameClientPacket
 		return TaskPriority.PR_HIGH;
 	}
 	
-	private static final String _C__01_MOVEBACKWARDTOLOC = "[C] 01 MoveBackwardToLoc";
-	
 	@Override
 	protected void readImpl()
 	{
@@ -133,12 +132,9 @@ public class MoveBackwardToLocation extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__01_MOVEBACKWARDTOLOC;
+		return _C__0F_MOVEBACKWARDTOLOC;
 	}
 }

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

@@ -27,12 +27,12 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 public class MoveToLocationAirShip extends L2GameClientPacket
 {
+	private static final String _C__D0_38_MOVETOLOCATIONAIRSHIP = "[C] D0:38 MoveToLocationAirShip";
+	
 	public static final int MIN_Z = -895;
 	public static final int MAX_Z = 6105;
 	public static final int STEP = 300;
 	
-	private static final String _C__D0_38_MOVETOLOCATIONAIRSHIP = "[C] D0:38 MoveToLocationAirShip";
-	
 	private int _command;
 	private int _param1;
 	private int _param2 = 0;
@@ -123,9 +123,6 @@ public class MoveToLocationAirShip extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -99,9 +99,6 @@ public class MoveToLocationInAirShip extends L2GameClientPacket
 		activeChar.broadcastPacket(new ExMoveToLocationInAirShip(activeChar));
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -20,10 +20,11 @@ package com.l2jserver.gameserver.network.clientpackets;
  * d: dy
  * d: dz
  * @author  -Wooden-
- * 
  */
 public class MoveWithDelta extends L2GameClientPacket
 {
+	private static final String _C__52_MOVEWITHDELTA = "[C] 52 MoveWithDelta";
+	
 	@SuppressWarnings("unused")
 	private int _dx;
 	@SuppressWarnings("unused")
@@ -48,7 +49,6 @@ public class MoveWithDelta extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] 0x41 MoveWithDelta";
+		return _C__52_MOVEWITHDELTA;
 	}
-	
 }

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

@@ -40,7 +40,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public class MultiSellChoose extends L2GameClientPacket
 {
-	private static final String _C__A7_MULTISELLCHOOSE = "[C] A7 MultiSellChoose";
+	private static final String _C__B0_MULTISELLCHOOSE = "[C] B0 MultiSellChoose";
 	private static Logger _log = Logger.getLogger(MultiSellChoose.class.getName());
 	private int _listId;
 	private int _entryId;
@@ -68,9 +68,6 @@ public class MultiSellChoose extends L2GameClientPacket
 	@SuppressWarnings("unused")
 	private int _unk11;*/
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
@@ -90,9 +87,6 @@ public class MultiSellChoose extends L2GameClientPacket
 		_unk11 = readH(); // elemental attributes*/
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	public void runImpl()
 	{
@@ -450,6 +444,6 @@ public class MultiSellChoose extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__A7_MULTISELLCHOOSE;
+		return _C__B0_MULTISELLCHOOSE;
 	}
 }

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

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.network.serverpackets.NewCharacterSuccess;
 import com.l2jserver.gameserver.templates.chars.L2PcTemplate;
 
-
 /**
  * This class ...
  *
@@ -30,7 +29,7 @@ import com.l2jserver.gameserver.templates.chars.L2PcTemplate;
  */
 public final class NewCharacter extends L2GameClientPacket
 {
-	private static final String _C__0E_NEWCHARACTER = "[C] 0E NewCharacter";
+	private static final String _C__13_NEWCHARACTER = "[C] 13 NewCharacter";
 	private static Logger _log = Logger.getLogger(NewCharacter.class.getName());
 	
 	@Override
@@ -85,12 +84,9 @@ public final class NewCharacter extends L2GameClientPacket
 		sendPacket(ct);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__0E_NEWCHARACTER;
+		return _C__13_NEWCHARACTER;
 	}
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class ObserverReturn extends L2GameClientPacket
 {
-	private static final String OBSRETURN__C__04 = "[C] b8 ObserverReturn";
+	private static final String __C__C1_OBSERVERRETURN = "[C] C1 ObserverReturn";
 	//private static Logger _log = Logger.getLogger(Action.class.getName());
 	
 	@Override
@@ -41,12 +41,9 @@ public final class ObserverReturn extends L2GameClientPacket
 		//activeChar.teleToLocation(activeChar.getObsX(), activeChar.getObsY(), activeChar.getObsZ());
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return OBSRETURN__C__04;
+		return __C__C1_OBSERVERRETURN;
 	}
 }

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

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
  */
 public final class ProtocolVersion extends L2GameClientPacket
 {
-	private static final String _C__00_PROTOCOLVERSION = "[C] 00 ProtocolVersion";
+	private static final String _C__0E_PROTOCOLVERSION = "[C] 0E ProtocolVersion";
 	private static final Logger _log = Logger.getLogger(ProtocolVersion.class.getName());
 	private static final Logger _logAccounting = Logger.getLogger("accounting");
 	
@@ -72,12 +72,9 @@ public final class ProtocolVersion extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__00_PROTOCOLVERSION;
+		return _C__0E_PROTOCOLVERSION;
 	}
 }

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

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList.SkillType
  */
 public final class RequestAcquireSkillInfo extends L2GameClientPacket
 {
-	private static final String _C__6B_REQUESTACQUIRESKILLINFO = "[C] 6B RequestAcquireSkillInfo";
+	private static final String _C__73_REQUESTACQUIRESKILLINFO = "[C] 73 RequestAcquireSkillInfo";
 	private static final Logger _log = Logger.getLogger(RequestAcquireSkillInfo.class.getName());
 	
 	private int _id;
@@ -330,6 +330,6 @@ public final class RequestAcquireSkillInfo extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__6B_REQUESTACQUIRESKILLINFO;
+		return _C__73_REQUESTACQUIRESKILLINFO;
 	}
 }

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

@@ -50,7 +50,6 @@ import com.l2jserver.gameserver.network.serverpackets.RecipeShopManageList;
 import com.l2jserver.gameserver.network.serverpackets.SocialAction;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-
 /**
  * This class ...
  *
@@ -58,7 +57,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestActionUse extends L2GameClientPacket
 {
-	private static final String _C__45_REQUESTACTIONUSE = "[C] 45 RequestActionUse";
+	private static final String _C__56_REQUESTACTIONUSE = "[C] 56 RequestActionUse";
 	private static Logger _log = Logger.getLogger(RequestActionUse.class.getName());
 	
 	private int _actionId;
@@ -896,7 +895,7 @@ public final class RequestActionUse extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__45_REQUESTACTIONUSE;
+		return _C__56_REQUESTACTIONUSE;
 	}
 	
 	@Override

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

@@ -18,38 +18,28 @@ import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.serverpackets.ExShowAgitInfo;
 
 /**
- *
  * @author  KenM
  */
 public class RequestAllAgitInfo extends L2GameClientPacket
 {
 	private static final String _C__D0_3E_REQUESTALLAGITINFO = "[C] D0:3E RequestAllAgitInfo";
-		
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
+	
 	@Override
 	protected void readImpl()
 	{
 		
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
-		L2GameClient client = this.getClient();
+		final L2GameClient client = getClient();
 		if (client != null)
 		{
 			client.sendPacket(new ExShowAgitInfo());
 		}
 	}
-
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{

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

@@ -18,25 +18,18 @@ import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.serverpackets.ExShowCastleInfo;
 
 /**
- *
  * @author  KenM
  */
 public class RequestAllCastleInfo extends L2GameClientPacket
 {
 	private static final String _C__D0_3C_REQUESTALLCASTLEINFO = "[C] D0:3C RequestAllCastleInfo";
-		
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
+	
 	@Override
 	protected void readImpl()
 	{
 		// trigger
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -52,10 +45,7 @@ public class RequestAllCastleInfo extends L2GameClientPacket
 	{
 		return false;
 	}
-
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{

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

@@ -18,25 +18,18 @@ import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.serverpackets.ExShowFortressInfo;
 
 /**
- *
  * @author  KenM
  */
 public class RequestAllFortressInfo extends L2GameClientPacket
 {
 	private static final String _C__D0_3D_REQUESTALLFORTRESSINFO = "[C] D0:3D RequestAllFortressInfo";
-		
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
+	
 	@Override
 	protected void readImpl()
 	{
 		// trigger packet
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -52,10 +45,7 @@ public class RequestAllFortressInfo extends L2GameClientPacket
 	{
 		return false;
 	}
-
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{

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

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 import com.l2jserver.gameserver.network.serverpackets.AllyCrest;
 
-
 /**
  * This class ...
  *
@@ -24,14 +23,10 @@ import com.l2jserver.gameserver.network.serverpackets.AllyCrest;
  */
 public final class RequestAllyCrest extends L2GameClientPacket
 {
-	private static final String _C__88_REQUESTALLYCREST = "[C] 88 RequestAllyCrest";
+	private static final String _C__92_REQUESTALLYCREST = "[C] 92 RequestAllyCrest";
 	
 	private int _crestId;
-	/**
-	 * packet type id 0x88 format: cd
-	 *
-	 * @param rawPacket
-	 */
+	
 	@Override
 	protected void readImpl()
 	{
@@ -44,13 +39,10 @@ public final class RequestAllyCrest extends L2GameClientPacket
 		sendPacket(new AllyCrest(_crestId));
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__88_REQUESTALLYCREST;
+		return _C__92_REQUESTALLYCREST;
 	}
 	
 	@Override

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

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestAllyInfo extends L2GameClientPacket
 {
-	private static final String _C__8E_REQUESTALLYINFO = "[C] 8E RequestAllyInfo";
+	private static final String _C__2E_REQUESTALLYINFO = "[C] 2E RequestAllyInfo";
 	
 	
 	@Override
@@ -106,12 +106,9 @@ public final class RequestAllyInfo extends L2GameClientPacket
 		sendPacket(sm);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__8E_REQUESTALLYINFO;
+		return _C__2E_REQUESTALLYINFO;
 	}
 }

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

@@ -25,19 +25,9 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.FriendPacket;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-/**
- *  sample
- *  5F
- *  01 00 00 00
- *
- *  format  cdd
- *
- *
- * @version $Revision: 1.7.4.2 $ $Date: 2005/03/27 15:29:30 $
- */
 public final class RequestAnswerFriendInvite extends L2GameClientPacket
 {
-	private static final String _C__5F_REQUESTANSWERFRIENDINVITE = "[C] 5F RequestAnswerFriendInvite";
+	private static final String _C__78_REQUESTANSWERFRIENDINVITE = "[C] 78 RequestAnswerFriendInvite";
 	private static Logger _log = Logger.getLogger(RequestAnswerFriendInvite.class.getName());
 	
 	private int _response;
@@ -109,12 +99,9 @@ public final class RequestAnswerFriendInvite extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__5F_REQUESTANSWERFRIENDINVITE;
+		return _C__78_REQUESTANSWERFRIENDINVITE;
 	}
 }

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

@@ -22,19 +22,9 @@ import com.l2jserver.gameserver.network.communityserver.CommunityServerThread;
 import com.l2jserver.gameserver.network.communityserver.writepackets.WorldInfo;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-/**
- *  sample
- *  5F
- *  01 00 00 00
- *
- *  format  cdd
- *
- *
- * @version $Revision: 1.7.4.2 $ $Date: 2005/03/27 15:29:30 $
- */
 public final class RequestAnswerJoinAlly extends L2GameClientPacket
 {
-	private static final String _C__83_REQUESTANSWERJOINALLY = "[C] 83 RequestAnswerJoinAlly";
+	private static final String _C__8D_REQUESTANSWERJOINALLY = "[C] 8D RequestAnswerJoinAlly";
 	//private static Logger _log = Logger.getLogger(RequestAnswerJoinAlly.class.getName());
 	
 	private int _response;
@@ -100,12 +90,9 @@ public final class RequestAnswerJoinAlly extends L2GameClientPacket
 		activeChar.getRequest().onRequestResponse();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__83_REQUESTANSWERJOINALLY;
+		return _C__8D_REQUESTANSWERJOINALLY;
 	}
 }

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

@@ -22,19 +22,9 @@ import com.l2jserver.gameserver.network.serverpackets.ExManagePartyRoomMember;
 import com.l2jserver.gameserver.network.serverpackets.JoinParty;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-/**
- *  sample
- *  2a
- *  01 00 00 00
- *
- *  format  cdd
- *
- *
- * @version $Revision: 1.7.4.2 $ $Date: 2005/03/27 15:29:30 $
- */
 public final class RequestAnswerJoinParty extends L2GameClientPacket
 {
-	private static final String _C__2A_REQUESTANSWERPARTY = "[C] 2A RequestAnswerJoinParty";
+	private static final String _C__43_REQUESTANSWERPARTY = "[C] 43 RequestAnswerJoinParty";
 	//private static Logger _log = Logger.getLogger(RequestAnswerJoinParty.class.getName());
 	
 	private int _response;
@@ -138,12 +128,9 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket
 		requestor.onTransactionResponse();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__2A_REQUESTANSWERPARTY;
+		return _C__43_REQUESTANSWERPARTY;
 	}
 }

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

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestAnswerJoinPledge extends L2GameClientPacket
 {
-	private static final String _C__25_REQUESTANSWERJOINPLEDGE = "[C] 25 RequestAnswerJoinPledge";
+	private static final String _C__27_REQUESTANSWERJOINPLEDGE = "[C] 27 RequestAnswerJoinPledge";
 	
 	private int _answer;
 	
@@ -114,12 +114,9 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket
 		activeChar.getRequest().onRequestResponse();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__25_REQUESTANSWERJOINPLEDGE;
+		return _C__27_REQUESTANSWERJOINPLEDGE;
 	}
 }

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

@@ -19,7 +19,6 @@ import java.util.logging.Logger;
 /**
  * Format: (ch) S
  * @author  -Wooden-
- *
  */
 public class RequestAskJoinPartyRoom extends L2GameClientPacket
 {

+ 0 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java

@@ -146,10 +146,6 @@ public final class RequestAutoSoulShot extends L2GameClientPacket
 		}
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -24,11 +24,10 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 /**
  * Format SSSSSS
  * @author -Wooden-
- *
  */
 public final class RequestBBSwrite extends L2GameClientPacket
 {
-	private static final String _C__22_REQUESTBBSWRITE = "[C] 22 RequestBBSwrite";
+	private static final String _C__24_REQUESTBBSWRITE = "[C] 24 RequestBBSwrite";
 	private String _url;
 	private String _arg1;
 	private String _arg2;
@@ -67,6 +66,6 @@ public final class RequestBBSwrite extends L2GameClientPacket
 	@Override
 	public final String getType()
 	{
-		return _C__22_REQUESTBBSWRITE;
+		return _C__24_REQUESTBBSWRITE;
 	}
 }

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

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 public final class RequestBlock extends L2GameClientPacket
 {
-	private static final String _C__A0_REQUESTBLOCK = "[C] A0 RequestBlock";
+	private static final String _C__A9_REQUESTBLOCK = "[C] A9 RequestBlock";
 	private static Logger _log = Logger.getLogger(L2PcInstance.class.getName());
 	
 	private final static int BLOCK = 0;
@@ -96,13 +96,13 @@ public final class RequestBlock extends L2GameClientPacket
 				BlockList.setBlockAll(activeChar, false);
 				break;
 			default:
-				_log.info("Unknown 0x0a block type: " + _type);
+				_log.info("Unknown 0xA9 block type: " + _type);
 		}
 	}
 	
 	@Override
 	public String getType()
 	{
-		return _C__A0_REQUESTBLOCK;
+		return _C__A9_REQUESTBLOCK;
 	}
 }

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

@@ -17,7 +17,6 @@ package com.l2jserver.gameserver.network.clientpackets;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
 
-
 /**
  *  @author ShanSoft
  *  Packets Structure: chddd

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

@@ -43,7 +43,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestBuyItem extends L2GameClientPacket
 {
-	private static final String _C__1F_REQUESTBUYITEM = "[C] 1F RequestBuyItem";
+	private static final String _C__40_REQUESTBUYITEM = "[C] 40 RequestBuyItem";
 	private static Logger _log = Logger.getLogger(RequestBuyItem.class.getName());
 	
 	private static final int BATCH_LENGTH = 12; // length of the one item
@@ -316,12 +316,9 @@ public final class RequestBuyItem extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__1F_REQUESTBUYITEM;
+		return _C__40_REQUESTBUYITEM;
 	}
 }

+ 0 - 214
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyProcure.java

@@ -1,214 +0,0 @@
-/*
- * This program 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.
- * 
- * This program 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.network.clientpackets;
-
-import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.instancemanager.CastleManorManager;
-import com.l2jserver.gameserver.model.L2ItemInstance;
-import com.l2jserver.gameserver.model.L2Manor;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.instance.L2ManorManagerInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.entity.Castle;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
-import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.item.L2Item;
-
-@Deprecated
-public class RequestBuyProcure extends L2GameClientPacket {
-	private static final String _C__C3_REQUESTBUYPROCURE = "[C] C3 RequestBuyProcure";
-	
-	private static final int BATCH_LENGTH = 12; // length of the one item
-	
-	@SuppressWarnings("unused")
-	private int _listId;
-	private Procure[] _items = null;
-	
-	@Override
-	protected void readImpl()
-	{
-		_listId = readD();
-		int count = readD();
-		if(count <= 0
-				|| count > Config.MAX_ITEM_IN_PACKET
-				|| count * BATCH_LENGTH != _buf.remaining())
-		{
-			return;
-		}
-		
-		_items = new Procure[count];
-		for (int i = 0; i < count; i++)
-		{
-			readD(); //service
-			int itemId = readD();
-			long cnt = readQ();
-			if (itemId < 1 || cnt < 1)
-			{
-				_items = null;
-				return;
-			}
-			_items[i] = new Procure(itemId, cnt);
-		}
-	}
-	
-	@Override
-	protected void runImpl()
-	{
-		L2PcInstance player = getClient().getActiveChar();
-		if (player == null)
-			return;
-		
-		if (!getClient().getFloodProtectors().getManor().tryPerformAction("BuyProcure"))
-			return;
-		
-		if(_items == null)
-		{
-			sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
-		// Alt game - Karma punishment
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && player.getKarma() > 0)
-			return;
-		
-		L2Object manager = player.getTarget();
-		
-		if (!(manager instanceof L2ManorManagerInstance))
-			manager = player.getLastFolkNPC();
-		
-		if (!(manager instanceof L2ManorManagerInstance))
-			return;
-		
-		if (!player.isInsideRadius(manager, INTERACTION_DISTANCE, true, false))
-			return;
-		
-		Castle castle = ((L2ManorManagerInstance)manager).getCastle();
-		int slots = 0;
-		int weight = 0;
-		
-		for (Procure i : _items)
-		{
-			i.setReward(castle);
-			
-			L2Item template = ItemTable.getInstance().getTemplate(i.getReward());
-			weight += i.getCount() * template.getWeight();
-			
-			if (!template.isStackable())
-				slots += i.getCount();
-			else if (player.getInventory().getItemByItemId(i.getItemId()) == null)
-				slots++;
-		}
-		
-		if (!player.getInventory().validateWeight(weight))
-		{
-			sendPacket(SystemMessage.getSystemMessage(SystemMessageId.WEIGHT_LIMIT_EXCEEDED));
-			return;
-		}
-		
-		if (!player.getInventory().validateCapacity(slots))
-		{
-			sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SLOTS_FULL));
-			return;
-		}
-		
-		// Proceed the purchase
-		InventoryUpdate playerIU = new InventoryUpdate();
-		
-		for (Procure i : _items)
-		{
-			// check if player have correct items count
-			L2ItemInstance item = player.getInventory().getItemByItemId(i.getItemId());
-			if (item == null || item.getCount() < i.getCount())
-				continue;
-			
-			L2ItemInstance iteme = player.getInventory().destroyItemByItemId("Manor",i.getItemId(),i.getCount(),player,manager);
-			if (iteme == null)
-				continue;
-			
-			// Add item to Inventory and adjust update packet
-			item = player.getInventory().addItem("Manor",i.getReward(),i.getCount(),player,manager);
-			if (item == null)
-				continue;
-			
-			playerIU.addRemovedItem(iteme);
-			if (item.getCount() > i.getCount())
-				playerIU.addModifiedItem(item);
-			else
-				playerIU.addNewItem(item);
-			
-			// Send Char Buy Messages
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
-			sm.addItemName(item);
-			sm.addItemNumber(i.getCount());
-			player.sendPacket(sm);
-			sm = null;
-			
-			//manor.getCastle().setCropAmount(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getAmount() - count);
-		}
-		
-		// Send update packets
-		player.sendPacket(playerIU);
-		
-		StatusUpdate su = new StatusUpdate(player);
-		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
-		player.sendPacket(su);
-	}
-	
-	private static class Procure
-	{
-		private final int _itemId;
-		private final long _count;
-		private int _reward;
-		
-		public Procure(int id, long num)
-		{
-			_itemId = id;
-			_count = num;
-		}
-		
-		public int getItemId()
-		{
-			return _itemId;
-		}
-		
-		public long getCount()
-		{
-			return _count;
-		}
-		
-		public int getReward()
-		{
-			return _reward;
-		}
-		
-		public void setReward(Castle c)
-		{
-			_reward = L2Manor.getInstance().getRewardItem(_itemId,
-					c.getCrop(_itemId,CastleManorManager.PERIOD_CURRENT).getReward());
-		}
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _C__C3_REQUESTBUYPROCURE;
-	}
-}

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

@@ -45,12 +45,9 @@ import com.l2jserver.gameserver.util.Util;
  * @param decrypt
  * @author l3x
  */
-
-
-
 public class RequestBuySeed extends L2GameClientPacket
 {
-	private static final String _C__C4_REQUESTBUYSEED = "[C] C4 RequestBuySeed";
+	private static final String _C__C5_REQUESTBUYSEED = "[C] C5 RequestBuySeed";
 	
 	private static final int BATCH_LENGTH = 12; // length of the one item
 	
@@ -249,6 +246,6 @@ public class RequestBuySeed extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__C4_REQUESTBUYSEED;
+		return _C__C5_REQUESTBUYSEED;
 	}
 }

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

@@ -37,9 +37,6 @@ public class RequestBuySellUIClose extends L2GameClientPacket
 		activeChar.sendPacket(new ItemList(activeChar, true));
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -42,7 +42,6 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.GMAudit;
 
-
 /**
  * This class ...
  *
@@ -270,7 +269,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
 	}
 	
 	/**
-	 * @param client
+	 * @param activeChar
 	 */
 	private static void comeHere(L2PcInstance activeChar)
 	{
@@ -284,9 +283,6 @@ public final class RequestBypassToServer extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -14,7 +14,6 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-
 /**
  *  @author ShanSoft
  *  Packets Structure: chddd

+ 0 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeNicknameColor.java

@@ -18,7 +18,6 @@ import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- *
  * @author  KenM, Gnacik
  */
 public class RequestChangeNicknameColor extends L2GameClientPacket
@@ -42,9 +41,6 @@ public class RequestChangeNicknameColor extends L2GameClientPacket
 	private int _colorNum, _itemObjectId;
 	private String _title;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
@@ -53,9 +49,6 @@ public class RequestChangeNicknameColor extends L2GameClientPacket
 		_itemObjectId = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -80,9 +73,6 @@ public class RequestChangeNicknameColor extends L2GameClientPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestChangePetName extends L2GameClientPacket
 {
-	private static final String REQUESTCHANGEPETNAME__C__89 = "[C] 89 RequestChangePetName";
+	private static final String __C__93_REQUESTCHANGEPETNAME = "[C] 93 RequestChangePetName";
 	//private static Logger _log = Logger.getLogger(RequestChangePetName.class.getName());
 	
 	private String _name;
@@ -78,6 +78,6 @@ public final class RequestChangePetName extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return REQUESTCHANGEPETNAME__C__89;
+		return __C__93_REQUESTCHANGEPETNAME;
 	}
 }

+ 0 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java

@@ -42,9 +42,6 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket
 		_objectId = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -114,9 +111,6 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket
 		activeChar.sendPacket(new ExPutItemResultForVariationCancel(item, price));
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

+ 0 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java

@@ -32,10 +32,6 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket
 	private int _gemstoneItemObjId;
 	private long _gemStoneCount;
 	
-	/**
-	 * @param buf
-	 * @param client
-	 */
 	@Override
 	protected void readImpl()
 	{
@@ -45,9 +41,6 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket
 		_gemStoneCount= readQ();
 	}
 	
-	/**
-	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected
 	void runImpl()
@@ -86,9 +79,6 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket
 		activeChar.sendPacket(new ExPutCommissionResultForVariationMake(_gemstoneItemObjId, _gemStoneCount, gemStoneItem.getItemId()));
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SiegeDefenderList;
  */
 public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket
 {
-	private static final String _C__A5_RequestConfirmSiegeWaitingList = "[C] a5 RequestConfirmSiegeWaitingList";
+	private static final String _C__AE_RequestConfirmSiegeWaitingList = "[C] AE RequestConfirmSiegeWaitingList";
 	//private static Logger _log = Logger.getLogger(RequestConfirmSiegeWaitingList.class.getName());
 	
 	private int _approved;
@@ -82,10 +82,9 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket
 		
 	}
 	
-	
 	@Override
 	public String getType()
 	{
-		return _C__A5_RequestConfirmSiegeWaitingList;
+		return _C__AE_RequestConfirmSiegeWaitingList;
 	}
 }

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

@@ -62,9 +62,6 @@ public final class RequestConfirmTargetItem extends AbstractRefinePacket
 		activeChar.sendPacket(new ExPutItemResultForVariationMake(_itemObjId, item.getItemId()));
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.item.L2Item;
 import com.l2jserver.gameserver.util.Util;
 
-
 /**
  * This class ...
  *
@@ -38,7 +37,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestCrystallizeItem extends L2GameClientPacket
 {
-	private static final String _C__72_REQUESTDCRYSTALLIZEITEM = "[C] 72 RequestCrystallizeItem";
+	private static final String _C__2F_REQUESTDCRYSTALLIZEITEM = "[C] 2F RequestCrystallizeItem";
 	
 	private static Logger _log = Logger.getLogger(RequestCrystallizeItem.class.getName());
 	
@@ -222,14 +221,9 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
 		activeChar.setInCrystallize(false);
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__72_REQUESTDCRYSTALLIZEITEM;
+		return _C__2F_REQUESTDCRYSTALLIZEITEM;
 	}
 }

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

@@ -16,9 +16,9 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 public final class RequestDeleteMacro extends L2GameClientPacket
 {
-	private int _id;
+	private static final String _C__CE_REQUESTDELETEMACRO = "[C] CE RequestDeleteMacro";
 	
-	private static final String _C__C2_REQUESTDELETEMACRO = "[C] C2 RequestDeleteMacro";
+	private int _id;
 	
 	@Override
 	protected void readImpl()
@@ -34,13 +34,9 @@ public final class RequestDeleteMacro extends L2GameClientPacket
 		getClient().getActiveChar().deleteMacro(_id);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__C2_REQUESTDELETEMACRO;
+		return _C__CE_REQUESTDELETEMACRO;
 	}
-	
 }

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

@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Util;
 
-
 /**
  * This class ...
  *
@@ -40,7 +39,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestDestroyItem extends L2GameClientPacket
 {
-	private static final String _C__59_REQUESTDESTROYITEM = "[C] 59 RequestDestroyItem";
+	private static final String _C__60_REQUESTDESTROYITEM = "[C] 60 RequestDestroyItem";
 	private static Logger _log = Logger.getLogger(RequestDestroyItem.class.getName());
 	
 	private int _objectId;
@@ -199,12 +198,9 @@ public final class RequestDestroyItem extends L2GameClientPacket
 		activeChar.sendPacket(su);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__59_REQUESTDESTROYITEM;
+		return _C__60_REQUESTDESTROYITEM;
 	}
 }

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

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestDismissAlly extends L2GameClientPacket
 {
-	private static final String _C__86_REQUESTDISMISSALLY = "[C] 86 RequestDismissAlly";
+	private static final String _C__90_REQUESTDISMISSALLY = "[C] 90 RequestDismissAlly";
 	//static Logger _log = Logger.getLogger(RequestDismissAlly.class.getName());
 	
 	@Override
@@ -50,12 +50,9 @@ public final class RequestDismissAlly extends L2GameClientPacket
 		activeChar.getClan().dissolveAlly(activeChar);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__86_REQUESTDISMISSALLY;
+		return _C__90_REQUESTDISMISSALLY;
 	}
 }

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

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
  * @author Gnacik
- * 
  */
 public class RequestDismissPartyRoom extends L2GameClientPacket
 {

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

@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.templates.item.L2Item;
 import com.l2jserver.gameserver.util.GMAudit;
 import com.l2jserver.gameserver.util.Util;
 
-
 /**
  * This class ...
  *
@@ -38,7 +37,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestDropItem extends L2GameClientPacket
 {
-	private static final String _C__12_REQUESTDROPITEM = "[C] 12 RequestDropItem";
+	private static final String _C__17_REQUESTDROPITEM = "[C] 17 RequestDropItem";
 	private static Logger _log = Logger.getLogger(RequestDropItem.class.getName());
 	
 	private int _objectId;
@@ -223,13 +222,10 @@ public final class RequestDropItem extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__12_REQUESTDROPITEM;
+		return _C__17_REQUESTDROPITEM;
 	}
 	
 	@Override

+ 0 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExDuelAskStart;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-
 /**
  * Format:(ch) Sd
  * @author  -Wooden-
@@ -43,9 +42,6 @@ public final class RequestDuelStart extends L2GameClientPacket
 		_partyDuel = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -177,13 +173,9 @@ public final class RequestDuelStart extends L2GameClientPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_1B_REQUESTDUELSTART;
 	}
-	
 }

+ 0 - 7
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelSurrender.java

@@ -31,22 +31,15 @@ public final class RequestDuelSurrender extends L2GameClientPacket
 		// trigger
 	}
 	
-	/**
-	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
 		DuelManager.getInstance().doSurrender(getClient().getActiveChar());
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_45_REQUESTDUELSURRENDER;
 	}
-	
 }

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

@@ -41,7 +41,7 @@ public final class RequestEnchantItem extends AbstractEnchantPacket
 	protected static final Logger _log = Logger.getLogger(RequestEnchantItem.class.getName());
 	protected static final Logger _logEnchant = Logger.getLogger("enchant");
 	
-	private static final String _C__58_REQUESTENCHANTITEM = "[C] 58 RequestEnchantItem";
+	private static final String _C__5F_REQUESTENCHANTITEM = "[C] 5F RequestEnchantItem";
 	
 	private int _objectId = 0;
 	private int _supportId;
@@ -348,14 +348,9 @@ public final class RequestEnchantItem extends AbstractEnchantPacket
 		}
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__58_REQUESTENCHANTITEM;
+		return _C__5F_REQUESTENCHANTITEM;
 	}
 }

+ 0 - 12
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java

@@ -22,26 +22,18 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 /**
  * format: (ch) d
  * @author -Wooden-
- *
  */
 public final class RequestExAcceptJoinMPCC extends L2GameClientPacket
 {
 	private static final String _C__D0_07_REQUESTEXASKJOINMPCC = "[C] D0:07 RequestExAcceptJoinMPCC";
 	private int _response;
 	
-	/**
-	 * @param buf
-	 * @param client
-	 */
 	@Override
 	protected void readImpl()
 	{
 		_response = readD();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -81,13 +73,9 @@ public final class RequestExAcceptJoinMPCC extends L2GameClientPacket
 		
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_07_REQUESTEXASKJOINMPCC;
 	}
-	
 }

+ 0 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java

@@ -175,13 +175,9 @@ public final class RequestExAskJoinMPCC extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_06_REQUESTEXASKJOINMPCC;
 	}
-	
 }

+ 0 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExCancelEnchantItem.java

@@ -18,25 +18,18 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.EnchantResult;
 
 /**
- *
  * @author  KenM
  */
 public class RequestExCancelEnchantItem extends L2GameClientPacket
 {
 	private static final String _C__D0_4E_REQUESTEXCANCELENCHANTITEM = "[C] D0:4E RequestExCancelEnchantItem";
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
 		// nothing (trigger)
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -48,9 +41,6 @@ public class RequestExCancelEnchantItem extends L2GameClientPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

+ 0 - 12
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExChangeName.java

@@ -18,9 +18,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExNeedToChangeName;
 
 /**
  * Reply for {@link ExNeedToChangeName}
- * 
  * @author JIV
- *
  */
 public class RequestExChangeName extends L2GameClientPacket
 {
@@ -30,9 +28,6 @@ public class RequestExChangeName extends L2GameClientPacket
 	private int _type;
 	private int _charSlot;
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
@@ -41,9 +36,6 @@ public class RequestExChangeName extends L2GameClientPacket
 		_charSlot = readD();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -51,13 +43,9 @@ public class RequestExChangeName extends L2GameClientPacket
 		
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_3B_REQUESTEXCHANGENAME;
 	}
-	
 }

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

@@ -20,11 +20,10 @@ import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- * @author mrTJO
  * Format: chddd
- * 
  * d: Arena
  * d: Answer
+ * @author mrTJO
  */
 public final class RequestExCubeGameReadyAnswer extends L2GameClientPacket
 {

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

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
  * d: skill id
  * d: skill lvl
  * @author -Wooden-
- *
  */
 public final class RequestExEnchantSkillInfo extends L2GameClientPacket
 {
@@ -43,9 +42,6 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket
 		_skillLvl = readD();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -60,21 +56,13 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket
 		if (activeChar.getLevel() < 76)
 			return;
 		
-		/* L2Npc trainer = activeChar.getLastFolkNPC();
-        if (!(trainer instanceof L2NpcInstance))
-        	return;
-
-        if (!trainer.canInteract(activeChar) && !activeChar.isGM())
-            return;*/
-		
-		L2Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
-		
+		final L2Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
 		if (skill == null || skill.getId() != _skillId)
 		{
 			return;
 		}
 		
-		if ( EnchantGroupsTable.getInstance().getSkillEnchantmentBySkillId(_skillId) == null)
+		if (EnchantGroupsTable.getInstance().getSkillEnchantmentBySkillId(_skillId) == null)
 			return;
 		
 		int playerSkillLvl = activeChar.getSkillLevel(_skillId);
@@ -84,13 +72,9 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket
 		activeChar.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLvl));
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_0E_REQUESTEXENCHANTSKILLINFO;
 	}
-	
 }

+ 0 - 14
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java

@@ -21,12 +21,9 @@ import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
 
-
 /**
  * Format (ch) ddd c: (id) 0xD0 h: (subid) 0x31 d: type d: skill id d: skill lvl
- * 
  * @author -Wooden-
- * 
  */
 public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
 {
@@ -45,11 +42,6 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
 		_skillLvl = readD();
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -102,15 +94,9 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
 		activeChar.sendPacket(esd);
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C_D0_46_REQUESTEXENCHANTSKILLINFO;
 	}
-	
 }

+ 0 - 14
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java

@@ -37,12 +37,9 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 import com.l2jserver.util.Rnd;
 
-
 /**
  * Format (ch) dd c: (id) 0xD0 h: (subid) 0x34 d: skill id d: skill lvl
- * 
  * @author -Wooden-
- * 
  */
 public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 {
@@ -60,11 +57,6 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 		_skillLvl = readD();
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -236,15 +228,9 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 		}
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_34_REQUESTEXENCHANTSKILLROUTECHANGE;
 	}
-	
 }

+ 0 - 14
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java

@@ -37,12 +37,9 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 import com.l2jserver.util.Rnd;
 
-
 /**
  * Format (ch) dd c: (id) 0xD0 h: (subid) 0x32 d: skill id d: skill lvl
- * 
  * @author -Wooden-
- * 
  */
 public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 {
@@ -60,11 +57,6 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 		_skillLvl = readD();
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -221,15 +213,9 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 		}
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_32_REQUESTEXENCHANTSKILLSAFE;
 	}
-	
 }

+ 0 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java

@@ -36,7 +36,6 @@ import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 
-
 /**
  * Format (ch) dd
  * c: (id) 0xD0
@@ -44,7 +43,6 @@ import com.l2jserver.gameserver.network.serverpackets.UserInfo;
  * d: skill id
  * d: skill lvl
  * @author -Wooden-
- *
  */
 public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 {
@@ -62,9 +60,6 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 		_skillLvl = readD();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -203,13 +198,9 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_33_REQUESTEXENCHANTSKILLUNTRAIN;
 	}
-	
 }

+ 0 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExFishRanking.java

@@ -20,7 +20,6 @@ import java.util.logging.Logger;
  * Format: (ch)
  * just a trigger
  * @author  -Wooden-
- *
  */
 public final class RequestExFishRanking extends L2GameClientPacket
 {
@@ -33,22 +32,15 @@ public final class RequestExFishRanking extends L2GameClientPacket
 		// trigger
 	}
 	
-	/**
-	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
 		_log.info("C5: RequestExFishRanking");
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_18_REQUESTEXFISHRANKING;
 	}
-	
 }

+ 0 - 7
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java

@@ -34,9 +34,6 @@ public final class RequestExMPCCShowPartyMembersInfo extends L2GameClientPacket
 		_partyLeaderId = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -48,13 +45,9 @@ public final class RequestExMPCCShowPartyMembersInfo extends L2GameClientPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_2D_REQUESTMPCCSHOWPARTYMEMBERINFO;
 	}
-	
 }

+ 0 - 7
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.gameserver.util.Util;
 
-
 /**
  * Fromat:(ch) dddddc
  * @author  -Wooden-
@@ -52,9 +51,6 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket
 		_shiftPressed = readC() != 0;
 	}
 	
-	/**
-	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -93,9 +89,6 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -20,10 +20,8 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author -Wooden-
- *
  * D0 0F 00 5A 00 77 00 65 00 72 00 67 00 00 00
- *
+ * @author -Wooden-
  */
 public final class RequestExOustFromMPCC extends L2GameClientPacket
 {
@@ -37,9 +35,6 @@ public final class RequestExOustFromMPCC extends L2GameClientPacket
 		_name = readS();
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -73,13 +68,9 @@ public final class RequestExOustFromMPCC extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
 		return _C__D0_08_REQUESTEXOUSTFROMMPCC;
 	}
-	
 }

+ 0 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExPledgeCrestLarge;
  *
  * This is a trigger
  * @author -Wooden-
- *
  */
 public final class RequestExPledgeCrestLarge extends L2GameClientPacket
 {
@@ -49,12 +48,8 @@ public final class RequestExPledgeCrestLarge extends L2GameClientPacket
 			ExPledgeCrestLarge pcl = new ExPledgeCrestLarge(_crestId, data);
 			sendPacket(pcl);
 		}
-		
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.serverpackets.ExRpItemLink;
 
 /**
- *
  * @author  KenM
  */
 public class RequestExRqItemLink extends L2GameClientPacket
@@ -32,19 +31,13 @@ public class RequestExRqItemLink extends L2GameClientPacket
 	private static String _C__D0_1E_REQUESTEXRQITEMLINK = "[C] D0:1E RequestExRqItemLink";
 	private int _objectId;
 	private Logger _log = Logger.getLogger(RequestExRqItemLink.class.getName());
-		
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
+	
 	@Override
 	protected void readImpl()
 	{
 		_objectId = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -67,10 +60,7 @@ public class RequestExRqItemLink extends L2GameClientPacket
 			}
 		}
 	}
-
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{

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

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  * d data size
  * b raw data (picture i think ;) )
  * @author -Wooden-
- *
  */
 public final class RequestExSetPledgeCrestLarge extends L2GameClientPacket
 {
@@ -52,9 +51,6 @@ public final class RequestExSetPledgeCrestLarge extends L2GameClientPacket
 		readB(_data);
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -116,9 +112,6 @@ public final class RequestExSetPledgeCrestLarge extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantSupportItemRes
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- *
  * @author  KenM
  */
 public class RequestExTryToPutEnchantSupportItem extends AbstractEnchantPacket
@@ -31,9 +30,6 @@ public class RequestExTryToPutEnchantSupportItem extends AbstractEnchantPacket
 	private int _supportObjectId;
 	private int _enchantObjectId;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
@@ -41,9 +37,6 @@ public class RequestExTryToPutEnchantSupportItem extends AbstractEnchantPacket
 		_enchantObjectId = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -73,10 +66,7 @@ public class RequestExTryToPutEnchantSupportItem extends AbstractEnchantPacket
 			}
 		}
 	}
-
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{

+ 0 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantTargetItemResu
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- *
  * @author  KenM
  */
 public class RequestExTryToPutEnchantTargetItem extends AbstractEnchantPacket
@@ -30,18 +29,12 @@ public class RequestExTryToPutEnchantTargetItem extends AbstractEnchantPacket
 	
 	private int _objectId = 0;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
 		_objectId = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -77,9 +70,6 @@ public class RequestExTryToPutEnchantTargetItem extends AbstractEnchantPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -18,9 +18,7 @@ import com.l2jserver.gameserver.model.PartyMatchWaitingList;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- * 
  * @author Gnacik
- *
  */
 public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacket
 {
@@ -47,5 +45,4 @@ public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacke
 	{
 		return _C__D0_25_REQUESTEXITPARTYMATCHINGWAITINGROOM;
 	}
-	
 }

+ 0 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java

@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.model.entity.Fort;
 import com.l2jserver.gameserver.network.serverpackets.ExShowFortressMapInfo;
 
 /**
- *
  * @author  KenM
  */
 public class RequestFortressMapInfo extends L2GameClientPacket
@@ -27,18 +26,12 @@ public class RequestFortressMapInfo extends L2GameClientPacket
 	private static final String _C_D0_48_REQUESTFORTRESSMAPINFO = "[C] D0:48 RequestFortressMapInfo";
 	private int _fortressId;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
 		_fortressId = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -46,9 +39,6 @@ public class RequestFortressMapInfo extends L2GameClientPacket
 		sendPacket(new ExShowFortressMapInfo(fort));
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -20,25 +20,18 @@ import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.serverpackets.ExShowFortressSiegeInfo;
 
 /**
- *
  * @author  KenM
  */
 public class RequestFortressSiegeInfo extends L2GameClientPacket
 {
 	private static final String _C__D0_3F_REQUESTFORTRESSSIEGEINFO = "[C] D0:3F RequestFortressSiegeInfo";
-		
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
+	
 	@Override
 	protected void readImpl()
 	{
 		// trigger
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -60,10 +53,7 @@ public class RequestFortressSiegeInfo extends L2GameClientPacket
 	{
 		return false;
 	}
-
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{

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

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestFriendDel extends L2GameClientPacket{
 	
-	private static final String _C__61_REQUESTFRIENDDEL = "[C] 61 RequestFriendDel";
+	private static final String _C__7A_REQUESTFRIENDDEL = "[C] 7A RequestFriendDel";
 	private static Logger _log = Logger.getLogger(RequestFriendDel.class.getName());
 	
 	private String _name;
@@ -112,11 +112,10 @@ public final class RequestFriendDel extends L2GameClientPacket{
 		
 	}
 	
-	
 	@Override
 	public String getType()
 	{
-		return _C__61_REQUESTFRIENDDEL;
+		return _C__7A_REQUESTFRIENDDEL;
 	}
 }
 

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestFriendInvite extends L2GameClientPacket
 {
-	private static final String _C__5E_REQUESTFRIENDINVITE = "[C] 5E RequestFriendInvite";
+	private static final String _C__77_REQUESTFRIENDINVITE = "[C] 77 RequestFriendInvite";
 	//private static Logger _log = Logger.getLogger(RequestFriendInvite.class.getName());
 	
 	private String _name;
@@ -107,6 +107,6 @@ public final class RequestFriendInvite extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__5E_REQUESTFRIENDINVITE;
+		return _C__77_REQUESTFRIENDINVITE;
 	}
 }

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 public final class RequestFriendList extends L2GameClientPacket
 {
 	//private static Logger _log = Logger.getLogger(RequestFriendList.class.getName());
-	private static final String _C__60_REQUESTFRIENDLIST = "[C] 60 RequestFriendList";
+	private static final String _C__79_REQUESTFRIENDLIST = "[C] 79 RequestFriendList";
 	
 	@Override
 	protected void readImpl()
@@ -83,6 +83,6 @@ public final class RequestFriendList extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__60_REQUESTFRIENDLIST;
+		return _C__79_REQUESTFRIENDLIST;
 	}
 }

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

@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.network.serverpackets.GMViewSkillInfo;
 import com.l2jserver.gameserver.network.serverpackets.GMViewWarehouseWithdrawList;
 import com.l2jserver.gameserver.network.serverpackets.GmViewQuestInfo;
 
-
 /**
  * This class ...
  *
@@ -36,7 +35,7 @@ import com.l2jserver.gameserver.network.serverpackets.GmViewQuestInfo;
  */
 public final class RequestGMCommand extends L2GameClientPacket
 {
-	private static final String _C__6E_REQUESTGMCOMMAND = "[C] 6e RequestGMCommand";
+	private static final String _C__7E_REQUESTGMCOMMAND = "[C] 7E RequestGMCommand";
 	static Logger _log = Logger.getLogger(RequestGMCommand.class.getName());
 	
 	private String _targetName;
@@ -112,12 +111,9 @@ public final class RequestGMCommand extends L2GameClientPacket
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		return _C__6E_REQUESTGMCOMMAND;
+		return _C__7E_REQUESTGMCOMMAND;
 	}
 }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác