diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java index e4f4dab9b8..59c4c1f7fb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java @@ -84,84 +84,21 @@ public class ClientThread extends Thread long starttime = System.currentTimeMillis(); try { - try + do { - do + if ((_activeChar != null) && (_autoSaveTime < (System.currentTimeMillis() - starttime))) { - if ((_activeChar != null) && (_autoSaveTime < (System.currentTimeMillis() - starttime))) - { - saveCharToDisk(_activeChar); - starttime = System.currentTimeMillis(); - } - final byte[] decrypt = _connection.getPacket(); - _handler.handlePacket(decrypt); - } - while (true); - } - catch (IOException io) - { - try - { - if (_activeChar != null) - { - _activeChar.deleteMe(); - try - { - saveCharToDisk(_activeChar); - } - catch (Exception e2) - { - // empty catch block - } - } - _connection.close(); - } - catch (Exception e1) - { - _log.warning(e1.toString()); - } - finally - { - LoginController.getInstance().removeGameServerLogin(getLoginName()); - } - } - catch (Exception e) - { - e.printStackTrace(); - try - { - if (_activeChar != null) - { - _activeChar.deleteMe(); - try - { - saveCharToDisk(_activeChar); - } - catch (Exception e2) - { - // empty catch block - } - } - _connection.close(); - LoginController.getInstance().removeGameServerLogin(getLoginName()); - } - catch (Exception e1) - { - try - { - } - catch (Throwable throwable) - { - LoginController.getInstance().removeGameServerLogin(getLoginName()); - throw throwable; - } - _log.warning(e1.toString()); - LoginController.getInstance().removeGameServerLogin(getLoginName()); + saveCharToDisk(_activeChar); + starttime = System.currentTimeMillis(); } + final byte[] decrypt = _connection.getPacket(); + _handler.handlePacket(decrypt); } + while (true); } - catch (Throwable throwable) + catch (Exception e) { + _log.warning(e.toString()); try { if (_activeChar != null) @@ -184,15 +121,14 @@ public class ClientThread extends Thread try { } - catch (Throwable throwable2) + catch (Throwable throwable) { LoginController.getInstance().removeGameServerLogin(getLoginName()); - throw throwable2; + throw throwable; } _log.warning(e1.toString()); LoginController.getInstance().removeGameServerLogin(getLoginName()); } - throw throwable; } } @@ -216,10 +152,9 @@ public class ClientThread extends Thread private void storeShortcuts(PlayerInstance cha, File saveFile) { - OutputStreamWriter out = null; try { - out = new FileWriter(saveFile); + final OutputStreamWriter out = new FileWriter(saveFile); out.write("slot;type;id;level;unknown\r\n"); for (ShortCut sc : cha.getAllShortCuts()) { @@ -229,24 +164,12 @@ public class ClientThread extends Thread out.write(sc.getLevel() + ";"); out.write(sc.getUnk() + "\r\n"); } + out.close(); } catch (Exception e) { _log.warning("could not store shortcuts:" + e.toString()); } - finally - { - try - { - if (out != null) - { - out.close(); - } - } - catch (Exception e1) - { - } - } } public void deleteCharFromDisk(int charslot) @@ -304,13 +227,12 @@ public class ClientThread extends Thread private void restoreShortCuts(File file, PlayerInstance restored) { - BufferedReader lnr = null; try { - lnr = new LineNumberReader(new BufferedReader(new FileReader(file))); - ((LineNumberReader) lnr).readLine(); + final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(file))); + lnr.readLine(); String line = null; - while ((line = ((LineNumberReader) lnr).readLine()) != null) + while ((line = lnr.readLine()) != null) { final StringTokenizer st = new StringTokenizer(line, ";"); final int slot = Integer.parseInt(st.nextToken()); @@ -321,32 +243,19 @@ public class ClientThread extends Thread final ShortCut sc = new ShortCut(slot, type, id, level, unk); restored.registerShortCut(sc); } + lnr.close(); } catch (Exception e) { _log.warning("could not restore shortcuts:" + e); } - finally - { - try - { - if (lnr != null) - { - lnr.close(); - } - } - catch (Exception e1) - { - } - } } private void storeInventory(PlayerInstance cha, File saveFile) { - OutputStreamWriter out = null; try { - out = new FileWriter(saveFile); + final OutputStreamWriter out = new FileWriter(saveFile); out.write("objectId;itemId;name;count;price;equipSlot;\r\n"); for (ItemInstance item : cha.getInventory().getItems()) { @@ -362,32 +271,19 @@ public class ClientThread extends Thread } out.write(item.getEquipSlot() + "\r\n"); } + out.close(); } catch (Exception e) { _log.warning("could not store inventory:" + e); } - finally - { - try - { - if (out != null) - { - out.close(); - } - } - catch (Exception e1) - { - } - } } private void storeSkills(PlayerInstance cha, File saveFile) { - OutputStreamWriter out = null; try { - out = new FileWriter(saveFile); + final OutputStreamWriter out = new FileWriter(saveFile); out.write("skillId;skillLevel;skillName\r\n"); for (Skill skill : cha.getAllSkills()) { @@ -395,32 +291,19 @@ public class ClientThread extends Thread out.write(skill.getLevel() + ";"); out.write(skill.getName() + "\r\n"); } + out.close(); } catch (Exception e) { _log.warning("could not store skills:" + e); } - finally - { - try - { - if (out != null) - { - out.close(); - } - } - catch (Exception e1) - { - } - } } private void storeChar(PlayerInstance cha, File charFile) { - FileWriter out = null; try { - out = new FileWriter(charFile); + final FileWriter out = new FileWriter(charFile); out.write("objId;charName;level;maxHp;curHp;maxMp;curMp;acc;crit;evasion;mAtk;mDef;mSpd;pAtk;pDef;pSpd;runSpd;walkSpd;str;con;dex;int;men;wit;face;hairStyle;hairColor;sex;heading;x;y;z;unk1;unk2;colRad;colHeight;exp;sp;karma;pvpkills;pkkills;clanid;maxload;race;classid;deletetime;cancraft;title;allyId\r\n"); out.write(cha.getObjectId() + ";"); out.write(cha.getName() + ";"); @@ -471,35 +354,22 @@ public class ClientThread extends Thread out.write(cha.getCanCraft() + ";"); out.write(" " + cha.getTitle() + ";"); out.write(cha.getAllyId() + ";"); + out.close(); } catch (IOException e) { _log.warning("could not store char data:" + e); } - finally - { - try - { - if (out != null) - { - out.close(); - } - } - catch (Exception e1) - { - } - } } private void restoreWarehouse(File wfile, PlayerInstance cha) { - BufferedReader lnr = null; try { - lnr = new LineNumberReader(new BufferedReader(new FileReader(wfile))); - ((LineNumberReader) lnr).readLine(); + final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(wfile))); + lnr.readLine(); String line = null; - while ((line = ((LineNumberReader) lnr).readLine()) != null) + while ((line = lnr.readLine()) != null) { final StringTokenizer st = new StringTokenizer(line, ";"); final ItemInstance item = new ItemInstance(); @@ -512,33 +382,20 @@ public class ClientThread extends Thread cha.getWarehouse().addItem(item); _world.storeObject(item); } + lnr.close(); } catch (Exception e) { _log.warning("could not restore warehouse:" + e); } - finally - { - try - { - if (lnr != null) - { - lnr.close(); - } - } - catch (Exception e1) - { - } - } } private void storeWarehouse(PlayerInstance cha, File saveFile) { - OutputStreamWriter out = null; try { final List items = cha.getWarehouse().getItems(); - out = new FileWriter(saveFile); + final OutputStreamWriter out = new FileWriter(saveFile); out.write("#objectId;itemId;name;count;\n"); for (int i = 0; i < items.size(); ++i) { @@ -548,35 +405,22 @@ public class ClientThread extends Thread out.write(item.getItem().getName() + ";"); out.write(item.getCount() + "\n"); } + out.close(); } catch (Exception e) { _log.warning("could not store warehouse:" + e); } - finally - { - try - { - if (out != null) - { - out.close(); - } - } - catch (Exception e1) - { - } - } } private void restoreInventory(File inventory, PlayerInstance cha) { - BufferedReader lnr = null; try { - lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory))); - ((LineNumberReader) lnr).readLine(); + final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory))); + lnr.readLine(); String line = null; - while ((line = ((LineNumberReader) lnr).readLine()) != null) + while ((line = lnr.readLine()) != null) { final StringTokenizer st = new StringTokenizer(line, ";"); final ItemInstance item = new ItemInstance(); @@ -595,35 +439,22 @@ public class ClientThread extends Thread } _world.storeObject(item); } + lnr.close(); } catch (Exception e) { _log.warning("could not restore inventory:" + e); } - finally - { - try - { - if (lnr != null) - { - lnr.close(); - } - } - catch (Exception e1) - { - } - } } private void restoreSkills(File inventory, PlayerInstance cha) { - BufferedReader lnr = null; try { - lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory))); - ((LineNumberReader) lnr).readLine(); + final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory))); + lnr.readLine(); String line = null; - while ((line = ((LineNumberReader) lnr).readLine()) != null) + while ((line = lnr.readLine()) != null) { final StringTokenizer st = new StringTokenizer(line, ";"); final int id = Integer.parseInt(st.nextToken()); @@ -632,35 +463,22 @@ public class ClientThread extends Thread final Skill skill = SkillTable.getInstance().getInfo(id, level); cha.addSkill(skill); } + lnr.close(); } catch (Exception e) { _log.warning("could not restore skills:" + e); } - finally - { - try - { - if (lnr != null) - { - lnr.close(); - } - } - catch (Exception e1) - { - } - } } private PlayerInstance restoreChar(File charFile) { final PlayerInstance oldChar = new PlayerInstance(); - BufferedReader lnr = null; try { - lnr = new LineNumberReader(new BufferedReader(new FileReader(charFile))); - ((LineNumberReader) lnr).readLine(); - final String line = ((LineNumberReader) lnr).readLine(); + final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(charFile))); + lnr.readLine(); + final String line = lnr.readLine(); final StringTokenizer st = new StringTokenizer(line, ";"); oldChar.setObjectId(Integer.parseInt(st.nextToken())); oldChar.setName(st.nextToken()); @@ -714,24 +532,12 @@ public class ClientThread extends Thread oldChar.setAllyId(Integer.parseInt(st.nextToken())); World.getInstance().storeObject(oldChar); oldChar.setUptime(System.currentTimeMillis()); + lnr.close(); } catch (Exception e) { _log.warning("could not restore char data:" + e); } - finally - { - try - { - if (lnr != null) - { - lnr.close(); - } - } - catch (Exception e1) - { - } - } return oldChar; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java index 14a1b05677..f5f8fb3852 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java @@ -96,10 +96,10 @@ public class Connection } } - public void sendPacket(ServerBasePacket bp) throws IOException + public void sendPacket(ServerBasePacket packet) throws IOException { - final byte[] data = bp.getContent(); - this.sendPacket(data); + packet.writeImpl(); + sendPacket(packet.getBytes()); } public void activateCryptKey() diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java index 29e0d7df48..46707a2ff6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -118,412 +118,412 @@ public class PacketHandler final int id = data[0] & 0xFF; switch (id) { - case 0: + case 0x00: { new ProtocolVersion(data, _client); break; } - case 1: + case 0x01: { new MoveBackwardToLocation(data, _client); break; } - case 3: + case 0x03: { new EnterWorld(data, _client); break; } - case 4: + case 0x04: { new Action(data, _client); break; } - case 8: + case 0x08: { new AuthLogin(data, _client); break; } - case 9: + case 0x09: { new Logout(data, _client); break; } - case 10: + case 0x0A: { new AttackRequest(data, _client); break; } - case 11: + case 0x0B: { new CharacterCreate(data, _client); break; } - case 12: + case 0x0C: { new CharacterDelete(data, _client); break; } - case 13: + case 0x0D: { new CharacterSelected(data, _client); break; } - case 14: + case 0x0E: { new NewCharacter(data, _client); break; } - case 15: + case 0x0F: { new RequestItemList(data, _client); break; } - case 17: + case 0x11: { new RequestUnEquipItem(data, _client); break; } - case 18: + case 0x12: { new RequestDropItem(data, _client); break; } - case 20: + case 0x14: { new UseItem(data, _client); break; } - case 21: + case 0x15: { new TradeRequest(data, _client); break; } - case 22: + case 0x16: { new AddTradeItem(data, _client); break; } - case 23: + case 0x17: { new TradeDone(data, _client); break; } - case 27: + case 0x1B: { new RequestSocialAction(data, _client); break; } - case 28: + case 0x1C: { new ChangeMoveType2(data, _client); break; } - case 29: + case 0x1D: { new ChangeWaitType2(data, _client); break; } - case 30: + case 0x1E: { new RequestSellItem(data, _client); break; } - case 31: + case 0x1F: { new RequestBuyItem(data, _client); break; } - case 33: + case 0x21: { new RequestBypassToServer(data, _client); break; } - case 36: + case 0x24: { new RequestJoinPledge(data, _client); break; } - case 37: + case 0x25: { new RequestAnswerJoinPledge(data, _client); break; } - case 38: + case 0x26: { new RequestWithdrawalPledge(data, _client); break; } - case 39: + case 0x27: { new RequestOustPledgeMember(data, _client); break; } - case 41: + case 0x29: { new RequestJoinParty(data, _client); break; } - case 42: + case 0x2A: { new RequestAnswerJoinParty(data, _client); break; } - case 43: + case 0x2B: { - new RequestWithDrawalParty(data, _client.getActiveChar()); + new RequestWithDrawalParty(data, _client); break; } - case 44: + case 0x2C: { new RequestOustPartyMember(data, _client); break; } - case 47: + case 0x2F: { new RequestMagicSkillUse(data, _client); break; } - case 48: + case 0x30: { new Appearing(data, _client); break; } - case 49: + case 0x31: { new SendWareHouseDepositList(data, _client); break; } - case 50: + case 0x32: { new SendWareHouseWithDrawList(data, _client); break; } - case 51: + case 0x33: { new RequestShortCutReg(data, _client); break; } - case 53: + case 0x35: { new RequestShortCutDel(data, _client); break; } - case 54: + case 0x36: { new StopMove(data, _client); break; } - case 55: + case 0x37: { new RequestTargetCanceld(data, _client); break; } - case 56: + case 0x38: { new Say2(data, _client); break; } - case 60: + case 0x3C: { new RequestPledgeMemberList(data, _client); break; } - case 63: + case 0x3F: { new RequestSkillList(data, _client); break; } - case 68: + case 0x44: { new AnswerTradeRequest(data, _client); break; } - case 69: + case 0x45: { new RequestActionUse(data, _client); break; } - case 70: + case 0x46: { new RequestRestart(data, _client); break; } - case 72: + case 0x48: { new ValidatePosition(data, _client); break; } - case 74: + case 0x4A: { new StartRotating(data, _client); break; } - case 75: + case 0x4B: { new FinishRotating(data, _client); break; } - case 83: + case 0x53: { new RequestSetPledgeCrest(data, _client); break; } - case 85: + case 0x55: { new RequestGiveNickName(data, _client); break; } - case 87: + case 0x57: { new RequestShowBoard(data, _client); break; } - case 89: + case 0x59: { new RequestDestroyItem(data, _client); break; } - case 91: + case 0x5B: { new SendBypassBuildCmd(data, _client); break; } - case 98: + case 0x62: { new CharacterRestore(data, _client); break; } - case 99: + case 0x63: { new RequestQuestList(data, _client); break; } - case 102: + case 0x66: { new RequestPledgeInfo(data, _client); break; } - case 104: + case 0x68: { new RequestPledgeCrest(data, _client); break; } - case 107: + case 0x6B: { new RequestAquireSkillInfo(data, _client); break; } - case 108: + case 0x6C: { new RequestAquireSkill(data, _client); break; } - case 109: + case 0x6D: { new RequestRestartPoint(data, _client); break; } - case 110: + case 0x6E: { new RequestGMCommand(data, _client); break; } - case 111: + case 0x6F: { new RequestPartyMatchConfig(data, _client); break; } - case 112: + case 0x70: { new RequestPartyMatchList(data, _client); break; } - case 113: + case 0x71: { new RequestPartyMatchDetail(data, _client); break; } - case 115: + case 0x73: { new RequestPrivateStoreManage(data, _client); break; } - case 116: + case 0x74: { new SetPrivateStoreListSell(data, _client); break; } - case 118: + case 0x76: { new RequestPrivateStoreQuitSell(data, _client); break; } - case 119: + case 0x77: { new SetPrivateStoreMsgSell(data, _client); break; } - case 121: + case 0x79: { new SendPrivateStoreBuyList(data, _client); break; } - case 129: + case 0x81: { new RequestGmList(data, _client); break; } - case 136: + case 0x88: { new RequestAllyCrest(data, _client); break; } - case 137: + case 0x89: { new RequestChangePetName(data, _client); break; } - case 139: + case 0x8B: { new RequestGiveItemToPet(data, _client); break; } - case 140: + case 0x8C: { new RequestGetItemFromPet(data, _client); break; } - case 143: + case 0x8F: { new RequestPetGetItem(data, _client); break; } - case 144: + case 0x90: { new RequestPrivateStoreBuyManage(data, _client); break; } - case 145: + case 0x91: { new SetPrivateStoreListBuy(data, _client); break; } - case 147: + case 0x93: { new RequestPrivateStoreQuitBuy(data, _client); break; } - case 148: + case 0x94: { new SetPrivateStoreMsgBuy(data, _client); break; } - case 150: + case 0x96: { new SendPrivateStoreBuyBuyList(data, _client); break; } - case 157: + case 0x9D: { // _log.warning("Request Skill Cool Time .. ignored"); break; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index ccca7d9b0f..94dc1e2b22 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class Action extends ClientBasePacket { - private static final String ACTION__C__04 = "[C] 04 Action"; - public Action(byte[] decrypt, ClientThread client) { super(decrypt); @@ -60,10 +58,4 @@ public class Action extends ClientBasePacket activeChar.sendPacket(new ActionFailed()); } } - - @Override - public String getType() - { - return ACTION__C__04; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 993527fd5b..5ffe072c74 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; public class AddTradeItem extends ClientBasePacket { - private static final String _C__16_ADDTRADEITEM = "[C] 16 AddTradeItem"; - public AddTradeItem(byte[] decrypt, ClientThread client) { super(decrypt); @@ -96,10 +94,4 @@ public class AddTradeItem extends ClientBasePacket player.getTradeList().getItems().clear(); } } - - @Override - public String getType() - { - return _C__16_ADDTRADEITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java index b796edf62b..aec38ef102 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeStart; public class AnswerTradeRequest extends ClientBasePacket { - private static final String _C__40_ANSWERTRADEREQUEST = "[C] 40 AnswerTradeRequest"; - public AnswerTradeRequest(byte[] decrypt, ClientThread client) { super(decrypt); @@ -72,10 +70,4 @@ public class AnswerTradeRequest extends ClientBasePacket player.setTransactionRequester(null); } } - - @Override - public String getType() - { - return _C__40_ANSWERTRADEREQUEST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java index 67a08db879..d539947eb0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java @@ -31,8 +31,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class Appearing extends ClientBasePacket { - private static final String _C__30_APPEARING = "[C] 30 Appearing"; - public Appearing(byte[] decrypt, ClientThread client) { super(decrypt); @@ -72,10 +70,4 @@ public class Appearing extends ClientBasePacket } World.getInstance().addVisibleObject(activeChar); } - - @Override - public String getType() - { - return _C__30_APPEARING; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java index bb54d4c9da..c71ee8b341 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class AttackRequest extends ClientBasePacket { - private static final String _C__0A_ATTACKREQUEST = "[C] 0A AttackRequest"; - public AttackRequest(byte[] decrypt, ClientThread client) { super(decrypt); @@ -39,6 +37,7 @@ public class AttackRequest extends ClientBasePacket final int originZ = readD(); @SuppressWarnings("unused") final int attackId = readC(); + final PlayerInstance activeChar = client.getActiveChar(); final WorldObject target = World.getInstance().findObject(objectId); if ((target != null) && (activeChar.getTarget() != target)) @@ -54,10 +53,4 @@ public class AttackRequest extends ClientBasePacket activeChar.sendPacket(new ActionFailed()); } } - - @Override - public String getType() - { - return _C__0A_ATTACKREQUEST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index f2abccae47..2c6bfb384b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; +import java.util.logging.Logger; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.AuthLoginFail; @@ -26,7 +27,7 @@ import org.l2jmobius.loginserver.LoginController; public class AuthLogin extends ClientBasePacket { - private static final String _C__08_AUTHLOGIN = "[C] 08 AuthLogin"; + final static Logger _log = Logger.getLogger(AuthLogin.class.getName()); public AuthLogin(byte[] decrypt, ClientThread client) throws IOException { @@ -59,10 +60,4 @@ public class AuthLogin extends ClientBasePacket } client.setAccessLevel(access); } - - @Override - public String getType() - { - return _C__08_AUTHLOGIN; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java index 4014d48a40..cff39e836b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java @@ -22,21 +22,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ChangeMoveType; public class ChangeMoveType2 extends ClientBasePacket { - private static final String _C__1C_CHANGEMOVETYPE2 = "[C] 1C ChangeMoveType2"; - public ChangeMoveType2(byte[] decrypt, ClientThread client) { super(decrypt); final int type = readD(); + final ChangeMoveType cmt = new ChangeMoveType(client.getActiveChar(), type); client.getActiveChar().setMoveType(type); client.getActiveChar().sendPacket(cmt); client.getActiveChar().broadcastPacket(cmt); } - - @Override - public String getType() - { - return _C__1C_CHANGEMOVETYPE2; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java index 18d4944058..09b55e18b6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java @@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; public class ChangeWaitType2 extends ClientBasePacket { - private static final String _C__1D_CHANGEWAITTYPE2 = "[C] 1D ChangeWaitType2"; - public ChangeWaitType2(byte[] decrypt, ClientThread client) { super(decrypt); @@ -33,10 +31,4 @@ public class ChangeWaitType2 extends ClientBasePacket client.getActiveChar().sendPacket(cwt); client.getActiveChar().broadcastPacket(cwt); } - - @Override - public String getType() - { - return _C__1D_CHANGEWAITTYPE2; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 5d2acd7a5e..6a609b1c1a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -38,8 +38,6 @@ import org.l2jmobius.gameserver.templates.CharTemplate; public class CharacterCreate extends ClientBasePacket { - private static final String _C__0B_CHARACTERCREATE = "[C] 0B CharacterCreate"; - public CharacterCreate(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); @@ -57,6 +55,7 @@ public class CharacterCreate extends ClientBasePacket newChar.setHairStyle(readD()); newChar.setHairColor(readD()); newChar.setFace(readD()); + if (CharNameTable.getInstance().doesCharNameExist(newChar.getName())) { final CharCreateFail ccf = new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS); @@ -160,10 +159,4 @@ public class CharacterCreate extends ClientBasePacket final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId()); client.getConnection().sendPacket(cl); } - - @Override - public String getType() - { - return _C__0B_CHARACTERCREATE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 6118503054..6f39029188 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; public class CharacterDelete extends ClientBasePacket { - private static final String _C__0C_CHARACTERDELETE = "[C] 0C CharacterDelete"; - public CharacterDelete(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); @@ -39,10 +37,4 @@ public class CharacterDelete extends ClientBasePacket final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId()); con.sendPacket(cl); } - - @Override - public String getType() - { - return _C__0C_CHARACTERDELETE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java index 42d99af3e6..65a2896ca7 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; public class CharacterRestore extends ClientBasePacket { - private static final String _C__62_CHARACTERRESTORE = "[C] 62 CharacterRestore"; - public CharacterRestore(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); @@ -34,10 +32,4 @@ public class CharacterRestore extends ClientBasePacket final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId()); client.getConnection().sendPacket(cl); } - - @Override - public String getType() - { - return _C__62_CHARACTERRESTORE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java index 3fc7b6b1f4..2bdec40a55 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelected; public class CharacterSelected extends ClientBasePacket { - private static final String _C__0D_CHARACTERSELECTED = "[C] 0D CharacterSelected"; - public CharacterSelected(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); @@ -38,10 +36,4 @@ public class CharacterSelected extends ClientBasePacket client.getConnection().sendPacket(cs); client.setActiveChar(cha); } - - @Override - public String getType() - { - return _C__0D_CHARACTERSELECTED; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java index 4732e8f15e..ab51dd634f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java @@ -17,18 +17,13 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - public abstract class ClientBasePacket { - static Logger _log = Logger.getLogger(ClientBasePacket.class.getName()); - private final byte[] _decrypt; private int _off; public ClientBasePacket(byte[] decrypt) { - _log.finest(getType()); _decrypt = decrypt; _off = 1; } @@ -88,6 +83,4 @@ public abstract class ClientBasePacket _off += length; return result; } - - public abstract String getType(); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index ea2c05122e..8f26650edc 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.Announcements; import org.l2jmobius.gameserver.data.MapRegionTable; import org.l2jmobius.gameserver.managers.GmListManager; @@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class EnterWorld extends ClientBasePacket { - private static final String _C__03_ENTERWORLD = "[C] 03 EnterWorld"; + final static Logger _log = Logger.getLogger(EnterWorld.class.getName()); public EnterWorld(byte[] decrypt, ClientThread client) { @@ -112,10 +114,4 @@ public class EnterWorld extends ClientBasePacket } } } - - @Override - public String getType() - { - return _C__03_ENTERWORLD; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java index 5b7d9ee391..bd13cae2c6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java @@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StopRotation; public class FinishRotating extends ClientBasePacket { - private static final String _C__4B_FINISHROTATING = "[C] 4B FinishRotating"; - public FinishRotating(byte[] decrypt, ClientThread client) { super(decrypt); @@ -34,10 +32,4 @@ public class FinishRotating extends ClientBasePacket client.getActiveChar().sendPacket(sr); client.getActiveChar().broadcastPacket(sr); } - - @Override - public String getType() - { - return _C__4B_FINISHROTATING; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 4c2315f1ea..aa93b1b8e6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class Logout extends ClientBasePacket { - private static final String _C__09_LOGOUT = "[C] 09 Logout"; - public Logout(byte[] decrypt, ClientThread client) { super(decrypt); @@ -51,10 +49,4 @@ public class Logout extends ClientBasePacket client.saveCharToDisk(player); } } - - @Override - public String getType() - { - return _C__09_LOGOUT; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 64d16609d4..a7077e8311 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.AttackCanceld; public class MoveBackwardToLocation extends ClientBasePacket { - private static final String _C__01_MOVEBACKWARDTOLOC = "[C] 01 MoveBackwardToLoc"; - public MoveBackwardToLocation(byte[] decrypt, ClientThread client) { super(decrypt); @@ -67,10 +65,4 @@ public class MoveBackwardToLocation extends ClientBasePacket activeChar.checkWaterState(); } } - - @Override - public String getType() - { - return _C__01_MOVEBACKWARDTOLOC; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 896bba173a..96a9db98e4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.templates.CharTemplate; public class NewCharacter extends ClientBasePacket { - private static final String _C__0E_NEWCHARACTER = "[C] 0E NewCharacter"; - public NewCharacter(byte[] rawPacket, ClientThread client) throws IOException { super(rawPacket); @@ -54,10 +52,4 @@ public class NewCharacter extends ClientBasePacket ct.addChar(template); client.getConnection().sendPacket(ct); } - - @Override - public String getType() - { - return _C__0E_NEWCHARACTER; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 55504140e0..cd9fbe721b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; +import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.network.ClientThread; @@ -26,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.KeyPacket; public class ProtocolVersion extends ClientBasePacket { - private static final String _C__00_PROTOCOLVERSION = "[C] 00 ProtocolVersion"; + final static Logger _log = Logger.getLogger(ProtocolVersion.class.getName()); public ProtocolVersion(byte[] rawPacket, ClientThread client) throws IOException { @@ -45,16 +46,8 @@ public class ProtocolVersion extends ClientBasePacket else { final Connection con = client.getConnection(); - final KeyPacket pk = new KeyPacket(); - pk.setKey(con.getCryptKey()); - con.sendPacket(pk); + con.sendPacket(new KeyPacket(con.getCryptKey())); con.activateCryptKey(); } } - - @Override - public String getType() - { - return _C__00_PROTOCOLVERSION; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index ca7de3828e..0c84df37ba 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.enums.CreatureState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMove; public class RequestActionUse extends ClientBasePacket { - private static final String _C__45_REQUESTACTIONUSE = "[C] 45 RequestActionUse"; + final static Logger _log = Logger.getLogger(RequestActionUse.class.getName()); public RequestActionUse(byte[] rawPacket, ClientThread client) { @@ -132,10 +134,4 @@ public class RequestActionUse extends ClientBasePacket } } } - - @Override - public String getType() - { - return _C__45_REQUESTACTIONUSE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java index 688da930cc..b6813ae8eb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java @@ -19,13 +19,14 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.File; import java.io.IOException; +import java.util.logging.Logger; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.AllyCrest; public class RequestAllyCrest extends ClientBasePacket { - private static final String _C__88_REQUESTALLYCREST = "[C] 88 RequestAllyCrest"; + final static Logger _log = Logger.getLogger(RequestAllyCrest.class.getName()); public RequestAllyCrest(byte[] rawPacket, ClientThread client) throws IOException { @@ -41,10 +42,4 @@ public class RequestAllyCrest extends ClientBasePacket _log.warning("allycrest file is missing:" + crestFile.getAbsolutePath()); } } - - @Override - public String getType() - { - return _C__88_REQUESTALLYCREST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java index 94ea0635b0..0a120115ca 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class RequestAnswerJoinParty extends ClientBasePacket { - private static final String _C__2A_REQUESTANSWERPARTY = "[C] 2A RequestAnswerParty"; - public RequestAnswerJoinParty(byte[] decrypt, ClientThread client) { super(decrypt); @@ -50,10 +48,4 @@ public class RequestAnswerJoinParty extends ClientBasePacket player.setTransactionRequester(null); requestor.setTransactionRequester(null); } - - @Override - public String getType() - { - return _C__2A_REQUESTANSWERPARTY; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 1f8600d7fd..092f451c9c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestAnswerJoinPledge extends ClientBasePacket { - private static final String _C__25_REQUESTANSWERJOINPLEDGE = "[C] 25 RequestAnswerJoinPledge"; - public RequestAnswerJoinPledge(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -71,10 +69,4 @@ public class RequestAnswerJoinPledge extends ClientBasePacket requestor.setTransactionRequester(null); activeChar.setTransactionRequester(null); } - - @Override - public String getType() - { - return _C__25_REQUESTANSWERJOINPLEDGE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index 5e9d4dcfb6..2cdfeffe3b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -35,8 +35,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class RequestAquireSkill extends ClientBasePacket { - private static final String _C__6C_REQUESTAQUIRESKILL = "[C] 6C RequestAquireSkill"; - public RequestAquireSkill(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -112,10 +110,4 @@ public class RequestAquireSkill extends ClientBasePacket } player.sendPacket(asl); } - - @Override - public String getType() - { - return _C__6C_REQUESTAQUIRESKILL; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index ef95eca65f..b0e4cd49f4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.AquireSkillInfo; public class RequestAquireSkillInfo extends ClientBasePacket { - private static final String _C__6B_REQUESTAQUIRESKILLINFO = "[C] 6B RequestAquireSkillInfo"; - public RequestAquireSkillInfo(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -49,10 +47,4 @@ public class RequestAquireSkillInfo extends ClientBasePacket } activeChar.sendPacket(new AquireSkillInfo(skill.getId(), skill.getLevel(), requiredSp)); } - - @Override - public String getType() - { - return _C__6B_REQUESTAQUIRESKILLINFO; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 10893f4c69..67529dc674 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.TradeController; import org.l2jmobius.gameserver.model.TradeList; @@ -31,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class RequestBuyItem extends ClientBasePacket { - private static final String _C__1F_REQUESTBUYITEM = "[C] 1F RequestBuyItem"; + final static Logger _log = Logger.getLogger(RequestBuyItem.class.getName()); public RequestBuyItem(byte[] decrypt, ClientThread client) { @@ -117,10 +119,4 @@ public class RequestBuyItem extends ClientBasePacket su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); player.sendPacket(su); } - - @Override - public String getType() - { - return _C__1F_REQUESTBUYITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 2d7715553e..e5961302f5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.AdminCommands; import org.l2jmobius.gameserver.managers.CommunityBoardManager; import org.l2jmobius.gameserver.model.World; @@ -27,7 +29,7 @@ import org.l2jmobius.gameserver.network.ClientThread; public class RequestBypassToServer extends ClientBasePacket { - private static final String _C__21_REQUESTBYPASSTOSERVER = "[C] 21 RequestBypassToServer"; + final static Logger _log = Logger.getLogger(RequestBypassToServer.class.getName()); public RequestBypassToServer(byte[] decrypt, ClientThread client) { @@ -41,7 +43,14 @@ public class RequestBypassToServer extends ClientBasePacket } else if (command.equals("come_here")) { - comeHere(client); + final WorldObject obj = client.getActiveChar().getTarget(); + if (obj instanceof NpcInstance) + { + final NpcInstance temp = (NpcInstance) obj; + final PlayerInstance player = client.getActiveChar(); + temp.setTarget(player); + temp.moveTo(player.getX(), player.getY(), player.getZ(), 0); + } } else if (command.startsWith("npc_")) { @@ -63,22 +72,4 @@ public class RequestBypassToServer extends ClientBasePacket _log.warning("Bad RequestBypassToServer: " + e.toString()); } } - - private void comeHere(ClientThread client) - { - final WorldObject obj = client.getActiveChar().getTarget(); - if (obj instanceof NpcInstance) - { - final NpcInstance temp = (NpcInstance) obj; - final PlayerInstance player = client.getActiveChar(); - temp.setTarget(player); - temp.moveTo(player.getX(), player.getY(), player.getZ(), 0); - } - } - - @Override - public String getType() - { - return _C__21_REQUESTBYPASSTOSERVER; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java index 9a5fe33b82..cf0e4bf363 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java @@ -17,28 +17,23 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; public class RequestChangePetName extends ClientBasePacket { - private static final String REQUESTCHANGEPETNAME__C__89 = "[C] 89 RequestChangePetName"; - public RequestChangePetName(byte[] decrypt, ClientThread client) { super(decrypt); - if ((client.getActiveChar().getPet() != null) && (client.getActiveChar().getPet().getName() == null)) + + final PlayerInstance activeChar = client.getActiveChar(); + if ((activeChar.getPet() != null) && (activeChar.getName() == null)) { - client.getActiveChar().getPet().setName(readS()); - client.getActiveChar().getPet().broadcastPacket(new NpcInfo(client.getActiveChar().getPet())); - client.getActiveChar().sendPacket(new PetInfo(client.getActiveChar().getPet())); + activeChar.getPet().setName(readS()); + activeChar.getPet().broadcastPacket(new NpcInfo(activeChar.getPet())); + activeChar.sendPacket(new PetInfo(activeChar.getPet())); } } - - @Override - public String getType() - { - return REQUESTCHANGEPETNAME__C__89; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index ac4d0b88d5..d23d35afd9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestDestroyItem extends ClientBasePacket { - private static final String _C__59_REQUESTDESTROYITEM = "[C] 59 RequestDestroyItem"; - public RequestDestroyItem(byte[] decrypt, ClientThread client) { super(decrypt); @@ -80,10 +78,4 @@ public class RequestDestroyItem extends ClientBasePacket final World world = World.getInstance(); world.removeObject(removedItem); } - - @Override - public String getType() - { - return _C__59_REQUESTDESTROYITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 12a87ae911..b7b25e2ec2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; @@ -29,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestDropItem extends ClientBasePacket { - private static final String _C__12_REQUESTDROPITEM = "[C] 12 RequestDropItem"; + final static Logger _log = Logger.getLogger(RequestDropItem.class.getName()); public RequestDropItem(byte[] decrypt, ClientThread client) { @@ -111,10 +113,4 @@ public class RequestDropItem extends ClientBasePacket activeChar.sendPacket(msg); } } - - @Override - public String getType() - { - return _C__12_REQUESTDROPITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java index df621044d6..106492ba42 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.GMViewPledgeInfo; public class RequestGMCommand extends ClientBasePacket { - private static final String _C__6E_REQUESTGMCOMMAND = "[C] 6e RequestGMCommand"; - public RequestGMCommand(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -71,10 +69,4 @@ public class RequestGMCommand extends ClientBasePacket } } } - - @Override - public String getType() - { - return _C__6E_REQUESTGMCOMMAND; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index bb734f3900..f4c4b12fbb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.network.ClientThread; @@ -25,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetInventoryUpdate; public class RequestGetItemFromPet extends ClientBasePacket { - private static final String REQUESTGETITEMFROMPET__C__8C = "[C] 8C RequestGetItemFromPet"; + final static Logger _log = Logger.getLogger(RequestGetItemFromPet.class.getName()); public RequestGetItemFromPet(byte[] decrypt, ClientThread client) { @@ -64,10 +66,4 @@ public class RequestGetItemFromPet extends ClientBasePacket client.getActiveChar().sendPacket(playerUI); } } - - @Override - public String getType() - { - return REQUESTGETITEMFROMPET__C__8C; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 4e9029c397..7da906bc15 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; public class RequestGiveItemToPet extends ClientBasePacket { - private static final String REQUESTGETITEMFROMPET__C__8C = "[C] 8C RequestGetItemFromPet"; - public RequestGiveItemToPet(byte[] decrypt, ClientThread client) { super(decrypt); @@ -56,10 +54,4 @@ public class RequestGiveItemToPet extends ClientBasePacket client.getActiveChar().sendPacket(playerUI); } } - - @Override - public String getType() - { - return REQUESTGETITEMFROMPET__C__8C; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java index d10f6d54d3..3352cc3aed 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestGiveNickName extends ClientBasePacket { - private static final String _C__55_REQUESTGIVENICKNAME = "[C] 55 RequestGiveNickName"; - public RequestGiveNickName(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -55,10 +53,4 @@ public class RequestGiveNickName extends ClientBasePacket } } } - - @Override - public String getType() - { - return _C__55_REQUESTGIVENICKNAME; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java index 9a1fba7dec..cbb0967b82 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java @@ -22,17 +22,9 @@ import org.l2jmobius.gameserver.network.ClientThread; public class RequestGmList extends ClientBasePacket { - private static final String _C__81_REQUESTGMLIST = "[C] 81 RequestGmList"; - public RequestGmList(byte[] decrypt, ClientThread client) { super(decrypt); GmListManager.getInstance().sendListToPlayer(client.getActiveChar()); } - - @Override - public String getType() - { - return _C__81_REQUESTGMLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java index 643ad5b953..c61944cbd8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java @@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ItemList; public class RequestItemList extends ClientBasePacket { - private static final String _C__0F_REQUESTITEMLIST = "[C] 0F RequestItemList"; - public RequestItemList(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -32,10 +30,4 @@ public class RequestItemList extends ClientBasePacket final PlayerInstance activeChar = client.getActiveChar(); activeChar.sendPacket(new ItemList(activeChar, true)); } - - @Override - public String getType() - { - return _C__0F_REQUESTITEMLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index bd52c97427..6a053ddfb4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -26,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class RequestJoinParty extends ClientBasePacket { - private static final String _C__29_REQUESTJOINPARTY = "[C] 29 RequestJoinParty"; + final static Logger _log = Logger.getLogger(RequestJoinParty.class.getName()); public RequestJoinParty(byte[] decrypt, ClientThread client) { @@ -123,10 +125,4 @@ public class RequestJoinParty extends ClientBasePacket _log.warning(client.getActiveChar().getName() + " invited someone who doesn't know him."); } } - - @Override - public String getType() - { - return _C__29_REQUESTJOINPARTY; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java index 117e45c1f7..4e07aadcc2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class RequestJoinPledge extends ClientBasePacket { - private static final String _C__24_REQUESTJOINPLEDGE = "[C] 24 RequestJoinPledge"; - public RequestJoinPledge(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -69,10 +67,4 @@ public class RequestJoinPledge extends ClientBasePacket member.sendPacket(ap); } } - - @Override - public String getType() - { - return _C__24_REQUESTJOINPLEDGE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 49d34c49ff..a04f4bbca0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -24,7 +26,7 @@ import org.l2jmobius.gameserver.network.ClientThread; public class RequestMagicSkillUse extends ClientBasePacket { - private static final String _C__2F_REQUESTMAGICSKILLUSE = "[C] 2F RequestMagicSkillUse"; + final static Logger _log = Logger.getLogger(RequestMagicSkillUse.class.getName()); public RequestMagicSkillUse(byte[] rawPacket, ClientThread client) { @@ -48,10 +50,4 @@ public class RequestMagicSkillUse extends ClientBasePacket _log.warning(activeChar + " tried to cast skill " + magicId); } } - - @Override - public String getType() - { - return _C__2F_REQUESTMAGICSKILLUSE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java index 7c385c9f66..4c8c37cb51 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java @@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.ClientThread; public class RequestOustPartyMember extends ClientBasePacket { - private static final String _C__2C_REQUESTOUSTPARTYMEMBER = "[C] 2C RequestOustPartyMember"; - public RequestOustPartyMember(byte[] decrypt, ClientThread client) { super(decrypt); @@ -34,10 +32,4 @@ public class RequestOustPartyMember extends ClientBasePacket activeChar.getParty().oustPartyMember(name); } } - - @Override - public String getType() - { - return _C__2C_REQUESTOUSTPARTYMEMBER; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 4e306e9a62..2b3c0218e9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.ClanMember; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestOustPledgeMember extends ClientBasePacket { - private static final String _C__27_REQUESTOUSTPLEDGEMEMBER = "[C] 27 RequestOustPledgeMember"; + final static Logger _log = Logger.getLogger(RequestOustPledgeMember.class.getName()); public RequestOustPledgeMember(byte[] rawPacket, ClientThread client) { @@ -66,10 +68,4 @@ public class RequestOustPledgeMember extends ClientBasePacket player.sendPacket(new PledgeShowMemberListDeleteAll()); } } - - @Override - public String getType() - { - return _C__27_REQUESTOUSTPLEDGEMEMBER; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java index 454278dab3..4176262beb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java @@ -21,8 +21,6 @@ import org.l2jmobius.gameserver.network.ClientThread; public class RequestPartyMatchConfig extends ClientBasePacket { - private static final String _C__6F_REQUESTPARTYMATCHCONFIG = "[C] 6F RequestPartyMatchConfig"; - public RequestPartyMatchConfig(byte[] decrypt, ClientThread client) { super(decrypt); @@ -35,10 +33,4 @@ public class RequestPartyMatchConfig extends ClientBasePacket client.getActiveChar().setPartyMatchingShowClass(showClass == 1); client.getActiveChar().setPartyMatchingMemo(memo); } - - @Override - public String getType() - { - return _C__6F_REQUESTPARTYMATCHCONFIG; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java index 3eb52e3d2a..c105215eae 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail; public class RequestPartyMatchDetail extends ClientBasePacket { - private static final String _C__71_REQUESTPARTYMATCHDETAIL = "[C] 71 RequestPartyMatchDetail"; - public RequestPartyMatchDetail(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); @@ -36,10 +34,4 @@ public class RequestPartyMatchDetail extends ClientBasePacket final PartyMatchDetail details = new PartyMatchDetail(player); client.getConnection().sendPacket(details); } - - @Override - public String getType() - { - return _C__71_REQUESTPARTYMATCHDETAIL; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index 7bf18ea48f..20718a8384 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyMatchList; public class RequestPartyMatchList extends ClientBasePacket { - private static final String _C__70_REQUESTPARTYMATCHLIST = "[C] 70 RequestPartyMatchList"; - public RequestPartyMatchList(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); @@ -45,10 +43,4 @@ public class RequestPartyMatchList extends ClientBasePacket // _log.fine("Party match status: " + status); // } } - - @Override - public String getType() - { - return _C__70_REQUESTPARTYMATCHLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index d982d74193..8db9371641 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -24,22 +24,14 @@ import org.l2jmobius.gameserver.network.ClientThread; public class RequestPetGetItem extends ClientBasePacket { - private static final String _C__8f_REQUESTPETGETITEM = "[C] 8F RequestPetGetItem"; - public RequestPetGetItem(byte[] decrypt, ClientThread client) { super(decrypt); final int objectId = readD(); - final World world = World.getInstance(); - final ItemInstance item = (ItemInstance) world.findObject(objectId); + + final ItemInstance item = (ItemInstance) World.getInstance().findObject(objectId); client.getActiveChar().getPet().setTarget(item); client.getActiveChar().getPet().setCurrentState(CreatureState.PICKUP_ITEM); client.getActiveChar().getPet().moveTo(item.getX(), item.getY(), item.getZ(), 0); } - - @Override - public String getType() - { - return _C__8f_REQUESTPETGETITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java index 45c4077819..94d78a8187 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java @@ -19,13 +19,14 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.File; import java.io.IOException; +import java.util.logging.Logger; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest; public class RequestPledgeCrest extends ClientBasePacket { - private static final String _C__68_REQUESTPLEDGECREST = "[C] 68 RequestPledgeCrest"; + final static Logger _log = Logger.getLogger(RequestPledgeCrest.class.getName()); public RequestPledgeCrest(byte[] rawPacket, ClientThread client) throws IOException { @@ -42,10 +43,4 @@ public class RequestPledgeCrest extends ClientBasePacket _log.warning("crest file is missing:" + crestFile.getAbsolutePath()); } } - - @Override - public String getType() - { - return _C__68_REQUESTPLEDGECREST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 2f9b8ef29c..365cf584be 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.data.ClanTable; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -26,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; public class RequestPledgeInfo extends ClientBasePacket { - private static final String _C__66_REQUESTPLEDGEINFO = "[C] 66 RequestPledgeInfo"; + final static Logger _log = Logger.getLogger(RequestPledgeInfo.class.getName()); public RequestPledgeInfo(byte[] rawPacket, ClientThread client) { @@ -47,10 +49,4 @@ public class RequestPledgeInfo extends ClientBasePacket activeChar.sendPacket(pm); } } - - @Override - public String getType() - { - return _C__66_REQUESTPLEDGEINFO; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java index 4f7322f84f..bb23e3c82f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; public class RequestPledgeMemberList extends ClientBasePacket { - private static final String _C__3C_REQUESTPLEDGEMEMBERLIST = "[C] 3C RequestPledgeMemberList"; - public RequestPledgeMemberList(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -37,10 +35,4 @@ public class RequestPledgeMemberList extends ClientBasePacket activeChar.sendPacket(pm); } } - - @Override - public String getType() - { - return _C__3C_REQUESTPLEDGEMEMBERLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java index b15d666580..021763b867 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PrivateSellListBuy; public class RequestPrivateStoreBuyManage extends ClientBasePacket { - private static final String _C__90_REQUESTPRIVATESTOREBUYMANAGE = "[C] 90 RequestPrivateStoreBuyManage"; - public RequestPrivateStoreBuyManage(byte[] decrypt, ClientThread client) { super(decrypt); @@ -62,10 +60,4 @@ public class RequestPrivateStoreBuyManage extends ClientBasePacket player.broadcastPacket(new ChangeWaitType(player, 1)); } } - - @Override - public String getType() - { - return _C__90_REQUESTPRIVATESTOREBUYMANAGE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java index 4f1a1605d5..f5a75b437f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestPrivateStoreManage extends ClientBasePacket { - private static final String _C__73_REQUESTPRIVATESTOREMANAGE = "[C] 73 RequestPrivateStoreManage"; - public RequestPrivateStoreManage(byte[] decrypt, ClientThread client) { super(decrypt); @@ -65,10 +63,4 @@ public class RequestPrivateStoreManage extends ClientBasePacket player.broadcastPacket(new ChangeWaitType(player, 1)); } } - - @Override - public String getType() - { - return _C__73_REQUESTPRIVATESTOREMANAGE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java index 902d3ddcfc..88ddb4c79c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java @@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestPrivateStoreQuitBuy extends ClientBasePacket { - private static final String _C__93_REQUESTPRIVATESTOREQUITBUY = "[C] 93 RequestPrivateStoreQuitBuy"; - public RequestPrivateStoreQuitBuy(byte[] decrypt, ClientThread client) { super(decrypt); @@ -33,10 +31,4 @@ public class RequestPrivateStoreQuitBuy extends ClientBasePacket player.sendPacket(new UserInfo(player)); player.broadcastPacket(new UserInfo(player)); } - - @Override - public String getType() - { - return _C__93_REQUESTPRIVATESTOREQUITBUY; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java index 2040f8760e..bd773887c2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java @@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestPrivateStoreQuitSell extends ClientBasePacket { - private static final String _C__76_REQUESTPRIVATESTOREQUITSELL = "[C] 76 RequestPrivateStoreQuitSell"; - public RequestPrivateStoreQuitSell(byte[] decrypt, ClientThread client) { super(decrypt); @@ -33,10 +31,4 @@ public class RequestPrivateStoreQuitSell extends ClientBasePacket player.sendPacket(new UserInfo(player)); player.broadcastPacket(new UserInfo(player)); } - - @Override - public String getType() - { - return _C__76_REQUESTPRIVATESTOREQUITSELL; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java index 6efb41400d..0ca0b2f63e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java @@ -24,17 +24,9 @@ import org.l2jmobius.gameserver.network.serverpackets.QuestList; public class RequestQuestList extends ClientBasePacket { - private static final String _C__63_REQUESTQUESTLIST = "[C] 63 RequestQuestList"; - public RequestQuestList(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); client.getConnection().sendPacket(new QuestList()); } - - @Override - public String getType() - { - return _C__63_REQUESTQUESTLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 29cad479fb..c17432d39f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RestartResponse; public class RequestRestart extends ClientBasePacket { - private static final String _C__46_REQUESTRESTART = "[C] 46 RequestRestart"; - public RequestRestart(byte[] decrypt, ClientThread client) { super(decrypt); @@ -54,10 +52,4 @@ public class RequestRestart extends ClientBasePacket client.setActiveChar(null); } } - - @Override - public String getType() - { - return _C__46_REQUESTRESTART; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 466d0475ae..dda99fb8dd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMove; public class RequestRestartPoint extends ClientBasePacket { - private static final String _C__6d_REQUESTRESTARTPOINT = "[C] 6d RequestRestartPoint"; - public RequestRestartPoint(byte[] decrypt, ClientThread client) { super(decrypt); @@ -50,10 +48,4 @@ public class RequestRestartPoint extends ClientBasePacket activeChar.broadcastPacket(revive); activeChar.setTarget(activeChar); } - - @Override - public String getType() - { - return _C__6d_REQUESTRESTARTPOINT; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9e87ed4525..c22b5ebcd2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; public class RequestSellItem extends ClientBasePacket { - private static final String _C__1E_REQUESTSELLITEM = "[C] 1E RequestSellItem"; - public RequestSellItem(byte[] decrypt, ClientThread client) { super(decrypt); @@ -51,10 +49,4 @@ public class RequestSellItem extends ClientBasePacket su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad()); activeChar.sendPacket(su); } - - @Override - public String getType() - { - return _C__1E_REQUESTSELLITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7d213bd509..89ede05ca1 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestSetPledgeCrest extends ClientBasePacket { - private static final String _C__53_REQUESTSETPLEDGECREST = "[C] 53 RequestSetPledgeCrest"; - public RequestSetPledgeCrest(byte[] rawPacket, ClientThread client) throws IOException { super(rawPacket); @@ -52,10 +50,4 @@ public class RequestSetPledgeCrest extends ClientBasePacket final CharInfo ci = new CharInfo(activeChar); activeChar.broadcastPacket(ci); } - - @Override - public String getType() - { - return _C__53_REQUESTSETPLEDGECREST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java index 1a79a8e9d5..ae79aaeb05 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java @@ -17,25 +17,14 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; public class RequestShortCutDel extends ClientBasePacket { - private static final String _C__35_REQUESTSHORTCUTDEL = "[C] 35 RequestShortCutDel"; - public RequestShortCutDel(byte[] rawPacket, ClientThread client) { super(rawPacket); - final PlayerInstance activeChar = client.getActiveChar(); - // Connection con = client.getConnection(); final int slot = readD(); - activeChar.deleteShortCut(slot); - } - - @Override - public String getType() - { - return _C__35_REQUESTSHORTCUTDEL; + client.getActiveChar().deleteShortCut(slot); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java index 53bf6495fa..acfa20514e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class RequestShortCutReg extends ClientBasePacket { - private static final String _C__33_REQUESTSHORTCUTREG = "[C] 33 RequestShortCutReg"; - public RequestShortCutReg(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -57,10 +55,4 @@ public class RequestShortCutReg extends ClientBasePacket } } } - - @Override - public String getType() - { - return _C__33_REQUESTSHORTCUTREG; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java index ffbab9b4d9..69505b2c57 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java @@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.ClientThread; public class RequestShowBoard extends ClientBasePacket { - private static final String _C__57_REQUESTSHOWBOARD = "[C] 57 RequestShowBoard"; - public RequestShowBoard(byte[] decrypt, ClientThread client) { super(decrypt); @@ -31,10 +29,4 @@ public class RequestShowBoard extends ClientBasePacket final int unknown = readD(); CommunityBoardManager.getInstance().handleCommands(client, "bbs_default"); } - - @Override - public String getType() - { - return _C__57_REQUESTSHOWBOARD; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java index eff71261f0..25d8cfc8d3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SkillList; public class RequestSkillList extends ClientBasePacket { - private static final String _C__3F_REQUESTSKILLLIST = "[C] 3F RequestSkillList"; - public RequestSkillList(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -37,10 +35,4 @@ public class RequestSkillList extends ClientBasePacket } activeChar.sendPacket(response); } - - @Override - public String getType() - { - return _C__3F_REQUESTSKILLLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java index 74606557e8..da11e4fddf 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class RequestSocialAction extends ClientBasePacket { - private static final String _C__1B_REQUESTSOCIALACTION = "[C] 1B RequestSocialAction"; - public RequestSocialAction(byte[] decrypt, ClientThread client) { super(decrypt); @@ -38,10 +36,4 @@ public class RequestSocialAction extends ClientBasePacket activeChar.broadcastPacket(atk); } } - - @Override - public String getType() - { - return _C__1B_REQUESTSOCIALACTION; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java index 6acc06a117..44cf90757b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java @@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected; public class RequestTargetCanceld extends ClientBasePacket { - private static final String _C__37_REQUESTTARGETCANCELD = "[C] 37 RequestTargetCanceld"; - public RequestTargetCanceld(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -35,10 +33,4 @@ public class RequestTargetCanceld extends ClientBasePacket activeChar.setTarget(null); } } - - @Override - public String getType() - { - return _C__37_REQUESTTARGETCANCELD; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 8ee9c2264e..a5a51b893b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestUnEquipItem extends ClientBasePacket { - private static final String _C__11_REQUESTUNEQUIPITEM = "[C] 11 RequestUnequipItem"; - public RequestUnEquipItem(byte[] decrypt, ClientThread client) { super(decrypt); @@ -59,10 +57,4 @@ public class RequestUnEquipItem extends ClientBasePacket activeChar.sendPacket(sm); } } - - @Override - public String getType() - { - return _C__11_REQUESTUNEQUIPITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java index a38dc9b327..a73311e1b4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java @@ -18,23 +18,18 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestWithDrawalParty extends ClientBasePacket { - private static final String _C__2B_REQUESTWITHDRAWALPARTY = "[C] 2B RequestWithDrawalParty"; - - public RequestWithDrawalParty(byte[] decrypt, PlayerInstance player) + public RequestWithDrawalParty(byte[] decrypt, ClientThread client) { super(decrypt); - if (player.isInParty()) + + final PlayerInstance player = client.getActiveChar(); + if ((player != null) && player.isInParty()) { player.getParty().oustPartyMember(player); } } - - @Override - public String getType() - { - return _C__2B_REQUESTWITHDRAWALPARTY; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 219a2272a1..21fdcc223d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestWithdrawalPledge extends ClientBasePacket { - private static final String _C__26_REQUESTWITHDRAWALPLEDGE = "[C] 26 RequestWithdrawalPledge"; - public RequestWithdrawalPledge(byte[] rawPacket, ClientThread client) { super(rawPacket); @@ -52,10 +50,4 @@ public class RequestWithdrawalPledge extends ClientBasePacket player.broadcastPacket(new CharInfo(player)); player.sendPacket(new PledgeShowMemberListDeleteAll()); } - - @Override - public String getType() - { - return _C__26_REQUESTWITHDRAWALPLEDGE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 517a2fbb9f..79b2293eb9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Say2 extends ClientBasePacket { - private static final String _C__38_SAY2 = "[C] 38 Say2"; - public static final int ALL = 0; public static final int SHOUT = 1; public static final int TELL = 2; @@ -90,10 +88,4 @@ public class Say2 extends ClientBasePacket activeChar.getParty().broadcastToPartyMembers(cs); } } - - @Override - public String getType() - { - return _C__38_SAY2; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index e093a7de8c..358ebf39bd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; public class SendBypassBuildCmd extends ClientBasePacket { - private static final String _C__5B_SENDBYPASSBUILDCMD = "[C] 5b SendBypassBuildCmd"; public static final int GM_MESSAGE = 9; public static final int ANNOUNCEMENT = 10; @@ -83,10 +82,4 @@ public class SendBypassBuildCmd extends ClientBasePacket } } } - - @Override - public String getType() - { - return _C__5B_SENDBYPASSBUILDCMD; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java index 6469b30fcb..35804866f8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class SendPrivateStoreBuyBuyList extends ClientBasePacket { - private static final String _C__96_SENDPRIVATESTOREBUYBUYLIST = "[C] 96 SendPrivateStoreBuyBuyList"; - public SendPrivateStoreBuyBuyList(byte[] decrypt, ClientThread client) { super(decrypt); @@ -71,10 +69,4 @@ public class SendPrivateStoreBuyBuyList extends ClientBasePacket buyer.getTradeList().updateBuyList(buyer, buyerlist); } } - - @Override - public String getType() - { - return _C__96_SENDPRIVATESTOREBUYBUYLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java index 5cb6d20567..a00cbf464e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class SendPrivateStoreBuyList extends ClientBasePacket { - private static final String _C__79_SENDPRIVATESTOREBUYLIST = "[C] 79 SendPrivateStoreBuyList"; - public SendPrivateStoreBuyList(byte[] decrypt, ClientThread client) { super(decrypt); @@ -71,10 +69,4 @@ public class SendPrivateStoreBuyList extends ClientBasePacket buyer.sendPacket(msg); } } - - @Override - public String getType() - { - return _C__79_SENDPRIVATESTOREBUYLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 67e8c03f4b..7fca7edb73 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SendWareHouseDepositList extends ClientBasePacket { - private static final String _C__31_SENDWAREHOUSEDEPOSITLIST = "[C] 31 SendWareHouseDepositList"; - public SendWareHouseDepositList(byte[] decrypt, ClientThread client) { super(decrypt); @@ -65,10 +63,4 @@ public class SendWareHouseDepositList extends ClientBasePacket activeChar.reduceAdena(neededMoney); activeChar.sendPacket(new ItemList(activeChar, false)); } - - @Override - public String getType() - { - return _C__31_SENDWAREHOUSEDEPOSITLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 520f1789eb..544b9de58e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SendWareHouseWithDrawList extends ClientBasePacket { - private static final String _C__32_SENDWAREHOUSEWITHDRAWLIST = "[C] 32 SendWareHouseWithDrawList"; - public SendWareHouseWithDrawList(byte[] decrypt, ClientThread client) { super(decrypt); @@ -70,10 +68,4 @@ public class SendWareHouseWithDrawList extends ClientBasePacket activeChar.sendPacket(sm); } } - - @Override - public String getType() - { - return _C__32_SENDWAREHOUSEWITHDRAWLIST; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 0bf034bee3..cf530be876 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class SetPrivateStoreListBuy extends ClientBasePacket { - private static final String _C__91_SETPRIVATESTORELISTBUY = "[C] 91 SetPrivateStoreListSell"; - public SetPrivateStoreListBuy(byte[] decrypt, ClientThread client) { super(decrypt); @@ -88,10 +86,4 @@ public class SetPrivateStoreListBuy extends ClientBasePacket player.broadcastPacket(new UserInfo(player)); } } - - @Override - public String getType() - { - return _C__91_SETPRIVATESTORELISTBUY; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index 18f3921736..d9b7a777bb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class SetPrivateStoreListSell extends ClientBasePacket { - private static final String _C__74_SETPRIVATESTORELISTSELL = "[C] 74 SetPrivateStoreListSell"; - public SetPrivateStoreListSell(byte[] decrypt, ClientThread client) { super(decrypt); @@ -69,10 +67,4 @@ public class SetPrivateStoreListSell extends ClientBasePacket player.broadcastPacket(new UserInfo(player)); } } - - @Override - public String getType() - { - return _C__74_SETPRIVATESTORELISTSELL; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index cdb95b338a..14a0107a95 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -17,24 +17,14 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; public class SetPrivateStoreMsgBuy extends ClientBasePacket { - private static final String _C__94_SETPRIVATESTOREMSGBUY = "[C] 94 SetPrivateStoreMsgBuy"; - public SetPrivateStoreMsgBuy(byte[] decrypt, ClientThread client) { super(decrypt); final String storename = readS(); - final PlayerInstance player = client.getActiveChar(); - player.getTradeList().setBuyStoreName(storename); - } - - @Override - public String getType() - { - return _C__94_SETPRIVATESTOREMSGBUY; + client.getActiveChar().getTradeList().setBuyStoreName(storename); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index 23f0b5e58a..d094108c04 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -17,24 +17,14 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; public class SetPrivateStoreMsgSell extends ClientBasePacket { - private static final String _C__77_SETPRIVATESTOREMSGSELL = "[C] 77 SetPrivateStoreMsgSell"; - public SetPrivateStoreMsgSell(byte[] decrypt, ClientThread client) { super(decrypt); final String storename = readS(); - final PlayerInstance player = client.getActiveChar(); - player.getTradeList().setSellStoreName(storename); - } - - @Override - public String getType() - { - return _C__77_SETPRIVATESTOREMSGSELL; + client.getActiveChar().getTradeList().setSellStoreName(storename); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java index b17eaeeea7..5b9da5d34a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java @@ -17,26 +17,21 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.BeginRotation; public class StartRotating extends ClientBasePacket { - private static final String _C__4A_STARTROTATING = "[C] 4A StartRotating"; - public StartRotating(byte[] decrypt, ClientThread client) { super(decrypt); final int degree = readD(); final int side = readD(); - final BeginRotation br = new BeginRotation(client.getActiveChar(), degree, side); - client.getActiveChar().sendPacket(br); - client.getActiveChar().broadcastPacket(br); - } - - @Override - public String getType() - { - return _C__4A_STARTROTATING; + + final PlayerInstance activeChar = client.getActiveChar(); + final BeginRotation br = new BeginRotation(activeChar, degree, side); + activeChar.sendPacket(br); + activeChar.broadcastPacket(br); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java index dc869bd70a..3d9330c931 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StopRotation; public class StopMove extends ClientBasePacket { - private static final String _C__36_STOPMOVE = "[C] 36 StopMove"; - public StopMove(byte[] decrypt, ClientThread client) { super(decrypt); @@ -46,10 +44,4 @@ public class StopMove extends ClientBasePacket client.getActiveChar().sendPacket(sr); client.getActiveChar().broadcastPacket(sr); } - - @Override - public String getType() - { - return _C__36_STOPMOVE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java index f4765cf1dd..9264e99809 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class TradeDone extends ClientBasePacket { - private static final String _C__17_TRADEDONE = "[C] 17 TradeDone"; - public TradeDone(byte[] decrypt, ClientThread client) { super(decrypt); @@ -81,10 +79,4 @@ public class TradeDone extends ClientBasePacket player.setTradeList(null); } } - - @Override - public String getType() - { - return _C__17_TRADEDONE; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 39fef08918..64529a421c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.logging.Logger; + import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -26,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class TradeRequest extends ClientBasePacket { - private static final String TRADEREQUEST__C__15 = "[C] 15 TradeRequest"; + final static Logger _log = Logger.getLogger(TradeRequest.class.getName()); public TradeRequest(byte[] decrypt, ClientThread client) { @@ -63,10 +65,4 @@ public class TradeRequest extends ClientBasePacket _log.info("transaction already in progress."); } } - - @Override - public String getType() - { - return TRADEREQUEST__C__15; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 041b96c279..ec0b362fa1 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.List; +import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; @@ -31,12 +32,13 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class UseItem extends ClientBasePacket { - private static final String _C__14_USEITEM = "[C] 14 UseItem"; + final static Logger _log = Logger.getLogger(UseItem.class.getName()); public UseItem(byte[] decrypt, ClientThread client) { super(decrypt); final int objectId = readD(); + final PlayerInstance activeChar = client.getActiveChar(); final ItemInstance item = activeChar.getInventory().getItem(objectId); if ((item != null) && item.isEquipable() && !activeChar.isInCombat()) @@ -78,30 +80,19 @@ public class UseItem extends ClientBasePacket final int count = handler.useItem(activeChar, item); if (count > 0) { - removeItemFromInventory(activeChar, item, count); + final ItemInstance itemInstance = activeChar.getInventory().destroyItem(item.getObjectId(), count); + final InventoryUpdate iu = new InventoryUpdate(); + if (itemInstance.getCount() == 0) + { + iu.addRemovedItem(itemInstance); + } + else + { + iu.addModifiedItem(itemInstance); + } + activeChar.sendPacket(iu); } } } } - - private void removeItemFromInventory(PlayerInstance activeChar, ItemInstance item, int count) - { - final ItemInstance item2 = activeChar.getInventory().destroyItem(item.getObjectId(), count); - final InventoryUpdate iu = new InventoryUpdate(); - if (item2.getCount() == 0) - { - iu.addRemovedItem(item2); - } - else - { - iu.addModifiedItem(item2); - } - activeChar.sendPacket(iu); - } - - @Override - public String getType() - { - return _C__14_USEITEM; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index 3ae0206c30..7933c05a53 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.ClientThread; public class ValidatePosition extends ClientBasePacket { - private static final String _C__48_VALIDATEPOSITION = "[C] 48 ValidatePosition"; - public ValidatePosition(byte[] decrypt, ClientThread client) { super(decrypt); @@ -99,10 +97,4 @@ public class ValidatePosition extends ClientBasePacket final long dY = a.getY() - b.getY(); return (dX * dX) + (dY * dY); } - - @Override - public String getType() - { - return _C__48_VALIDATEPOSITION; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 3a351983e1..c267d1dc74 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class ActionFailed extends ServerBasePacket { - private static final String _S__35_ACTIONFAILED = "[S] 35 ActionFailed"; - @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(53); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__35_ACTIONFAILED; + writeC(0x35); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index 79f55ceb0d..f8a013b5d8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -22,7 +22,6 @@ import java.io.FileInputStream; public class AllyCrest extends ServerBasePacket { - private static final String _S__C7_ALLYCREST = "[S] C7 AllyCrest"; private final File _crestFile; private final int _crestId; @@ -33,9 +32,9 @@ public class AllyCrest extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(199); + writeC(0xC7); writeD(_crestId); try { @@ -54,12 +53,5 @@ public class AllyCrest extends ServerBasePacket { e.printStackTrace(); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__C7_ALLYCREST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java index 26d0319c07..699427b435 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java @@ -21,7 +21,6 @@ import java.util.Vector; public class AquireSkillInfo extends ServerBasePacket { - private static final String _S__A4_AQUIRESKILLINFO = "[S] A4 AquireSkillInfo"; private final Vector _reqs = new Vector<>(); private final int _id; private final int _level; @@ -40,9 +39,9 @@ public class AquireSkillInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(164); + writeC(0xA4); writeD(_id); writeD(_level); writeD(_spCost); @@ -55,13 +54,6 @@ public class AquireSkillInfo extends ServerBasePacket writeD(temp.count); writeD(temp.unk); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__A4_AQUIRESKILLINFO; } class Req @@ -79,5 +71,4 @@ public class AquireSkillInfo extends ServerBasePacket this.unk = unk; } } - } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java index 801243a6f1..0ee63d8614 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java @@ -21,7 +21,6 @@ import java.util.Vector; public class AquireSkillList extends ServerBasePacket { - private static final String _S__A3_AQUIRESKILLLIST = "[S] A3 AquireSkillList"; private final Vector _skills = new Vector<>(); public void addSkill(int id, int nextLevel, int maxLevel, int spCost, int requirements) @@ -30,9 +29,9 @@ public class AquireSkillList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(163); + writeC(0xA3); writeD(_skills.size()); for (int i = 0; i < _skills.size(); ++i) { @@ -43,13 +42,6 @@ public class AquireSkillList extends ServerBasePacket writeD(temp.spCost); writeD(temp.requirements); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__A3_AQUIRESKILLLIST; } class Skill @@ -69,5 +61,4 @@ public class AquireSkillList extends ServerBasePacket this.requirements = requirements; } } - } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index 9832a51911..5881686ed8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class AskJoinParty extends ServerBasePacket { - private static final String _S__4B_ASKJOINPARTY_0X4B = "[S] 4B AskJoinParty 0x4b"; private final int _requestorId; private final int _itemDistribution; @@ -30,17 +29,10 @@ public class AskJoinParty extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(75); + writeC(0x4B); writeD(_requestorId); writeD(_itemDistribution); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__4B_ASKJOINPARTY_0X4B; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java index 854f78193f..28feb5d9b4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class AskJoinPledge extends ServerBasePacket { - private static final String _S__44_ASKJOINPLEDGE = "[S] 44 AskJoinPledge"; private final int _requestorId; private final String _pledgeName; @@ -30,17 +29,10 @@ public class AskJoinPledge extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(68); + writeC(0x44); writeD(_requestorId); writeS(_pledgeName); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__44_ASKJOINPLEDGE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 60a1d7e6eb..a57fa9c784 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class Attack extends ServerBasePacket { - private static final String _S__06_ATTACK = "[S] 06 Attack"; private final int _attackerId; private final int _defenderId; private final int _damage; @@ -44,9 +43,9 @@ public class Attack extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(6); + writeC(0x06); writeD(_attackerId); writeD(_defenderId); writeD(_damage); @@ -68,12 +67,5 @@ public class Attack extends ServerBasePacket writeD(_y); writeD(_z); writeH(0); - return getBytes(); - } - - @Override - public String getType() - { - return _S__06_ATTACK; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AttackCanceld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AttackCanceld.java index 60d5ee6dc5..a12d3b0dd4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AttackCanceld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AttackCanceld.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class AttackCanceld extends ServerBasePacket { - private static final String _S__0A_MAGICSKILLCANCELD = "[S] 0a AttackCanceld"; private final int _objectId; public AttackCanceld(int objectId) @@ -28,16 +27,9 @@ public class AttackCanceld extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(10); + writeC(0x0A); writeD(_objectId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__0A_MAGICSKILLCANCELD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java index 8f8cf5e635..48f51a1058 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class AuthLoginFail extends ServerBasePacket { - private static final String _S__12_AUTHLOGINFAIL = "[S] 12 AuthLoginFail"; public static int NO_TEXT = 0; public static int SYSTEM_ERROR_LOGIN_LATER = 1; public static int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT = 2; @@ -39,16 +38,9 @@ public class AuthLoginFail extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(18); + writeC(0x12); writeD(_reason); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__12_AUTHLOGINFAIL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index 779ac83d15..67d3fc52c4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class AutoAttackStart extends ServerBasePacket { - private static final String _S__3B_AUTOATTACKSTART = "[S] 3B AutoAttackStart"; private final int _targetId; public AutoAttackStart(int targetId) @@ -28,16 +27,9 @@ public class AutoAttackStart extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(59); + writeC(0x3B); writeD(_targetId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__3B_AUTOATTACKSTART; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index c92c412c0e..75bba20f39 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class AutoAttackStop extends ServerBasePacket { - private static final String _S__3C_AUTOATTACKSTOP = "[S] 3C AutoAttackStop"; private final int _targetId; public AutoAttackStop(int targetId) @@ -28,16 +27,9 @@ public class AutoAttackStop extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(60); + writeC(0x3C); writeD(_targetId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__3C_AUTOATTACKSTOP; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BeginRotation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BeginRotation.java index 1f7a981b3a..c27c42d26e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BeginRotation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BeginRotation.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class BeginRotation extends ServerBasePacket { - private static final String _S__77_BEGINROTATION = "[S] 77 BeginRotation"; private final PlayerInstance _char; private final int _degree; private final int _side; @@ -34,18 +33,11 @@ public class BeginRotation extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(119); + writeC(0x77); writeD(_char.getObjectId()); writeD(_degree); writeD(_side); - return getBytes(); - } - - @Override - public String getType() - { - return _S__77_BEGINROTATION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index 5847308086..c97533dbf9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class BuyList extends ServerBasePacket { - private static final String _S__1D_BUYLIST = "[S] 1D BuyList"; private final TradeList _list; private final int _money; @@ -35,9 +34,9 @@ public class BuyList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(29); + writeC(0x1D); writeD(_money); writeD(_list.getListId()); final int count = _list.getItems().size(); @@ -62,12 +61,5 @@ public class BuyList extends ServerBasePacket } writeD(temp.getPrice()); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__1D_BUYLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 78266be8f3..b5783d0bfd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class ChangeMoveType extends ServerBasePacket { - private static final String _S__3E_CHANGEMOVETYPE = "[S] 3E ChangeMoveType"; public static int WALK = 0; public static int RUN = 1; + private final Creature _cha; private final int _moveType; @@ -34,17 +34,10 @@ public class ChangeMoveType extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(62); + writeC(0x3E); writeD(_cha.getObjectId()); writeD(_moveType); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__3E_CHANGEMOVETYPE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index e599e5a80d..83b7f43502 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class ChangeWaitType extends ServerBasePacket { - private static final String _S__3F_CHANGEWAITTYPE = "[S] 3F ChangeWaitType"; private final Creature _cha; private final int _moveType; @@ -32,20 +31,13 @@ public class ChangeWaitType extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(63); + writeC(0x3F); writeD(_cha.getObjectId()); writeD(_moveType); writeD(_cha.getX()); writeD(_cha.getY()); writeD(_cha.getZ()); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__3F_CHANGEWAITTYPE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 4b397399e2..93e3dc934b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets; public class CharCreateFail extends ServerBasePacket { - private static final String _S__26_CHARCREATEFAIL = "[S] 26 CharCreateFail"; public static int REASON_CREATION_FAILED = 0; public static int REASON_TOO_MANY_CHARACTERS = 1; public static int REASON_NAME_ALREADY_EXISTS = 2; public static int REASON_16_ENG_CHARS = 3; + private final int _error; public CharCreateFail(int errorCode) @@ -32,16 +32,9 @@ public class CharCreateFail extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(38); + writeC(0x26); writeD(_error); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__26_CHARCREATEFAIL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index 6317ae486f..7b952748d6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -19,19 +19,10 @@ package org.l2jmobius.gameserver.network.serverpackets; public class CharCreateOk extends ServerBasePacket { - private static final String _S__25_CHARCREATEOK = "[S] 25 CharCreateOk"; - @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(37); + writeC(0x25); writeD(1); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__25_CHARCREATEOK; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index 4e5bb2f14c..0b50779d2c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class CharDeleteFail extends ServerBasePacket { - private static final String _S__34_CHARDELETEFAIL = "[S] 34 CharDeleteFail"; - @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(52); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__34_CHARDELETEFAIL; + writeC(0x34); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteOk.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteOk.java index a001046129..10d6dbc60b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteOk.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteOk.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class CharDeleteOk extends ServerBasePacket { - private static final String _S__33_CHARDELETEOK = "[S] 33 CharDeleteOk"; - @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(51); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__33_CHARDELETEOK; + writeC(0x33); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 63f4c4230b..143667e475 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class CharInfo extends ServerBasePacket { - private static final String _S__03_CHARINFO = "[S] 03 CharInfo"; private final PlayerInstance _cha; public CharInfo(PlayerInstance cha) @@ -31,7 +30,7 @@ public class CharInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { writeC(0x03); writeD(_cha.getX()); @@ -103,12 +102,5 @@ public class CharInfo extends ServerBasePacket writeC(0); writeH(0); writeC(0); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__03_CHARINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharMoveToLocation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharMoveToLocation.java index 16afe62973..a6498b6b8a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharMoveToLocation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharMoveToLocation.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class CharMoveToLocation extends ServerBasePacket { - private static final String _S__01_CHARMOVETOLOCATION = "[S] 01 CharMoveToLocation"; private final Creature _cha; public CharMoveToLocation(Creature cha) @@ -30,9 +29,9 @@ public class CharMoveToLocation extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(1); + writeC(0x01); writeD(_cha.getObjectId()); writeD(_cha.getXdestination()); writeD(_cha.getYdestination()); @@ -40,12 +39,5 @@ public class CharMoveToLocation extends ServerBasePacket writeD(_cha.getX()); writeD(_cha.getY()); writeD(_cha.getZ()); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__01_CHARMOVETOLOCATION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java index d89068a1b7..051398c037 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.templates.Item; public class CharSelectInfo extends ServerBasePacket { - private static final String _S__1F_CHARSELECTINFO = "[S] 1F CharSelectInfo"; private final String _loginName; private final int _sessionId; private CharSelectInfoPackage _charInfopackage; @@ -47,7 +46,7 @@ public class CharSelectInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { writeC(0x1F); writeD(_characterPackage.length); @@ -118,7 +117,6 @@ public class CharSelectInfo extends ServerBasePacket writeF(info.getMaxMp()); writeD(info.getDeleteTimer()); } - return _bao.toByteArray(); } public CharSelectInfoPackage[] loadCharacterSelectInfoFromDisk() @@ -273,10 +271,4 @@ public class CharSelectInfo extends ServerBasePacket { return _charNameList; } - - @Override - public String getType() - { - return _S__1F_CHARSELECTINFO; - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index d1e8be901e..68f0192281 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class CharSelected extends ServerBasePacket { - private static final String _S__21_CHARSELECTED = "[S] 21 CharSelected"; private final PlayerInstance _cha; private final int _sessionId; @@ -33,9 +32,9 @@ public class CharSelected extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(33); + writeC(0x21); writeS(_cha.getName()); writeD(_cha.getCharId()); writeS(_cha.getTitle()); @@ -67,12 +66,5 @@ public class CharSelected extends ServerBasePacket writeD(0); } writeD(GameTimeController.getInstance().getGameTime()); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__21_CHARSELECTED; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java index 0c5d965655..75521bfb3c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java @@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.templates.CharTemplate; public class CharTemplates extends ServerBasePacket { - private static final String _S__23_CHARTEMPLATES = "[S] 23 CharTemplates"; private final Vector _chars = new Vector<>(); public void addChar(CharTemplate template) @@ -32,9 +31,9 @@ public class CharTemplates extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(35); + writeC(0x23); writeD(_chars.size()); for (int i = 0; i < _chars.size(); ++i) { @@ -60,12 +59,5 @@ public class CharTemplates extends ServerBasePacket writeD(temp.getMen()); writeD(10); } - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__23_CHARTEMPLATES; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e0b6707ed1..61ebc4e5f1 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class CreatureSay extends ServerBasePacket { - private static final String _S__5D_CREATURESAY = "[S] 5D CreatureSay"; private final int _objectId; private final int _textType; private final String _charName; @@ -34,19 +33,12 @@ public class CreatureSay extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(93); + writeC(0x5D); writeD(_objectId); writeD(_textType); writeS(_charName); writeS(_text); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__5D_CREATURESAY; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index cb52239020..0a9d0edc6a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.WorldObject; public class DeleteObject extends ServerBasePacket { - private static final String _S__1E_DELETEOBJECT = "[S] 1E DeleteObject"; private final int _objectId; public DeleteObject(WorldObject obj) @@ -30,16 +29,9 @@ public class DeleteObject extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(30); + writeC(0x1E); writeD(_objectId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__1E_DELETEOBJECT; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index e76f4d1740..28a1c3a227 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -21,9 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class Die extends ServerBasePacket { - private static final String _S__0B_DIE = "[S] 0B Die"; private final Creature _cha; - // private int _sessionId; public Die(Creature cha) { @@ -31,9 +29,9 @@ public class Die extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(11); + writeC(0x0B); writeD(_cha.getObjectId()); writeD(1); writeD(1); @@ -41,12 +39,5 @@ public class Die extends ServerBasePacket writeD(1); writeD(0); writeD(1); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__0B_DIE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 8295279e76..ce4239881a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; public class DoorInfo extends ServerBasePacket { - private static final String _S__60_DOORINFO = "[S] 60 DoorInfo"; private final DoorInstance _door; public DoorInfo(DoorInstance door) @@ -30,20 +29,13 @@ public class DoorInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(96); + writeC(0x60); writeD(_door.getObjectId()); writeD(_door.getX()); writeD(_door.getY()); writeD(_door.getZ()); writeD(0); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__60_DOORINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index bdd60ea0f5..3dab60cbdb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; public class DoorStatusUpdate extends ServerBasePacket { - private static final String _S__61_DOORSTATUSUPDATE = "[S] 61 DoorStatusUpdate"; private final DoorInstance _door; public DoorStatusUpdate(DoorInstance door) @@ -30,20 +29,13 @@ public class DoorStatusUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(97); + writeC(0x61); writeD(_door.getObjectId()); writeD(_door.getOpen()); writeD(_door.getDamage()); writeD(_door.getEnemy()); writeD(0); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__61_DOORSTATUSUPDATE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 4d02d62eb2..dca6915d26 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class DropItem extends ServerBasePacket { - private static final String _S__16_DROPITEM = "[S] 16 DropItem"; private final ItemInstance _item; private final int _playerId; @@ -32,9 +31,9 @@ public class DropItem extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(22); + writeC(0x16); writeD(_playerId); writeD(_item.getObjectId()); writeD(_item.getItemId()); @@ -51,12 +50,5 @@ public class DropItem extends ServerBasePacket } writeD(_item.getCount()); writeD(1); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__16_DROPITEM; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index c42a6bd0ac..080f02bc1a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.templates.Item; public class EquipUpdate extends ServerBasePacket { - private static final String _S__5E_EQUIPUPDATE = "[S] 5E EquipUpdate"; private final ItemInstance _item; private final int _change; @@ -33,10 +32,10 @@ public class EquipUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { int bodypart = 0; - writeC(94); + writeC(0x5E); writeD(_change); writeD(_item.getObjectId()); switch (_item.getItem().getBodyPart()) @@ -112,12 +111,5 @@ public class EquipUpdate extends ServerBasePacket } } writeD(bodypart); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__5E_EQUIPUPDATE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FinishRotation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FinishRotation.java index cd1c11cb67..577ff74a4f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FinishRotation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FinishRotation.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class FinishRotation extends ServerBasePacket { - private static final String _S__78_FINISHROTATION = "[S] 78 FinishRotation"; private final int _heading; private final int _objectId; @@ -32,17 +31,10 @@ public class FinishRotation extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(120); + writeC(0x78); writeD(_objectId); writeD(_heading); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__78_FINISHROTATION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a1581f3941..7b11056f4f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -21,9 +21,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class GMViewCharacterInfo extends ServerBasePacket { - private static final String _S__04_USERINFO = "[S] A8 GMViewCharacterInfo"; private final PlayerInstance _cha; - // private static int _test = 1; public GMViewCharacterInfo(PlayerInstance cha) { @@ -31,9 +29,9 @@ public class GMViewCharacterInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(168); + writeC(0xA8); writeD(_cha.getX()); writeD(_cha.getY()); writeD(_cha.getZ()); @@ -137,12 +135,5 @@ public class GMViewCharacterInfo extends ServerBasePacket { writeD(0); } - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__04_USERINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 1fd018ec45..b8da94fa43 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class GMViewItemList extends ServerBasePacket { - private static final String _S__AD_GMVIEWITEMLIST = "[S] AD GMViewItemList"; private final Collection _items; private final String _playerName; @@ -35,9 +34,9 @@ public class GMViewItemList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(173); + writeC(0xAD); writeS(_playerName); writeH(1); writeH(_items.size()); @@ -61,12 +60,5 @@ public class GMViewItemList extends ServerBasePacket writeH(item.getEnchantLevel()); writeH(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__AD_GMVIEWITEMLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index d9231e2944..0c1adc7486 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class GMViewPledgeInfo extends ServerBasePacket { - private static final String _S__A9_GMVIEWPLEDGEINFO = "[S] A9 GMViewPledgeInfo"; private final Clan _clan; private final PlayerInstance _activeChar; @@ -34,9 +33,9 @@ public class GMViewPledgeInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(169); + writeC(0xA9); writeS(_activeChar.getName()); writeD(_clan.getClanId()); writeS(_clan.getName()); @@ -68,12 +67,5 @@ public class GMViewPledgeInfo extends ServerBasePacket } writeD(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__A9_GMVIEWPLEDGEINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index 3b9b4f2f7c..ade138b229 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class GetItem extends ServerBasePacket { - private static final String _S__17_GETITEM = "[S] 17 GetItem"; private final ItemInstance _item; private final int _playerId; @@ -32,20 +31,13 @@ public class GetItem extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(23); + writeC(0x17); writeD(_playerId); writeD(_item.getObjectId()); writeD(_item.getX()); writeD(_item.getY()); writeD(_item.getZ()); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__17_GETITEM; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 4923e021ba..7308c28092 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -24,9 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class InventoryUpdate extends ServerBasePacket { - private static final String _S__37_INVENTORYUPDATE = "[S] 37 InventoryUpdate"; private final List _items; - // private boolean _showWindow; public InventoryUpdate() { @@ -57,9 +55,9 @@ public class InventoryUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(55); + writeC(0x37); final int count = _items.size(); writeH(count); for (int i = 0; i < count; ++i) @@ -84,12 +82,5 @@ public class InventoryUpdate extends ServerBasePacket writeH(temp.getEnchantLevel()); writeH(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__37_INVENTORYUPDATE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 265ed860ea..4fd2766142 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class ItemList extends ServerBasePacket { - private static final String _S__27_ITEMLIST = "[S] 27 ItemList"; private final Collection _items; private final boolean _showWindow; @@ -41,9 +40,9 @@ public class ItemList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(39); + writeC(0x27); if (_showWindow) { writeH(1); @@ -73,12 +72,5 @@ public class ItemList extends ServerBasePacket writeH(item.getEnchantLevel()); writeH(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__27_ITEMLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index 888b9f42aa..9817362186 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class JoinParty extends ServerBasePacket { - private static final String _S__4C_JOINPARTY = "[S] 4C JoinParty"; private final int _response; public JoinParty(int response) @@ -28,16 +27,9 @@ public class JoinParty extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(76); + writeC(0x4C); writeD(_response); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__4C_JOINPARTY; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index b5f78a6ff3..947a20d262 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class JoinPledge extends ServerBasePacket { - private static final String _S__45_JOINPLEDGE = "[S] 45 JoinPledge"; private final int _pledgeId; public JoinPledge(int pledgeId) @@ -28,16 +27,9 @@ public class JoinPledge extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(69); + writeC(0x45); writeD(_pledgeId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__45_JOINPLEDGE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 8ce1193bff..dfc405e836 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -19,31 +19,25 @@ package org.l2jmobius.gameserver.network.serverpackets; public class KeyPacket extends ServerBasePacket { - private static final String _S__01_KEYPACKET = "[S] 01 KeyPacket"; + final private byte[] _key; - public void setKey(byte[] key) + public KeyPacket(byte[] key) + { + _key = key; + } + + @Override + public void writeImpl() { writeC(0); writeC(1); - writeC(key[0]); - writeC(key[1]); - writeC(key[2]); - writeC(key[3]); - writeC(key[4]); - writeC(key[5]); - writeC(key[6]); - writeC(key[7]); - } - - @Override - public byte[] getContent() - { - return getBytes(); - } - - @Override - public String getType() - { - return _S__01_KEYPACKET; + writeC(_key[0]); + writeC(_key[1]); + writeC(_key[2]); + writeC(_key[3]); + writeC(_key[4]); + writeC(_key[5]); + writeC(_key[6]); + writeC(_key[7]); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java index 96dbb0303b..283dbd3a95 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class LeaveWorld extends ServerBasePacket { - private static final String _S__96_LEAVEWORLD = "[S] 96 LeaveWorld"; - @Override - public byte[] getContent() + public void writeImpl() { writeC(0x96); - return getBytes(); - } - - @Override - public String getType() - { - return _S__96_LEAVEWORLD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java index 7a9ef18079..2eccf886aa 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java @@ -21,7 +21,6 @@ import java.util.Vector; public class MagicEffectIcons extends ServerBasePacket { - private static final String _S__97_MAGICEFFECTICONS = "[S] 97 MagicEffectIcons"; private final Vector _effects = new Vector<>(); public void addEffect(int skillId, int dat, int duration) @@ -30,9 +29,9 @@ public class MagicEffectIcons extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(151); + writeC(0x97); writeH(_effects.size()); for (int i = 0; i < _effects.size(); ++i) { @@ -41,13 +40,6 @@ public class MagicEffectIcons extends ServerBasePacket writeH(temp.dat); writeD(temp.duration / 1000); } - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__97_MAGICEFFECTICONS; } class Effect @@ -63,5 +55,4 @@ public class MagicEffectIcons extends ServerBasePacket this.duration = duration; } } - } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 1b8e3bcc32..d3b53bf0d3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class MagicSkillCanceld extends ServerBasePacket { - private static final String _S__5B_MAGICSKILLCANCELD = "[S] 5B MagicSkillCanceld"; private final int _objectId; public MagicSkillCanceld(int objectId) @@ -28,16 +27,9 @@ public class MagicSkillCanceld extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(91); + writeC(0x5B); writeD(_objectId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__5B_MAGICSKILLCANCELD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index fb8c4ad8ba..90d436c5b5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class MagicSkillLaunched extends ServerBasePacket { - private static final String _S__8E_MAGICSKILLLAUNCHED = "[S] 8E MagicSkillLaunched"; private final Creature _cha; private final int _skillId; private final int _skillLevel; @@ -47,20 +46,13 @@ public class MagicSkillLaunched extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(142); + writeC(0x8E); writeD(_cha.getObjectId()); writeD(_skillId); writeD(_skillLevel); writeD(_dat2); writeD(_targetId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__8E_MAGICSKILLLAUNCHED; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUser.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUser.java index 7b5822b55e..fa3e36ddcd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUser.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUser.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class MagicSkillUser extends ServerBasePacket { - private static final String _S__5A_MAGICSKILLUSER = "[S] 5A MagicSkillUser"; private final Creature _cha; private final int _targetId; private final int _skillId; @@ -50,9 +49,9 @@ public class MagicSkillUser extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(90); + writeC(0x5A); writeD(_cha.getObjectId()); writeD(_targetId); writeD(_skillId); @@ -63,12 +62,5 @@ public class MagicSkillUser extends ServerBasePacket writeD(_cha.getY()); writeD(_cha.getZ()); writeH(0); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__5A_MAGICSKILLUSER; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 49757b1eea..86c6af63ef 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class MoveToPawn extends ServerBasePacket { - private static final String _S__75_MOVETOPAWN = "[S] 75 MoveToPawn"; private final Creature _cha; private final WorldObject _target; private final int _distance; @@ -35,21 +34,14 @@ public class MoveToPawn extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(117); + writeC(0x75); writeD(_cha.getObjectId()); writeD(_target.getObjectId()); writeD(_distance); writeD(_cha.getX()); writeD(_cha.getY()); writeD(_cha.getZ()); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__75_MOVETOPAWN; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 66943a7925..4a12ed864c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class MyTargetSelected extends ServerBasePacket { - private static final String _S__BF_MYTARGETSELECTED = "[S] BF MyTargetSelected"; private final int _objectId; private final int _color; @@ -30,17 +29,10 @@ public class MyTargetSelected extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(191); + writeC(0xBF); writeD(_objectId); writeH(_color); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__BF_MYTARGETSELECTED; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 4b5a195f24..6ecf1dfe2e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class NpcHtmlMessage extends ServerBasePacket { - private static final String _S__1B_NPCHTMLMESSAGE = "[S] 1B NpcHtmlMessage"; private final int _messageId; private String _html; @@ -34,17 +33,10 @@ public class NpcHtmlMessage extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(27); + writeC(0x1B); writeD(_messageId); writeS(_html); - return getBytes(); - } - - @Override - public String getType() - { - return _S__1B_NPCHTMLMESSAGE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 5da2c209cb..5a41b60ac5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; public class NpcInfo extends ServerBasePacket { - private static final String _S__22_NPCINFO = "[S] 22 NpcInfo"; private NpcInstance _cha; private PetInstance _chaPet; @@ -37,11 +36,11 @@ public class NpcInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { if (_chaPet == null) { - writeC(34); + writeC(0x22); writeD(_cha.getObjectId()); writeD(_cha.getNpcTemplate().getNpcId() + 1000000); if (_cha.isAutoAttackable()) @@ -108,7 +107,7 @@ public class NpcInfo extends ServerBasePacket } else { - writeC(34); + writeC(0x22); writeD(_chaPet.getObjectId()); writeD(_chaPet.getNpcId() + 1000000); if (_chaPet.getKarma() > 0) @@ -180,12 +179,5 @@ public class NpcInfo extends ServerBasePacket writeD(0); writeD(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__22_NPCINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java index edeadfcd47..6097377aa9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PartyMatchDetail extends ServerBasePacket { - private static final String _S__B0_PARTYMATCHDETAIL = "[S] B0 PartyMatchDetail"; private final PlayerInstance _player; public PartyMatchDetail(PlayerInstance player) @@ -30,9 +29,9 @@ public class PartyMatchDetail extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(176); + writeC(0xB0); writeD(_player.getObjectId()); if (_player.isPartyMatchingShowLevel()) { @@ -51,12 +50,5 @@ public class PartyMatchDetail extends ServerBasePacket writeD(0); } writeS(" " + _player.getPartyMatchingMemo()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__B0_PARTYMATCHDETAIL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java index 6a400b5ab8..1782d87e27 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java @@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PartyMatchList extends ServerBasePacket { - private static final String _S__AF_PARTYMATCHLIST = "[S] AF PartyMatchList"; private final Collection _matchingPlayers; public PartyMatchList(Collection allPlayers) @@ -32,9 +31,9 @@ public class PartyMatchList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(175); + writeC(0xAF); int size = _matchingPlayers.size(); if (size > 40) { @@ -54,12 +53,5 @@ public class PartyMatchList extends ServerBasePacket writeD(player.getY()); writeD(player.getZ()); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__AF_PARTYMATCHLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 0f97e2ec79..f58e6336f5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PartySmallWindowAdd extends ServerBasePacket { - private static final String _S__64_PARTYSMALLWINDOWADD = "[S] 64 PartySmallWindowAdd"; private final PlayerInstance _member; public PartySmallWindowAdd(PlayerInstance member) @@ -30,9 +29,9 @@ public class PartySmallWindowAdd extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(100); + writeC(0x64); writeD(_member.getObjectId()); writeS(_member.getName()); writeD((int) _member.getCurrentHp()); @@ -43,12 +42,5 @@ public class PartySmallWindowAdd extends ServerBasePacket writeD(_member.getLevel()); writeD(0); writeD(0); - return getBytes(); - } - - @Override - public String getType() - { - return _S__64_PARTYSMALLWINDOWADD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index ae9803559a..c3e953a711 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PartySmallWindowAll extends ServerBasePacket { - private static final String _S__63_PARTYSMALLWINDOWALL = "[S] 63 PartySmallWindowAll"; private List _partyMembers = new ArrayList<>(); public void setPartyList(List party) @@ -33,9 +32,9 @@ public class PartySmallWindowAll extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(99); + writeC(0x63); writeD(_partyMembers.size()); for (int i = 0; i < _partyMembers.size(); ++i) { @@ -51,12 +50,5 @@ public class PartySmallWindowAll extends ServerBasePacket writeD(0); writeD(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__63_PARTYSMALLWINDOWALL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index c1403b1240..5dda1fe005 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PartySmallWindowDelete extends ServerBasePacket { - private static final String _S__66_PARTYSMALLWINDOWDELETE = "[S] 66 PartySmallWindowDelete"; private final PlayerInstance _member; public PartySmallWindowDelete(PlayerInstance member) @@ -30,17 +29,10 @@ public class PartySmallWindowDelete extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(102); + writeC(0x66); writeD(_member.getObjectId()); writeS(_member.getName()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__66_PARTYSMALLWINDOWDELETE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java index 6d9c54b626..557fecb9ae 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class PartySmallWindowDeleteAll extends ServerBasePacket { - private static final String _S__65_PARTYSMALLWINDOWDELETEALL = "[S] 65 PartySmallWindowDeleteAll"; - @Override - public byte[] getContent() + public void writeImpl() { - writeC(101); - return getBytes(); - } - - @Override - public String getType() - { - return _S__65_PARTYSMALLWINDOWDELETEALL; + writeC(0x65); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index 4d19c74f72..fa1119630b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PartySmallWindowUpdate extends ServerBasePacket { - private static final String _S__67_PARTYSMALLWINDOWUPDATE = "[S] 67 PartySmallWindowUpdate"; private final PlayerInstance _member; public PartySmallWindowUpdate(PlayerInstance member) @@ -30,9 +29,9 @@ public class PartySmallWindowUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(103); + writeC(0x67); writeD(_member.getObjectId()); writeS(_member.getName()); writeD((int) _member.getCurrentHp()); @@ -41,12 +40,5 @@ public class PartySmallWindowUpdate extends ServerBasePacket writeD(_member.getMaxMp()); writeD(_member.getClassId()); writeD(_member.getLevel()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__67_PARTYSMALLWINDOWUPDATE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java index 46074123f2..b76b883c3e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class PetDelete extends ServerBasePacket { - private static final String _S__CF_PETDELETE = "[S] CF PetDelete"; private final int _petId; private final int _petnum; @@ -30,17 +29,10 @@ public class PetDelete extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(207); + writeC(0xCF); writeD(_petId); writeD(_petnum); - return getBytes(); - } - - @Override - public String getType() - { - return _S__CF_PETDELETE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index dd15202911..ceb662e796 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; public class PetInfo extends ServerBasePacket { - private static final String _S__CA_PETINFO = "[S] CA PetInfo"; private final PetInstance _cha; public PetInfo(PetInstance cha) @@ -30,9 +29,9 @@ public class PetInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(202); + writeC(0xCA); writeD(_cha.getPetId()); writeD(_cha.getObjectId()); writeD(_cha.getNpcId() + 1000000); @@ -120,12 +119,5 @@ public class PetInfo extends ServerBasePacket writeD((int) _cha.getEffectiveSpeed()); writeD(80); writeD(_cha.getMagicalSpeed()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__CA_PETINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 57c5cc736c..56c984c0fc 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -24,9 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class PetInventoryUpdate extends ServerBasePacket { - private static final String _S__37_INVENTORYUPDATE = "[S] 37 InventoryUpdate"; private final List _items; - // private boolean _showWindow; public PetInventoryUpdate() { @@ -57,9 +55,9 @@ public class PetInventoryUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(204); + writeC(0xCC); final int count = _items.size(); writeH(count); for (int i = 0; i < count; ++i) @@ -84,12 +82,5 @@ public class PetInventoryUpdate extends ServerBasePacket writeH(temp.getEnchantLevel()); writeH(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__37_INVENTORYUPDATE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index d9495b7029..c46f5ade60 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; public class PetItemList extends ServerBasePacket { - private static final String _S__cb_PETITEMLIST = "[S] cb PetItemList"; - private final PetInstance _cha; private final Collection _items; @@ -36,9 +34,9 @@ public class PetItemList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(203); + writeC(0xCB); writeH(_items.size()); for (ItemInstance item : _items) { @@ -60,12 +58,5 @@ public class PetItemList extends ServerBasePacket writeH(item.getEnchantLevel()); writeH(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__cb_PETITEMLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index 6028141e6d..a0050f4d9b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class PetStatusShow extends ServerBasePacket { - private static final String _S__C9_PETSTATUSSHOW = "[S] C9 PetStatusShow"; private final int _petId; public PetStatusShow(int petId) @@ -28,16 +27,9 @@ public class PetStatusShow extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(201); + writeC(0xC9); writeD(_petId); - return getBytes(); - } - - @Override - public String getType() - { - return _S__C9_PETSTATUSSHOW; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index d8eece72bb..3d4f4aa67c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; public class PetStatusUpdate extends ServerBasePacket { - private static final String _S__CE_PETSTATUSSHOW = "[S] CE PetStatusShow"; private final PetInstance _pet; public PetStatusUpdate(PetInstance pet) @@ -30,9 +29,9 @@ public class PetStatusUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(206); + writeC(0xCE); writeD(_pet.getPetId()); writeD(_pet.getObjectId()); writeD(_pet.getX()); @@ -49,12 +48,5 @@ public class PetStatusUpdate extends ServerBasePacket writeD(_pet.getExp()); writeD(_pet.getLastLevel()); writeD(_pet.getNextLevel()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__CE_PETSTATUSSHOW; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index 7418bc8d9d..c19822ed34 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -22,7 +22,6 @@ import java.io.FileInputStream; public class PledgeCrest extends ServerBasePacket { - private static final String _S__84_PLEDGECREST = "[S] 84 PledgeCrest"; private final File _crestFile; private final int _crestId; @@ -33,14 +32,13 @@ public class PledgeCrest extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(132); + writeC(0x84); writeD(_crestId); try { final FileInputStream fis = new FileInputStream(_crestFile); - // BufferedInputStream bfis = new BufferedInputStream(fis); final int crestSize = fis.available(); writeD(crestSize); int temp = -1; @@ -54,12 +52,5 @@ public class PledgeCrest extends ServerBasePacket { e.printStackTrace(); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__84_PLEDGECREST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index ff283ce57f..cfdd471070 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.Clan; public class PledgeInfo extends ServerBasePacket { - private static final String _S__9C_PLEDGEINFO = "[S] 9C PledgeInfo"; private final Clan _clan; public PledgeInfo(Clan clan) @@ -30,18 +29,11 @@ public class PledgeInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(156); + writeC(0x9C); writeD(_clan.getClanId()); writeS(_clan.getName()); writeS(_clan.getAllyName()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__9C_PLEDGEINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index ce91ff095a..0c7b430dd2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PledgeShowInfoUpdate extends ServerBasePacket { - private static final String _S__A1_PLEDGESHOWINFOUPDATE = "[S] a1 PledgeShowInfoUpdate"; private final Clan _clan; private final PlayerInstance _activeChar; @@ -33,9 +32,9 @@ public class PledgeShowInfoUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(161); + writeC(0xA1); writeD(_clan.getClanId()); writeS(""); writeS(""); @@ -49,12 +48,5 @@ public class PledgeShowInfoUpdate extends ServerBasePacket writeD(0); writeD(0); writeS(""); - return getBytes(); - } - - @Override - public String getType() - { - return _S__A1_PLEDGESHOWINFOUPDATE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index bf05fd3a7e..b82366bcc9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PledgeShowMemberListAdd extends ServerBasePacket { - private static final String _S__6A_PLEDGESHOWMEMBERLISTADD = "[S] 6a PledgeShowMemberListAdd"; private final PlayerInstance _player; public PledgeShowMemberListAdd(PlayerInstance player) @@ -30,21 +29,14 @@ public class PledgeShowMemberListAdd extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(106); + writeC(0x6A); writeS(_player.getName()); writeD(_player.getLevel()); writeD(_player.getClassId()); writeD(0); writeD(1); writeD(1); - return getBytes(); - } - - @Override - public String getType() - { - return _S__6A_PLEDGESHOWMEMBERLISTADD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 48d77aebef..517233d2cf 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PledgeShowMemberListAll extends ServerBasePacket { - private static final String _S__68_PLEDGESHOWMEMBERLISTALL = "[S] 68 PledgeShowMemberListAll"; private final Clan _clan; private final PlayerInstance _activeChar; @@ -34,9 +33,9 @@ public class PledgeShowMemberListAll extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(104); + writeC(0x68); writeD(_clan.getClanId()); writeS(_clan.getName()); writeS(_clan.getLeaderName()); @@ -70,12 +69,5 @@ public class PledgeShowMemberListAll extends ServerBasePacket } writeD(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__68_PLEDGESHOWMEMBERLISTALL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 8a1587d0d9..f2479f9ab8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -19,25 +19,17 @@ package org.l2jmobius.gameserver.network.serverpackets; public class PledgeShowMemberListDelete extends ServerBasePacket { - private static final String _S__6B_PLEDGESHOWMEMBERLISTDELETE = "[S] 6b PledgeShowMemberListDelete"; private final String _player; - public PledgeShowMemberListDelete(String playerName) + public PledgeShowMemberListDelete(String player) { - _player = playerName; + _player = player; } @Override - public byte[] getContent() + public void writeImpl() { - writeC(107); + writeC(0x6B); writeS(_player); - return getBytes(); - } - - @Override - public String getType() - { - return _S__6B_PLEDGESHOWMEMBERLISTDELETE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java index 96346276bf..f57e028f86 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class PledgeShowMemberListDeleteAll extends ServerBasePacket { - private static final String _S__9B_PLEDGESHOWMEMBERLISTDELETEALL = "[S] 9b PledgeShowMemberListDeleteAll"; - @Override - public byte[] getContent() + public void writeImpl() { - writeC(155); - return getBytes(); - } - - @Override - public String getType() - { - return _S__9B_PLEDGESHOWMEMBERLISTDELETEALL; + writeC(0x9B); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java index 7b69df98aa..96b975a798 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java @@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PrivateBuyListBuy extends ServerBasePacket { - private static final String _S__D1_PRIVATEBUYLISTBUY = "[S] D1 PrivateBuyListBuy"; private final PlayerInstance _buyer; private final PlayerInstance _seller; @@ -38,11 +37,11 @@ public class PrivateBuyListBuy extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { TradeItem temp3; TradeItem temp2; - writeC(209); + writeC(0xD1); writeD(_buyer.getObjectId()); writeD(_seller.getAdena()); final List buyerslist = _buyer.getBuyList(); @@ -122,12 +121,5 @@ public class PrivateBuyListBuy extends ServerBasePacket } writeD(buyCount); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__D1_PRIVATEBUYLISTBUY; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListSell.java index e1b604e525..14624dbe00 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListSell.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PrivateBuyListSell extends ServerBasePacket { - private static final String _S__B4_PRIVATEBUYLISTSELL = "[S] B4 PrivateBuyListSell"; private final PlayerInstance _buyer; private final PlayerInstance _seller; @@ -33,9 +32,9 @@ public class PrivateBuyListSell extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(180); + writeC(0xB4); writeD(_seller.getObjectId()); writeD(_buyer.getAdena()); final int count = _seller.getSellList().size(); @@ -54,12 +53,5 @@ public class PrivateBuyListSell extends ServerBasePacket writeD(temp2.getOwnersPrice()); writeD(temp2.getStorePrice()); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__B4_PRIVATEBUYLISTSELL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java index e378fa225c..b4cc1fba41 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PrivateSellListBuy extends ServerBasePacket { - private static final String _S__D0_PRIVATESELLLISTBUY = "[S] D0 PrivateSellListBuy"; private final PlayerInstance _buyer; public PrivateSellListBuy(PlayerInstance buyer) @@ -35,10 +34,9 @@ public class PrivateSellListBuy extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - int i; - writeC(208); + writeC(0xD0); writeD(_buyer.getObjectId()); writeD(_buyer.getAdena()); final TradeList list = new TradeList(0); @@ -54,13 +52,12 @@ public class PrivateSellListBuy extends ServerBasePacket } count = list.getItems().size(); writeD(count); - for (i = 0; i < count; ++i) + for (ItemInstance item : list.getItems()) { - final ItemInstance temp = list.getItems().get(i); - writeD(temp.getItemId()); + writeD(item.getItemId()); writeH(0); - writeD(temp.getCount()); - writeD(temp.getPrice()); + writeD(item.getCount()); + writeD(item.getPrice()); writeH(0); writeD(0); writeH(0); @@ -69,26 +66,18 @@ public class PrivateSellListBuy extends ServerBasePacket writeD(count); if (count != 0) { - for (i = 0; i < count; ++i) + for (TradeItem tradeItem : buyList) { - final TradeItem temp2 = buyList.get(i); - writeD(temp2.getItemId()); + writeD(tradeItem.getItemId()); writeH(0); - writeD(temp2.getCount()); - writeD(temp2.getStorePrice()); + writeD(tradeItem.getCount()); + writeD(tradeItem.getStorePrice()); writeH(0); writeD(0); writeH(0); - writeD(temp2.getOwnersPrice()); + writeD(tradeItem.getOwnersPrice()); writeD(55); } } - return getBytes(); - } - - @Override - public String getType() - { - return _S__D0_PRIVATESELLLISTBUY; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java index 0c85d1e66d..e4f734c49f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PrivateSellListSell extends ServerBasePacket { - private static final String _S__B3_PRIVATESELLLISTSELL = "[S] B3 PrivateSellListSell"; private final PlayerInstance _seller; public PrivateSellListSell(PlayerInstance seller) @@ -35,12 +34,9 @@ public class PrivateSellListSell extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - TradeItem temp2; - int i; - int i2; - writeC(179); + writeC(0xB3); writeD(_seller.getObjectId()); writeD(_seller.getAdena()); final TradeList list = new TradeList(0); @@ -56,21 +52,19 @@ public class PrivateSellListSell extends ServerBasePacket } if (sellList.size() != 0) { - for (i = 0; i < sellList.size(); ++i) + for (TradeItem tradeItem : sellList) { - temp2 = sellList.get(i); - list.removeItem(temp2.getObjectId(), temp2.getCount()); + list.removeItem(tradeItem.getObjectId(), tradeItem.getCount()); } } count = list.getItems().size(); writeD(count); - for (i2 = 0; i2 < count; ++i2) + for (ItemInstance item : list.getItems()) { - final ItemInstance temp = list.getItems().get(i2); writeD(0); - writeD(temp.getObjectId()); - writeD(temp.getItemId()); - writeD(temp.getCount()); + writeD(item.getObjectId()); + writeD(item.getItemId()); + writeD(item.getCount()); writeD(0); writeH(0); writeH(0); @@ -81,28 +75,19 @@ public class PrivateSellListSell extends ServerBasePacket writeD(count); if (count != 0) { - for (i2 = 0; i2 < count; ++i2) + for (TradeItem tradeItem : sellList) { - temp2 = sellList.get(i2); - System.out.println("item:" + temp2.getObjectId()); writeD(0); - writeD(temp2.getObjectId()); - writeD(temp2.getItemId()); - writeD(temp2.getCount()); + writeD(tradeItem.getObjectId()); + writeD(tradeItem.getItemId()); + writeD(tradeItem.getCount()); writeD(0); writeH(0); writeH(0); writeH(0); - writeD(temp2.getOwnersPrice()); - writeD(temp2.getStorePrice()); + writeD(tradeItem.getOwnersPrice()); + writeD(tradeItem.getStorePrice()); } } - return getBytes(); - } - - @Override - public String getType() - { - return _S__B3_PRIVATESELLLISTSELL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 6decb371fb..22f0d0f626 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -21,26 +21,18 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PrivateStoreMsgBuy extends ServerBasePacket { - private static final String _S__D2_PRIVATESTOREMSGBUY = "[S] D2 PrivateStoreMsgBuy"; - private final PlayerInstance _cha; + private final PlayerInstance _player; public PrivateStoreMsgBuy(PlayerInstance player) { - _cha = player; + _player = player; } @Override - public byte[] getContent() + public void writeImpl() { - writeC(210); - writeD(_cha.getObjectId()); - writeS(_cha.getTradeList().getBuyStoreName()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__D2_PRIVATESTOREMSGBUY; + writeC(0xD2); + writeD(_player.getObjectId()); + writeS(_player.getTradeList().getBuyStoreName()); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index e8e857dd4b..a9d59d14f0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class PrivateStoreMsgSell extends ServerBasePacket { - private static final String _S__B5_PRIVATESTOREMSGSELL = "[S] B5 PrivateStoreMsgSell"; private final PlayerInstance _cha; public PrivateStoreMsgSell(PlayerInstance player) @@ -30,17 +29,10 @@ public class PrivateStoreMsgSell extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(181); + writeC(0xB5); writeD(_cha.getObjectId()); writeS(_cha.getTradeList().getSellStoreName()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__B5_PRIVATESTOREMSGSELL; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java index 1ffc545739..1806416608 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java @@ -19,22 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets; public class QuestList extends ServerBasePacket { - private static final String _S__98_QUESTLIST = "[S] 98 QuestList"; private int _questCount; private int _itemCount; @Override - public byte[] getContent() + public void writeImpl() { - writeC(152); + writeC(0x98); writeH(_questCount); writeH(_itemCount); - return getBytes(); - } - - @Override - public String getType() - { - return _S__98_QUESTLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java index 86dfb15153..fc50db364f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java @@ -19,21 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets; public class RestartResponse extends ServerBasePacket { - private static final String _S__74_RESTARTRESPONSE = "[S] 74 RestartResponse"; - private final String _message = "ok merong~ khaha"; + private static final String _message = "ok merong~ khaha"; @Override - public byte[] getContent() + public void writeImpl() { - writeC(116); + writeC(0x74); writeD(1); writeS(_message); - return getBytes(); - } - - @Override - public String getType() - { - return _S__74_RESTARTRESPONSE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index ec0086d05b..48876d3a04 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.WorldObject; public class Revive extends ServerBasePacket { - private static final String _S__0C_REVIVE = "[S] 0c Revive"; private final int _objectId; public Revive(WorldObject obj) @@ -30,16 +29,9 @@ public class Revive extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(12); + writeC(0x0C); writeD(_objectId); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__0C_REVIVE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java index 0172e46ee6..35a0164058 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class SellList extends ServerBasePacket { - private static final String _S__1C_SELLLIST = "[S] 1C SellList"; private final PlayerInstance _char; private final int _money; private final List _selllist = new ArrayList<>(); @@ -37,9 +36,9 @@ public class SellList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(28); + writeC(0x1C); writeD(_money); writeD(0); int count = _char.getInventory().getSize(); @@ -70,12 +69,5 @@ public class SellList extends ServerBasePacket } writeD(item.getItem().getReferencePrice() / 2); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__1C_SELLLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.java index e6bfb6d844..9e83522b91 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class SendTradeDone extends ServerBasePacket { - private static final String _S__32_SENDTRADEDONE = "[S] 32 SendTradeDone"; private final int _num; public SendTradeDone(int num) @@ -28,16 +27,9 @@ public class SendTradeDone extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(50); + writeC(0x32); writeD(_num); - return getBytes(); - } - - @Override - public String getType() - { - return _S__32_SENDTRADEDONE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 92156ee9cc..e85b014b16 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class SendTradeRequest extends ServerBasePacket { - private static final String _S__73_SENDTRADEREQUEST = "[S] 73 SendTradeRequest"; private final int _senderID; public SendTradeRequest(int senderID) @@ -28,16 +27,9 @@ public class SendTradeRequest extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(115); + writeC(0x73); writeD(_senderID); - return getBytes(); - } - - @Override - public String getType() - { - return _S__73_SENDTRADEREQUEST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java index dc9493975b..fa771ebed7 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java @@ -18,18 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.io.ByteArrayOutputStream; -import java.io.IOException; public abstract class ServerBasePacket { - // private static Logger _log = Logger.getLogger(ServerBasePacket.class.getName()); - - ByteArrayOutputStream _bao = new ByteArrayOutputStream(); - - protected ServerBasePacket() - { - // _log.finest(getType()); - } + private final ByteArrayOutputStream _bao = new ByteArrayOutputStream(); protected void writeD(int value) { @@ -85,7 +77,5 @@ public abstract class ServerBasePacket return _bao.toByteArray(); } - public abstract byte[] getContent() throws IOException; - - public abstract String getType(); + public abstract void writeImpl(); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetToLocation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetToLocation.java index c6463dd51f..37a9da614a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetToLocation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetToLocation.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class SetToLocation extends ServerBasePacket { - private static final String _S__76_SETTOLOCATION = "[S] 76 SetToLocation"; private final Creature _cha; public SetToLocation(Creature cha) @@ -30,20 +29,13 @@ public class SetToLocation extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(118); + writeC(0x76); writeD(_cha.getObjectId()); writeD(_cha.getX()); writeD(_cha.getY()); writeD(_cha.getZ()); writeD(_cha.getHeading()); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__76_SETTOLOCATION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java index 9c421b3081..cc73b01394 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class SetupGauge extends ServerBasePacket { - private static final String _S__85_SETUPGAUGE = "[S] 85 SetupGauge"; public static final int BLUE = 0; public static final int RED = 1; public static final int CYAN = 2; @@ -33,17 +32,10 @@ public class SetupGauge extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(133); + writeC(0x85); writeD(_dat1); writeD(_time); - return getBytes(); - } - - @Override - public String getType() - { - return _S__85_SETUPGAUGE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 1707fb0237..508c1beb4e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -21,7 +21,6 @@ import java.util.Vector; public class ShortCutInit extends ServerBasePacket { - private static final String _S__57_SHORTCUTINIT = "[S] 57 ShortCutInit"; private final Vector _shortCuts = new Vector<>(); public void addSkillShotCut(int slot, int skillId, int level, int dat2) @@ -40,9 +39,9 @@ public class ShortCutInit extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(87); + writeC(0x57); writeD(_shortCuts.size()); for (int i = 0; i < _shortCuts.size(); ++i) { @@ -56,13 +55,6 @@ public class ShortCutInit extends ServerBasePacket } writeD(temp.dat2); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__57_SHORTCUTINIT; } class ShortCut @@ -82,5 +74,4 @@ public class ShortCutInit extends ServerBasePacket this.dat2 = dat2; } } - } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index c84b3efc10..d0d3f3ccb5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class ShortCutRegister extends ServerBasePacket { - private static final String _S__56_SHORTCUTREGISTER = "[S] 56 ShortCutRegister"; public int _slot; public int _type; public int _typeId; @@ -41,9 +40,9 @@ public class ShortCutRegister extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(86); + writeC(0x56); writeD(_type); writeD(_slot); writeD(_typeId); @@ -52,12 +51,5 @@ public class ShortCutRegister extends ServerBasePacket writeD(_level); } writeD(_dat2); - return getBytes(); - } - - @Override - public String getType() - { - return _S__56_SHORTCUTREGISTER; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index b4158a30ae..4d86936ccf 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class ShowBoard extends ServerBasePacket { - private static final String _S__86_SHOWBOARD = "[S] 86 ShowBoard"; private final PlayerInstance _player; private final String _htmlCode; @@ -32,9 +31,9 @@ public class ShowBoard extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(134); + writeC(0x86); writeS(""); writeS(""); writeS(""); @@ -47,12 +46,5 @@ public class ShowBoard extends ServerBasePacket } writeS(clan); writeS(_htmlCode); - return getBytes(); - } - - @Override - public String getType() - { - return _S__86_SHOWBOARD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 3da8a9a3a3..6a9fd2c751 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class ShowMiniMap extends ServerBasePacket { - private static final String _S__b6_SHOWMINIMAP = "[S] B6 ShowMiniMap"; private final int _mapId; public ShowMiniMap(int mapId) @@ -28,16 +27,9 @@ public class ShowMiniMap extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(182); + writeC(0xB6); writeD(_mapId); - return getBytes(); - } - - @Override - public String getType() - { - return _S__b6_SHOWMINIMAP; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java index 14f95d6664..7e90e09db6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java @@ -21,7 +21,6 @@ import java.util.Vector; public class SkillList extends ServerBasePacket { - private static final String _S__6D_SKILLLIST = "[S] 6D SkillList"; private final Vector _skills = new Vector<>(); public void addSkill(int id, int level, boolean passive) @@ -30,9 +29,9 @@ public class SkillList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(109); + writeC(0x6D); writeD(_skills.size()); for (int i = 0; i < _skills.size(); ++i) { @@ -48,13 +47,6 @@ public class SkillList extends ServerBasePacket writeD(temp.level); writeD(temp.id); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__6D_SKILLLIST; } class Skill @@ -70,5 +62,4 @@ public class SkillList extends ServerBasePacket this.passive = passive; } } - } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index dac9e52430..f33edf22b8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class SocialAction extends ServerBasePacket { - private static final String _S__3D_SOCIALACTION = "[S] 3D SocialAction"; private final int _playerId; private final int _actionId; @@ -30,17 +29,10 @@ public class SocialAction extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(61); + writeC(0x3D); writeD(_playerId); writeD(_actionId); - return getBytes(); - } - - @Override - public String getType() - { - return _S__3D_SOCIALACTION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 758d3387f1..ac6004dccd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class SpawnItem extends ServerBasePacket { - private static final String _S__15_SPAWNITEM = "[S] 15 SpawnItem"; private final ItemInstance _item; public SpawnItem(ItemInstance item) @@ -30,9 +29,9 @@ public class SpawnItem extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(21); + writeC(0x15); writeD(_item.getObjectId()); writeD(_item.getItemId()); writeD(_item.getX()); @@ -47,12 +46,5 @@ public class SpawnItem extends ServerBasePacket writeD(0); } writeD(_item.getCount()); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__15_SPAWNITEM; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 1e3955d922..0c67d42456 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -21,7 +21,6 @@ import java.util.Vector; public class StatusUpdate extends ServerBasePacket { - private static final String _S__1A_STATUSUPDATE = "[S] 1A StatusUpdate"; public static int LEVEL = 1; public static int EXP = 2; public static int STR = 3; @@ -48,6 +47,7 @@ public class StatusUpdate extends ServerBasePacket public static int M_DEF = 25; public static int PVP_FLAG = 26; public static int KARMA = 27; + private final int _objectId; private final Vector _attributes = new Vector<>(); @@ -62,9 +62,9 @@ public class StatusUpdate extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(26); + writeC(0x1A); writeD(_objectId); writeD(_attributes.size()); for (int i = 0; i < _attributes.size(); ++i) @@ -73,13 +73,6 @@ public class StatusUpdate extends ServerBasePacket writeD(temp.id); writeD(temp.value); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__1A_STATUSUPDATE; } class Attribute @@ -93,5 +86,4 @@ public class StatusUpdate extends ServerBasePacket this.value = value; } } - } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 058b8cd304..56a37cc76f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class StopMove extends ServerBasePacket { - private static final String _S__59_STOPMOVE = "[S] 59 StopMove"; private final int _objectId; private final int _x; private final int _y; @@ -43,20 +42,13 @@ public class StopMove extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(89); + writeC(0x59); writeD(_objectId); writeD(_x); writeD(_y); writeD(_z); writeD(_heading); - return getBytes(); - } - - @Override - public String getType() - { - return _S__59_STOPMOVE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveWithLocation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveWithLocation.java index f8464ac26f..6251954c5d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveWithLocation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveWithLocation.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class StopMoveWithLocation extends ServerBasePacket { - private static final String _S__5F_STOPMOVEWITHLOCATION = "[S] 5F StopMoveWithLocation"; private final Creature _char; public StopMoveWithLocation(Creature player) @@ -30,19 +29,12 @@ public class StopMoveWithLocation extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(95); + writeC(0x5F); writeD(_char.getObjectId()); writeD(_char.getX()); writeD(_char.getY()); writeD(_char.getZ()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__5F_STOPMOVEWITHLOCATION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index 803ab9352b..ff79650e6c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class StopRotation extends ServerBasePacket { - private static final String _S__78_STOPROTATION = "[S] 78 StopRotation"; private final PlayerInstance _char; private final int _degree; @@ -32,17 +31,10 @@ public class StopRotation extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(120); + writeC(0x78); writeD(_char.getObjectId()); writeD(_degree); - return getBytes(); - } - - @Override - public String getType() - { - return _S__78_STOPROTATION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java index fc6233c3b4..23b60d35ed 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class SunRise extends ServerBasePacket { - private static final String _S__28_SUNRISE = "[S] 28 SunRise"; - @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(40); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__28_SUNRISE; + writeC(0x28); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java index 923a957fb0..d6a77281a1 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java @@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; public class SunSet extends ServerBasePacket { - private static final String _S__29_SUNSET = "[S] 29 SunSet"; - @Override - public byte[] getContent() + public void writeImpl() { - _bao.write(41); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__29_SUNSET; + writeC(0x29); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 2e902f47e5..aa8551db47 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -21,8 +21,6 @@ import java.util.Vector; public class SystemMessage extends ServerBasePacket { - private static final String _S__7A_SYSTEMMESSAGE = "[S] 7A SystemMessage"; - public static final int S1_IS_NOT_ONLINE = 3; public static final int CANNOT_INVITE_YOURSELF = 4; public static final int S1_WORKING_WITH_ANOTHER_CLAN = 10; @@ -162,44 +160,35 @@ public class SystemMessage extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(122); + writeC(0x7A); writeD(_messageId); writeD(_types.size()); - block5: for (int i = 0; i < _types.size(); ++i) + for (int i = 0; i < _types.size(); ++i) { final int t = _types.get(i); writeD(t); switch (t) { - case 0: + case TYPE_TEXT: { writeS("" + _values.get(i)); - continue block5; + continue; } - case 1: - case 2: - case 3: + case TYPE_NUMBER: + case TYPE_NPC_NAME: + case TYPE_ITEM_NAME: { - final int t1 = (Integer) _values.get(i); - writeD(t1); - continue block5; + writeD((Integer) _values.get(i)); + continue; } - case 4: + case TYPE_SKILL_NAME: { - final int t1 = (Integer) _values.get(i); - writeD(t1); + writeD((Integer) _values.get(i)); writeD(1); } } } - return getBytes(); - } - - @Override - public String getType() - { - return _S__7A_SYSTEMMESSAGE; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index 7503ae3e06..fb305fd5c2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; public class TargetSelected extends ServerBasePacket { - private static final String _S__39_TARGETSELECTED = "[S] 39 TargetSelected"; private final int _objectId; private final int _targetId; private final int _x; @@ -36,20 +35,13 @@ public class TargetSelected extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(57); + writeC(0x39); writeD(_objectId); writeD(_targetId); writeD(_x); writeD(_y); writeD(_z); - return getBytes(); - } - - @Override - public String getType() - { - return _S__39_TARGETSELECTED; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index a0dd59cb78..0dde422428 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class TargetUnselected extends ServerBasePacket { - private static final String _S__3A_TARGETUNSELECTED = "[S] 3A TargetUnselected"; private final Creature _target; private final int _x; private final int _y; @@ -36,20 +35,13 @@ public class TargetUnselected extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(58); + writeC(0x3A); writeD(_target.getObjectId()); writeD(_x); writeD(_y); writeD(_z); writeD(_target.getTargetId()); - return getBytes(); - } - - @Override - public String getType() - { - return _S__3A_TARGETUNSELECTED; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index a920a2715e..628356ac6e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.WorldObject; public class TeleportToLocation extends ServerBasePacket { - private static final String _S__38_TELEPORTTOLOCATION = "[S] 38 TeleportToLocation"; private final int _targetId; private final int _x; private final int _y; @@ -36,19 +35,12 @@ public class TeleportToLocation extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(56); + writeC(0x38); writeD(_targetId); writeD(_x); writeD(_y); writeD(_z); - return getBytes(); - } - - @Override - public String getType() - { - return _S__38_TELEPORTTOLOCATION; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index e96e880f49..7fd4430800 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class TradeOtherAdd extends ServerBasePacket { - private static final String _S__31_TRADEOTHERADD = "[S] 31 TradeOtherAdd"; private final ItemInstance temp; private final int _amount; @@ -32,9 +31,9 @@ public class TradeOtherAdd extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(49); + writeC(0x31); writeH(1); final int type = temp.getItem().getType1(); writeH(type); @@ -47,12 +46,5 @@ public class TradeOtherAdd extends ServerBasePacket writeH(temp.getEnchantLevel()); writeH(0); writeH(0); - return getBytes(); - } - - @Override - public String getType() - { - return _S__31_TRADEOTHERADD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 40dceb992b..b671ddbc4b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; public class TradeOwnAdd extends ServerBasePacket { - private static final String _S__30_TRADEOWNADD = "[S] 30 TradeOwnAdd"; private final ItemInstance temp; private final int _amount; @@ -32,9 +31,9 @@ public class TradeOwnAdd extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(48); + writeC(0x30); writeH(1); final int type = temp.getItem().getType1(); writeH(type); @@ -47,12 +46,5 @@ public class TradeOwnAdd extends ServerBasePacket writeH(temp.getEnchantLevel()); writeH(0); writeH(0); - return getBytes(); - } - - @Override - public String getType() - { - return _S__30_TRADEOWNADD; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index d97a14e897..c4e009e8cb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class TradeStart extends ServerBasePacket { - private static final String _S__2E_TRADESTART = "[S] 2E TradeStart"; private final PlayerInstance _me; private final List _tradelist = new ArrayList<>(); @@ -35,9 +34,9 @@ public class TradeStart extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(46); + writeC(0x2E); writeD(_me.getTransactionRequester().getObjectId()); int count = _me.getInventory().getSize(); for (ItemInstance item : _me.getInventory().getItems()) @@ -65,12 +64,5 @@ public class TradeStart extends ServerBasePacket writeH(0); writeH(0); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__2E_TRADESTART; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index e5e911033e..72a9241b53 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class UserInfo extends ServerBasePacket { - private static final String _S__04_USERINFO = "[S] 04 UserInfo"; private final PlayerInstance _cha; public UserInfo(PlayerInstance cha) @@ -31,7 +30,7 @@ public class UserInfo extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { writeC(0x04); writeD(_cha.getX()); @@ -147,12 +146,5 @@ public class UserInfo extends ServerBasePacket writeD(_cha.getPvpKills()); writeH(0); writeC(0); - return _bao.toByteArray(); - } - - @Override - public String getType() - { - return _S__04_USERINFO; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 99936e2931..7cb042a026 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class WareHouseDepositList extends ServerBasePacket { - private static final String _S__53_WAREHOUSEDEPOSITLIST = "[S] 53 WareHouseDepositList"; private final PlayerInstance _cha; private final int _money; @@ -36,10 +35,10 @@ public class WareHouseDepositList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { int i; - writeC(83); + writeC(0x53); writeD(_money); final List itemlist = new ArrayList<>(); int count = _cha.getInventory().getSize(); @@ -68,12 +67,5 @@ public class WareHouseDepositList extends ServerBasePacket writeH(200); writeD(temp.getItemId()); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__53_WAREHOUSEDEPOSITLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index cedc991f3c..fa9f8a81fa 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class WareHouseWithdrawalList extends ServerBasePacket { - private static final String _S__54_WAREHOUSEWITHDRAWALLIST = "[S] 54 WareHouseWithdrawalList"; private final PlayerInstance _cha; private final int _money; @@ -35,9 +34,9 @@ public class WareHouseWithdrawalList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(84); + writeC(0x54); writeD(_money); final int count = _cha.getWarehouse().getSize(); writeH(count); @@ -57,12 +56,5 @@ public class WareHouseWithdrawalList extends ServerBasePacket writeH(200); writeD(temp.getItemId()); } - return getBytes(); - } - - @Override - public String getType() - { - return _S__54_WAREHOUSEWITHDRAWALLIST; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java index 937cdb5b61..445027d482 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java @@ -118,7 +118,7 @@ public class ClientThread extends Thread final int packetType = decrypt[0] & 255; switch (packetType) { - case 0: + case 0x00: { final RequestAuthLogin ral = new RequestAuthLogin(decrypt); account = ral.getUser().toLowerCase(); @@ -160,14 +160,14 @@ public class ClientThread extends Thread sendPacket(lok); break; } - case 2: + case 0x02: { // RequestServerLogin rsl = new RequestServerLogin(decrypt); final PlayOk po = new PlayOk(sessionKey); sendPacket(po); break; } - case 5: + case 0x05: { // RequestServerList rsl = new RequestServerList(decrypt); final ServerList sl = new ServerList(); @@ -225,9 +225,10 @@ public class ClientThread extends Thread } } - private void sendPacket(ServerBasePacket sl) throws IOException + private void sendPacket(ServerBasePacket packet) throws IOException { - byte[] data = sl.getContent(); + packet.writeImpl(); + byte[] data = packet.getBytes(); _crypt.checksum(data); data = _crypt.crypt(data); final int len = data.length + 2; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 48861b47a3..5a2b5268ff 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -26,15 +26,17 @@ public class LoginFail extends ServerBasePacket public static int REASON_PASS_WRONG = 2; public static int REASON_SYSTEM_ERROR = 1; + private final int _reason; + public LoginFail(int reason) { - writeC(1); - writeD(reason); + _reason = reason; } @Override - public byte[] getContent() + public void writeImpl() { - return getBytes(); + writeC(0x01); + writeD(_reason); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java index f9bf3cc727..b68a4b9a24 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java @@ -19,9 +19,10 @@ package org.l2jmobius.loginserver.network.serverpackets; public class LoginOk extends ServerBasePacket { - public LoginOk() + @Override + public void writeImpl() { - writeC(3); + writeC(0x03); writeD(1431655765); writeD(1145324612); writeD(0); @@ -31,10 +32,4 @@ public class LoginOk extends ServerBasePacket writeD(0); writeD(2); } - - @Override - public byte[] getContent() - { - return getBytes(); - } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java index af52100dbc..b3adf454b8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java @@ -25,15 +25,17 @@ public class PlayFail extends ServerBasePacket public static int REASON3 = 3; public static int REASON4 = 4; + private final int _reason; + public PlayFail(int reason) { - writeC(6); - writeC(reason); + _reason = reason; } @Override - public byte[] getContent() + public void writeImpl() { - return getBytes(); + writeC(0x06); + writeC(_reason); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java index e8509f70ac..60f956823d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java @@ -19,16 +19,18 @@ package org.l2jmobius.loginserver.network.serverpackets; public class PlayOk extends ServerBasePacket { + private final int _sessionKey; + public PlayOk(int sessionKey) { - writeC(7); - writeD(sessionKey); - writeD(1432778632); + _sessionKey = sessionKey; } @Override - public byte[] getContent() + public void writeImpl() { - return getBytes(); + writeC(0x07); + writeD(_sessionKey); + writeD(1432778632); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java index 5d038ac4bf..667c00e116 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java @@ -18,15 +18,10 @@ package org.l2jmobius.loginserver.network.serverpackets; import java.io.ByteArrayOutputStream; -import java.io.IOException; public abstract class ServerBasePacket { - ByteArrayOutputStream _bao = new ByteArrayOutputStream(); - - protected ServerBasePacket() - { - } + private final ByteArrayOutputStream _bao = new ByteArrayOutputStream(); protected void writeD(int value) { @@ -96,5 +91,5 @@ public abstract class ServerBasePacket return _bao.toByteArray(); } - public abstract byte[] getContent() throws IOException; + public abstract void writeImpl(); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java index 9e6c50a621..e67b735dc3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -32,9 +32,9 @@ public class ServerList extends ServerBasePacket } @Override - public byte[] getContent() + public void writeImpl() { - writeC(4); + writeC(0x04); writeC(_servers.size()); writeC(0); for (int i = 0; i < _servers.size(); ++i) @@ -78,7 +78,6 @@ public class ServerList extends ServerBasePacket } writeD(0); } - return getBytes(); } class ServerData