Network cleanup.

This commit is contained in:
MobiusDevelopment
2019-11-25 01:18:34 +00:00
parent 07cb5d7dae
commit 14aedd35fb
200 changed files with 517 additions and 2211 deletions

View File

@@ -84,84 +84,21 @@ public class ClientThread extends Thread
long starttime = System.currentTimeMillis(); long starttime = System.currentTimeMillis();
try try
{ {
try do
{ {
do if ((_activeChar != null) && (_autoSaveTime < (System.currentTimeMillis() - starttime)))
{ {
if ((_activeChar != null) && (_autoSaveTime < (System.currentTimeMillis() - starttime))) saveCharToDisk(_activeChar);
{ starttime = System.currentTimeMillis();
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());
} }
final byte[] decrypt = _connection.getPacket();
_handler.handlePacket(decrypt);
} }
while (true);
} }
catch (Throwable throwable) catch (Exception e)
{ {
_log.warning(e.toString());
try try
{ {
if (_activeChar != null) if (_activeChar != null)
@@ -184,15 +121,14 @@ public class ClientThread extends Thread
try try
{ {
} }
catch (Throwable throwable2) catch (Throwable throwable)
{ {
LoginController.getInstance().removeGameServerLogin(getLoginName()); LoginController.getInstance().removeGameServerLogin(getLoginName());
throw throwable2; throw throwable;
} }
_log.warning(e1.toString()); _log.warning(e1.toString());
LoginController.getInstance().removeGameServerLogin(getLoginName()); LoginController.getInstance().removeGameServerLogin(getLoginName());
} }
throw throwable;
} }
} }
@@ -216,10 +152,9 @@ public class ClientThread extends Thread
private void storeShortcuts(PlayerInstance cha, File saveFile) private void storeShortcuts(PlayerInstance cha, File saveFile)
{ {
OutputStreamWriter out = null;
try try
{ {
out = new FileWriter(saveFile); final OutputStreamWriter out = new FileWriter(saveFile);
out.write("slot;type;id;level;unknown\r\n"); out.write("slot;type;id;level;unknown\r\n");
for (ShortCut sc : cha.getAllShortCuts()) for (ShortCut sc : cha.getAllShortCuts())
{ {
@@ -229,24 +164,12 @@ public class ClientThread extends Thread
out.write(sc.getLevel() + ";"); out.write(sc.getLevel() + ";");
out.write(sc.getUnk() + "\r\n"); out.write(sc.getUnk() + "\r\n");
} }
out.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not store shortcuts:" + e.toString()); _log.warning("could not store shortcuts:" + e.toString());
} }
finally
{
try
{
if (out != null)
{
out.close();
}
}
catch (Exception e1)
{
}
}
} }
public void deleteCharFromDisk(int charslot) public void deleteCharFromDisk(int charslot)
@@ -304,13 +227,12 @@ public class ClientThread extends Thread
private void restoreShortCuts(File file, PlayerInstance restored) private void restoreShortCuts(File file, PlayerInstance restored)
{ {
BufferedReader lnr = null;
try try
{ {
lnr = new LineNumberReader(new BufferedReader(new FileReader(file))); final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(file)));
((LineNumberReader) lnr).readLine(); lnr.readLine();
String line = null; String line = null;
while ((line = ((LineNumberReader) lnr).readLine()) != null) while ((line = lnr.readLine()) != null)
{ {
final StringTokenizer st = new StringTokenizer(line, ";"); final StringTokenizer st = new StringTokenizer(line, ";");
final int slot = Integer.parseInt(st.nextToken()); 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); final ShortCut sc = new ShortCut(slot, type, id, level, unk);
restored.registerShortCut(sc); restored.registerShortCut(sc);
} }
lnr.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not restore shortcuts:" + 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) private void storeInventory(PlayerInstance cha, File saveFile)
{ {
OutputStreamWriter out = null;
try try
{ {
out = new FileWriter(saveFile); final OutputStreamWriter out = new FileWriter(saveFile);
out.write("objectId;itemId;name;count;price;equipSlot;\r\n"); out.write("objectId;itemId;name;count;price;equipSlot;\r\n");
for (ItemInstance item : cha.getInventory().getItems()) for (ItemInstance item : cha.getInventory().getItems())
{ {
@@ -362,32 +271,19 @@ public class ClientThread extends Thread
} }
out.write(item.getEquipSlot() + "\r\n"); out.write(item.getEquipSlot() + "\r\n");
} }
out.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not store inventory:" + 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) private void storeSkills(PlayerInstance cha, File saveFile)
{ {
OutputStreamWriter out = null;
try try
{ {
out = new FileWriter(saveFile); final OutputStreamWriter out = new FileWriter(saveFile);
out.write("skillId;skillLevel;skillName\r\n"); out.write("skillId;skillLevel;skillName\r\n");
for (Skill skill : cha.getAllSkills()) for (Skill skill : cha.getAllSkills())
{ {
@@ -395,32 +291,19 @@ public class ClientThread extends Thread
out.write(skill.getLevel() + ";"); out.write(skill.getLevel() + ";");
out.write(skill.getName() + "\r\n"); out.write(skill.getName() + "\r\n");
} }
out.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not store skills:" + 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) private void storeChar(PlayerInstance cha, File charFile)
{ {
FileWriter out = null;
try 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("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.getObjectId() + ";");
out.write(cha.getName() + ";"); out.write(cha.getName() + ";");
@@ -471,35 +354,22 @@ public class ClientThread extends Thread
out.write(cha.getCanCraft() + ";"); out.write(cha.getCanCraft() + ";");
out.write(" " + cha.getTitle() + ";"); out.write(" " + cha.getTitle() + ";");
out.write(cha.getAllyId() + ";"); out.write(cha.getAllyId() + ";");
out.close();
} }
catch (IOException e) catch (IOException e)
{ {
_log.warning("could not store char data:" + 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) private void restoreWarehouse(File wfile, PlayerInstance cha)
{ {
BufferedReader lnr = null;
try try
{ {
lnr = new LineNumberReader(new BufferedReader(new FileReader(wfile))); final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(wfile)));
((LineNumberReader) lnr).readLine(); lnr.readLine();
String line = null; String line = null;
while ((line = ((LineNumberReader) lnr).readLine()) != null) while ((line = lnr.readLine()) != null)
{ {
final StringTokenizer st = new StringTokenizer(line, ";"); final StringTokenizer st = new StringTokenizer(line, ";");
final ItemInstance item = new ItemInstance(); final ItemInstance item = new ItemInstance();
@@ -512,33 +382,20 @@ public class ClientThread extends Thread
cha.getWarehouse().addItem(item); cha.getWarehouse().addItem(item);
_world.storeObject(item); _world.storeObject(item);
} }
lnr.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not restore warehouse:" + 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) private void storeWarehouse(PlayerInstance cha, File saveFile)
{ {
OutputStreamWriter out = null;
try try
{ {
final List<ItemInstance> items = cha.getWarehouse().getItems(); final List<ItemInstance> items = cha.getWarehouse().getItems();
out = new FileWriter(saveFile); final OutputStreamWriter out = new FileWriter(saveFile);
out.write("#objectId;itemId;name;count;\n"); out.write("#objectId;itemId;name;count;\n");
for (int i = 0; i < items.size(); ++i) 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.getItem().getName() + ";");
out.write(item.getCount() + "\n"); out.write(item.getCount() + "\n");
} }
out.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not store warehouse:" + 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) private void restoreInventory(File inventory, PlayerInstance cha)
{ {
BufferedReader lnr = null;
try try
{ {
lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory))); final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory)));
((LineNumberReader) lnr).readLine(); lnr.readLine();
String line = null; String line = null;
while ((line = ((LineNumberReader) lnr).readLine()) != null) while ((line = lnr.readLine()) != null)
{ {
final StringTokenizer st = new StringTokenizer(line, ";"); final StringTokenizer st = new StringTokenizer(line, ";");
final ItemInstance item = new ItemInstance(); final ItemInstance item = new ItemInstance();
@@ -595,35 +439,22 @@ public class ClientThread extends Thread
} }
_world.storeObject(item); _world.storeObject(item);
} }
lnr.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not restore inventory:" + 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) private void restoreSkills(File inventory, PlayerInstance cha)
{ {
BufferedReader lnr = null;
try try
{ {
lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory))); final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(inventory)));
((LineNumberReader) lnr).readLine(); lnr.readLine();
String line = null; String line = null;
while ((line = ((LineNumberReader) lnr).readLine()) != null) while ((line = lnr.readLine()) != null)
{ {
final StringTokenizer st = new StringTokenizer(line, ";"); final StringTokenizer st = new StringTokenizer(line, ";");
final int id = Integer.parseInt(st.nextToken()); final int id = Integer.parseInt(st.nextToken());
@@ -632,35 +463,22 @@ public class ClientThread extends Thread
final Skill skill = SkillTable.getInstance().getInfo(id, level); final Skill skill = SkillTable.getInstance().getInfo(id, level);
cha.addSkill(skill); cha.addSkill(skill);
} }
lnr.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not restore skills:" + e); _log.warning("could not restore skills:" + e);
} }
finally
{
try
{
if (lnr != null)
{
lnr.close();
}
}
catch (Exception e1)
{
}
}
} }
private PlayerInstance restoreChar(File charFile) private PlayerInstance restoreChar(File charFile)
{ {
final PlayerInstance oldChar = new PlayerInstance(); final PlayerInstance oldChar = new PlayerInstance();
BufferedReader lnr = null;
try try
{ {
lnr = new LineNumberReader(new BufferedReader(new FileReader(charFile))); final LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(charFile)));
((LineNumberReader) lnr).readLine(); lnr.readLine();
final String line = ((LineNumberReader) lnr).readLine(); final String line = lnr.readLine();
final StringTokenizer st = new StringTokenizer(line, ";"); final StringTokenizer st = new StringTokenizer(line, ";");
oldChar.setObjectId(Integer.parseInt(st.nextToken())); oldChar.setObjectId(Integer.parseInt(st.nextToken()));
oldChar.setName(st.nextToken()); oldChar.setName(st.nextToken());
@@ -714,24 +532,12 @@ public class ClientThread extends Thread
oldChar.setAllyId(Integer.parseInt(st.nextToken())); oldChar.setAllyId(Integer.parseInt(st.nextToken()));
World.getInstance().storeObject(oldChar); World.getInstance().storeObject(oldChar);
oldChar.setUptime(System.currentTimeMillis()); oldChar.setUptime(System.currentTimeMillis());
lnr.close();
} }
catch (Exception e) catch (Exception e)
{ {
_log.warning("could not restore char data:" + e); _log.warning("could not restore char data:" + e);
} }
finally
{
try
{
if (lnr != null)
{
lnr.close();
}
}
catch (Exception e1)
{
}
}
return oldChar; return oldChar;
} }

View File

@@ -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(); packet.writeImpl();
this.sendPacket(data); sendPacket(packet.getBytes());
} }
public void activateCryptKey() public void activateCryptKey()

View File

@@ -118,412 +118,412 @@ public class PacketHandler
final int id = data[0] & 0xFF; final int id = data[0] & 0xFF;
switch (id) switch (id)
{ {
case 0: case 0x00:
{ {
new ProtocolVersion(data, _client); new ProtocolVersion(data, _client);
break; break;
} }
case 1: case 0x01:
{ {
new MoveBackwardToLocation(data, _client); new MoveBackwardToLocation(data, _client);
break; break;
} }
case 3: case 0x03:
{ {
new EnterWorld(data, _client); new EnterWorld(data, _client);
break; break;
} }
case 4: case 0x04:
{ {
new Action(data, _client); new Action(data, _client);
break; break;
} }
case 8: case 0x08:
{ {
new AuthLogin(data, _client); new AuthLogin(data, _client);
break; break;
} }
case 9: case 0x09:
{ {
new Logout(data, _client); new Logout(data, _client);
break; break;
} }
case 10: case 0x0A:
{ {
new AttackRequest(data, _client); new AttackRequest(data, _client);
break; break;
} }
case 11: case 0x0B:
{ {
new CharacterCreate(data, _client); new CharacterCreate(data, _client);
break; break;
} }
case 12: case 0x0C:
{ {
new CharacterDelete(data, _client); new CharacterDelete(data, _client);
break; break;
} }
case 13: case 0x0D:
{ {
new CharacterSelected(data, _client); new CharacterSelected(data, _client);
break; break;
} }
case 14: case 0x0E:
{ {
new NewCharacter(data, _client); new NewCharacter(data, _client);
break; break;
} }
case 15: case 0x0F:
{ {
new RequestItemList(data, _client); new RequestItemList(data, _client);
break; break;
} }
case 17: case 0x11:
{ {
new RequestUnEquipItem(data, _client); new RequestUnEquipItem(data, _client);
break; break;
} }
case 18: case 0x12:
{ {
new RequestDropItem(data, _client); new RequestDropItem(data, _client);
break; break;
} }
case 20: case 0x14:
{ {
new UseItem(data, _client); new UseItem(data, _client);
break; break;
} }
case 21: case 0x15:
{ {
new TradeRequest(data, _client); new TradeRequest(data, _client);
break; break;
} }
case 22: case 0x16:
{ {
new AddTradeItem(data, _client); new AddTradeItem(data, _client);
break; break;
} }
case 23: case 0x17:
{ {
new TradeDone(data, _client); new TradeDone(data, _client);
break; break;
} }
case 27: case 0x1B:
{ {
new RequestSocialAction(data, _client); new RequestSocialAction(data, _client);
break; break;
} }
case 28: case 0x1C:
{ {
new ChangeMoveType2(data, _client); new ChangeMoveType2(data, _client);
break; break;
} }
case 29: case 0x1D:
{ {
new ChangeWaitType2(data, _client); new ChangeWaitType2(data, _client);
break; break;
} }
case 30: case 0x1E:
{ {
new RequestSellItem(data, _client); new RequestSellItem(data, _client);
break; break;
} }
case 31: case 0x1F:
{ {
new RequestBuyItem(data, _client); new RequestBuyItem(data, _client);
break; break;
} }
case 33: case 0x21:
{ {
new RequestBypassToServer(data, _client); new RequestBypassToServer(data, _client);
break; break;
} }
case 36: case 0x24:
{ {
new RequestJoinPledge(data, _client); new RequestJoinPledge(data, _client);
break; break;
} }
case 37: case 0x25:
{ {
new RequestAnswerJoinPledge(data, _client); new RequestAnswerJoinPledge(data, _client);
break; break;
} }
case 38: case 0x26:
{ {
new RequestWithdrawalPledge(data, _client); new RequestWithdrawalPledge(data, _client);
break; break;
} }
case 39: case 0x27:
{ {
new RequestOustPledgeMember(data, _client); new RequestOustPledgeMember(data, _client);
break; break;
} }
case 41: case 0x29:
{ {
new RequestJoinParty(data, _client); new RequestJoinParty(data, _client);
break; break;
} }
case 42: case 0x2A:
{ {
new RequestAnswerJoinParty(data, _client); new RequestAnswerJoinParty(data, _client);
break; break;
} }
case 43: case 0x2B:
{ {
new RequestWithDrawalParty(data, _client.getActiveChar()); new RequestWithDrawalParty(data, _client);
break; break;
} }
case 44: case 0x2C:
{ {
new RequestOustPartyMember(data, _client); new RequestOustPartyMember(data, _client);
break; break;
} }
case 47: case 0x2F:
{ {
new RequestMagicSkillUse(data, _client); new RequestMagicSkillUse(data, _client);
break; break;
} }
case 48: case 0x30:
{ {
new Appearing(data, _client); new Appearing(data, _client);
break; break;
} }
case 49: case 0x31:
{ {
new SendWareHouseDepositList(data, _client); new SendWareHouseDepositList(data, _client);
break; break;
} }
case 50: case 0x32:
{ {
new SendWareHouseWithDrawList(data, _client); new SendWareHouseWithDrawList(data, _client);
break; break;
} }
case 51: case 0x33:
{ {
new RequestShortCutReg(data, _client); new RequestShortCutReg(data, _client);
break; break;
} }
case 53: case 0x35:
{ {
new RequestShortCutDel(data, _client); new RequestShortCutDel(data, _client);
break; break;
} }
case 54: case 0x36:
{ {
new StopMove(data, _client); new StopMove(data, _client);
break; break;
} }
case 55: case 0x37:
{ {
new RequestTargetCanceld(data, _client); new RequestTargetCanceld(data, _client);
break; break;
} }
case 56: case 0x38:
{ {
new Say2(data, _client); new Say2(data, _client);
break; break;
} }
case 60: case 0x3C:
{ {
new RequestPledgeMemberList(data, _client); new RequestPledgeMemberList(data, _client);
break; break;
} }
case 63: case 0x3F:
{ {
new RequestSkillList(data, _client); new RequestSkillList(data, _client);
break; break;
} }
case 68: case 0x44:
{ {
new AnswerTradeRequest(data, _client); new AnswerTradeRequest(data, _client);
break; break;
} }
case 69: case 0x45:
{ {
new RequestActionUse(data, _client); new RequestActionUse(data, _client);
break; break;
} }
case 70: case 0x46:
{ {
new RequestRestart(data, _client); new RequestRestart(data, _client);
break; break;
} }
case 72: case 0x48:
{ {
new ValidatePosition(data, _client); new ValidatePosition(data, _client);
break; break;
} }
case 74: case 0x4A:
{ {
new StartRotating(data, _client); new StartRotating(data, _client);
break; break;
} }
case 75: case 0x4B:
{ {
new FinishRotating(data, _client); new FinishRotating(data, _client);
break; break;
} }
case 83: case 0x53:
{ {
new RequestSetPledgeCrest(data, _client); new RequestSetPledgeCrest(data, _client);
break; break;
} }
case 85: case 0x55:
{ {
new RequestGiveNickName(data, _client); new RequestGiveNickName(data, _client);
break; break;
} }
case 87: case 0x57:
{ {
new RequestShowBoard(data, _client); new RequestShowBoard(data, _client);
break; break;
} }
case 89: case 0x59:
{ {
new RequestDestroyItem(data, _client); new RequestDestroyItem(data, _client);
break; break;
} }
case 91: case 0x5B:
{ {
new SendBypassBuildCmd(data, _client); new SendBypassBuildCmd(data, _client);
break; break;
} }
case 98: case 0x62:
{ {
new CharacterRestore(data, _client); new CharacterRestore(data, _client);
break; break;
} }
case 99: case 0x63:
{ {
new RequestQuestList(data, _client); new RequestQuestList(data, _client);
break; break;
} }
case 102: case 0x66:
{ {
new RequestPledgeInfo(data, _client); new RequestPledgeInfo(data, _client);
break; break;
} }
case 104: case 0x68:
{ {
new RequestPledgeCrest(data, _client); new RequestPledgeCrest(data, _client);
break; break;
} }
case 107: case 0x6B:
{ {
new RequestAquireSkillInfo(data, _client); new RequestAquireSkillInfo(data, _client);
break; break;
} }
case 108: case 0x6C:
{ {
new RequestAquireSkill(data, _client); new RequestAquireSkill(data, _client);
break; break;
} }
case 109: case 0x6D:
{ {
new RequestRestartPoint(data, _client); new RequestRestartPoint(data, _client);
break; break;
} }
case 110: case 0x6E:
{ {
new RequestGMCommand(data, _client); new RequestGMCommand(data, _client);
break; break;
} }
case 111: case 0x6F:
{ {
new RequestPartyMatchConfig(data, _client); new RequestPartyMatchConfig(data, _client);
break; break;
} }
case 112: case 0x70:
{ {
new RequestPartyMatchList(data, _client); new RequestPartyMatchList(data, _client);
break; break;
} }
case 113: case 0x71:
{ {
new RequestPartyMatchDetail(data, _client); new RequestPartyMatchDetail(data, _client);
break; break;
} }
case 115: case 0x73:
{ {
new RequestPrivateStoreManage(data, _client); new RequestPrivateStoreManage(data, _client);
break; break;
} }
case 116: case 0x74:
{ {
new SetPrivateStoreListSell(data, _client); new SetPrivateStoreListSell(data, _client);
break; break;
} }
case 118: case 0x76:
{ {
new RequestPrivateStoreQuitSell(data, _client); new RequestPrivateStoreQuitSell(data, _client);
break; break;
} }
case 119: case 0x77:
{ {
new SetPrivateStoreMsgSell(data, _client); new SetPrivateStoreMsgSell(data, _client);
break; break;
} }
case 121: case 0x79:
{ {
new SendPrivateStoreBuyList(data, _client); new SendPrivateStoreBuyList(data, _client);
break; break;
} }
case 129: case 0x81:
{ {
new RequestGmList(data, _client); new RequestGmList(data, _client);
break; break;
} }
case 136: case 0x88:
{ {
new RequestAllyCrest(data, _client); new RequestAllyCrest(data, _client);
break; break;
} }
case 137: case 0x89:
{ {
new RequestChangePetName(data, _client); new RequestChangePetName(data, _client);
break; break;
} }
case 139: case 0x8B:
{ {
new RequestGiveItemToPet(data, _client); new RequestGiveItemToPet(data, _client);
break; break;
} }
case 140: case 0x8C:
{ {
new RequestGetItemFromPet(data, _client); new RequestGetItemFromPet(data, _client);
break; break;
} }
case 143: case 0x8F:
{ {
new RequestPetGetItem(data, _client); new RequestPetGetItem(data, _client);
break; break;
} }
case 144: case 0x90:
{ {
new RequestPrivateStoreBuyManage(data, _client); new RequestPrivateStoreBuyManage(data, _client);
break; break;
} }
case 145: case 0x91:
{ {
new SetPrivateStoreListBuy(data, _client); new SetPrivateStoreListBuy(data, _client);
break; break;
} }
case 147: case 0x93:
{ {
new RequestPrivateStoreQuitBuy(data, _client); new RequestPrivateStoreQuitBuy(data, _client);
break; break;
} }
case 148: case 0x94:
{ {
new SetPrivateStoreMsgBuy(data, _client); new SetPrivateStoreMsgBuy(data, _client);
break; break;
} }
case 150: case 0x96:
{ {
new SendPrivateStoreBuyBuyList(data, _client); new SendPrivateStoreBuyBuyList(data, _client);
break; break;
} }
case 157: case 0x9D:
{ {
// _log.warning("Request Skill Cool Time .. ignored"); // _log.warning("Request Skill Cool Time .. ignored");
break; break;

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
public class Action extends ClientBasePacket public class Action extends ClientBasePacket
{ {
private static final String ACTION__C__04 = "[C] 04 Action";
public Action(byte[] decrypt, ClientThread client) public Action(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -60,10 +58,4 @@ public class Action extends ClientBasePacket
activeChar.sendPacket(new ActionFailed()); activeChar.sendPacket(new ActionFailed());
} }
} }
@Override
public String getType()
{
return ACTION__C__04;
}
} }

View File

@@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd;
public class AddTradeItem extends ClientBasePacket public class AddTradeItem extends ClientBasePacket
{ {
private static final String _C__16_ADDTRADEITEM = "[C] 16 AddTradeItem";
public AddTradeItem(byte[] decrypt, ClientThread client) public AddTradeItem(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -96,10 +94,4 @@ public class AddTradeItem extends ClientBasePacket
player.getTradeList().getItems().clear(); player.getTradeList().getItems().clear();
} }
} }
@Override
public String getType()
{
return _C__16_ADDTRADEITEM;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeStart;
public class AnswerTradeRequest extends ClientBasePacket public class AnswerTradeRequest extends ClientBasePacket
{ {
private static final String _C__40_ANSWERTRADEREQUEST = "[C] 40 AnswerTradeRequest";
public AnswerTradeRequest(byte[] decrypt, ClientThread client) public AnswerTradeRequest(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -72,10 +70,4 @@ public class AnswerTradeRequest extends ClientBasePacket
player.setTransactionRequester(null); player.setTransactionRequester(null);
} }
} }
@Override
public String getType()
{
return _C__40_ANSWERTRADEREQUEST;
}
} }

View File

@@ -31,8 +31,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class Appearing extends ClientBasePacket public class Appearing extends ClientBasePacket
{ {
private static final String _C__30_APPEARING = "[C] 30 Appearing";
public Appearing(byte[] decrypt, ClientThread client) public Appearing(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -72,10 +70,4 @@ public class Appearing extends ClientBasePacket
} }
World.getInstance().addVisibleObject(activeChar); World.getInstance().addVisibleObject(activeChar);
} }
@Override
public String getType()
{
return _C__30_APPEARING;
}
} }

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
public class AttackRequest extends ClientBasePacket public class AttackRequest extends ClientBasePacket
{ {
private static final String _C__0A_ATTACKREQUEST = "[C] 0A AttackRequest";
public AttackRequest(byte[] decrypt, ClientThread client) public AttackRequest(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -39,6 +37,7 @@ public class AttackRequest extends ClientBasePacket
final int originZ = readD(); final int originZ = readD();
@SuppressWarnings("unused") @SuppressWarnings("unused")
final int attackId = readC(); final int attackId = readC();
final PlayerInstance activeChar = client.getActiveChar(); final PlayerInstance activeChar = client.getActiveChar();
final WorldObject target = World.getInstance().findObject(objectId); final WorldObject target = World.getInstance().findObject(objectId);
if ((target != null) && (activeChar.getTarget() != target)) if ((target != null) && (activeChar.getTarget() != target))
@@ -54,10 +53,4 @@ public class AttackRequest extends ClientBasePacket
activeChar.sendPacket(new ActionFailed()); activeChar.sendPacket(new ActionFailed());
} }
} }
@Override
public String getType()
{
return _C__0A_ATTACKREQUEST;
}
} }

View File

@@ -18,6 +18,7 @@
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.ClientThread;
import org.l2jmobius.gameserver.network.serverpackets.AuthLoginFail; import org.l2jmobius.gameserver.network.serverpackets.AuthLoginFail;
@@ -26,7 +27,7 @@ import org.l2jmobius.loginserver.LoginController;
public class AuthLogin extends ClientBasePacket 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 public AuthLogin(byte[] decrypt, ClientThread client) throws IOException
{ {
@@ -59,10 +60,4 @@ public class AuthLogin extends ClientBasePacket
} }
client.setAccessLevel(access); client.setAccessLevel(access);
} }
@Override
public String getType()
{
return _C__08_AUTHLOGIN;
}
} }

View File

@@ -22,21 +22,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ChangeMoveType;
public class ChangeMoveType2 extends ClientBasePacket public class ChangeMoveType2 extends ClientBasePacket
{ {
private static final String _C__1C_CHANGEMOVETYPE2 = "[C] 1C ChangeMoveType2";
public ChangeMoveType2(byte[] decrypt, ClientThread client) public ChangeMoveType2(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
final int type = readD(); final int type = readD();
final ChangeMoveType cmt = new ChangeMoveType(client.getActiveChar(), type); final ChangeMoveType cmt = new ChangeMoveType(client.getActiveChar(), type);
client.getActiveChar().setMoveType(type); client.getActiveChar().setMoveType(type);
client.getActiveChar().sendPacket(cmt); client.getActiveChar().sendPacket(cmt);
client.getActiveChar().broadcastPacket(cmt); client.getActiveChar().broadcastPacket(cmt);
} }
@Override
public String getType()
{
return _C__1C_CHANGEMOVETYPE2;
}
} }

View File

@@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType;
public class ChangeWaitType2 extends ClientBasePacket public class ChangeWaitType2 extends ClientBasePacket
{ {
private static final String _C__1D_CHANGEWAITTYPE2 = "[C] 1D ChangeWaitType2";
public ChangeWaitType2(byte[] decrypt, ClientThread client) public ChangeWaitType2(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -33,10 +31,4 @@ public class ChangeWaitType2 extends ClientBasePacket
client.getActiveChar().sendPacket(cwt); client.getActiveChar().sendPacket(cwt);
client.getActiveChar().broadcastPacket(cwt); client.getActiveChar().broadcastPacket(cwt);
} }
@Override
public String getType()
{
return _C__1D_CHANGEWAITTYPE2;
}
} }

View File

@@ -38,8 +38,6 @@ import org.l2jmobius.gameserver.templates.CharTemplate;
public class CharacterCreate extends ClientBasePacket public class CharacterCreate extends ClientBasePacket
{ {
private static final String _C__0B_CHARACTERCREATE = "[C] 0B CharacterCreate";
public CharacterCreate(byte[] decrypt, ClientThread client) throws IOException public CharacterCreate(byte[] decrypt, ClientThread client) throws IOException
{ {
super(decrypt); super(decrypt);
@@ -57,6 +55,7 @@ public class CharacterCreate extends ClientBasePacket
newChar.setHairStyle(readD()); newChar.setHairStyle(readD());
newChar.setHairColor(readD()); newChar.setHairColor(readD());
newChar.setFace(readD()); newChar.setFace(readD());
if (CharNameTable.getInstance().doesCharNameExist(newChar.getName())) if (CharNameTable.getInstance().doesCharNameExist(newChar.getName()))
{ {
final CharCreateFail ccf = new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS); 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()); final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId());
client.getConnection().sendPacket(cl); client.getConnection().sendPacket(cl);
} }
@Override
public String getType()
{
return _C__0B_CHARACTERCREATE;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo;
public class CharacterDelete extends ClientBasePacket public class CharacterDelete extends ClientBasePacket
{ {
private static final String _C__0C_CHARACTERDELETE = "[C] 0C CharacterDelete";
public CharacterDelete(byte[] decrypt, ClientThread client) throws IOException public CharacterDelete(byte[] decrypt, ClientThread client) throws IOException
{ {
super(decrypt); super(decrypt);
@@ -39,10 +37,4 @@ public class CharacterDelete extends ClientBasePacket
final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId()); final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId());
con.sendPacket(cl); con.sendPacket(cl);
} }
@Override
public String getType()
{
return _C__0C_CHARACTERDELETE;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo;
public class CharacterRestore extends ClientBasePacket public class CharacterRestore extends ClientBasePacket
{ {
private static final String _C__62_CHARACTERRESTORE = "[C] 62 CharacterRestore";
public CharacterRestore(byte[] decrypt, ClientThread client) throws IOException public CharacterRestore(byte[] decrypt, ClientThread client) throws IOException
{ {
super(decrypt); super(decrypt);
@@ -34,10 +32,4 @@ public class CharacterRestore extends ClientBasePacket
final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId()); final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId());
client.getConnection().sendPacket(cl); client.getConnection().sendPacket(cl);
} }
@Override
public String getType()
{
return _C__62_CHARACTERRESTORE;
}
} }

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelected;
public class CharacterSelected extends ClientBasePacket public class CharacterSelected extends ClientBasePacket
{ {
private static final String _C__0D_CHARACTERSELECTED = "[C] 0D CharacterSelected";
public CharacterSelected(byte[] decrypt, ClientThread client) throws IOException public CharacterSelected(byte[] decrypt, ClientThread client) throws IOException
{ {
super(decrypt); super(decrypt);
@@ -38,10 +36,4 @@ public class CharacterSelected extends ClientBasePacket
client.getConnection().sendPacket(cs); client.getConnection().sendPacket(cs);
client.setActiveChar(cha); client.setActiveChar(cha);
} }
@Override
public String getType()
{
return _C__0D_CHARACTERSELECTED;
}
} }

View File

@@ -17,18 +17,13 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
public abstract class ClientBasePacket public abstract class ClientBasePacket
{ {
static Logger _log = Logger.getLogger(ClientBasePacket.class.getName());
private final byte[] _decrypt; private final byte[] _decrypt;
private int _off; private int _off;
public ClientBasePacket(byte[] decrypt) public ClientBasePacket(byte[] decrypt)
{ {
_log.finest(getType());
_decrypt = decrypt; _decrypt = decrypt;
_off = 1; _off = 1;
} }
@@ -88,6 +83,4 @@ public abstract class ClientBasePacket
_off += length; _off += length;
return result; return result;
} }
public abstract String getType();
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.Announcements; import org.l2jmobius.gameserver.Announcements;
import org.l2jmobius.gameserver.data.MapRegionTable; import org.l2jmobius.gameserver.data.MapRegionTable;
import org.l2jmobius.gameserver.managers.GmListManager; import org.l2jmobius.gameserver.managers.GmListManager;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class EnterWorld extends ClientBasePacket 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) public EnterWorld(byte[] decrypt, ClientThread client)
{ {
@@ -112,10 +114,4 @@ public class EnterWorld extends ClientBasePacket
} }
} }
} }
@Override
public String getType()
{
return _C__03_ENTERWORLD;
}
} }

View File

@@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StopRotation;
public class FinishRotating extends ClientBasePacket public class FinishRotating extends ClientBasePacket
{ {
private static final String _C__4B_FINISHROTATING = "[C] 4B FinishRotating";
public FinishRotating(byte[] decrypt, ClientThread client) public FinishRotating(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -34,10 +32,4 @@ public class FinishRotating extends ClientBasePacket
client.getActiveChar().sendPacket(sr); client.getActiveChar().sendPacket(sr);
client.getActiveChar().broadcastPacket(sr); client.getActiveChar().broadcastPacket(sr);
} }
@Override
public String getType()
{
return _C__4B_FINISHROTATING;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class Logout extends ClientBasePacket public class Logout extends ClientBasePacket
{ {
private static final String _C__09_LOGOUT = "[C] 09 Logout";
public Logout(byte[] decrypt, ClientThread client) public Logout(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -51,10 +49,4 @@ public class Logout extends ClientBasePacket
client.saveCharToDisk(player); client.saveCharToDisk(player);
} }
} }
@Override
public String getType()
{
return _C__09_LOGOUT;
}
} }

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.AttackCanceld;
public class MoveBackwardToLocation extends ClientBasePacket public class MoveBackwardToLocation extends ClientBasePacket
{ {
private static final String _C__01_MOVEBACKWARDTOLOC = "[C] 01 MoveBackwardToLoc";
public MoveBackwardToLocation(byte[] decrypt, ClientThread client) public MoveBackwardToLocation(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -67,10 +65,4 @@ public class MoveBackwardToLocation extends ClientBasePacket
activeChar.checkWaterState(); activeChar.checkWaterState();
} }
} }
@Override
public String getType()
{
return _C__01_MOVEBACKWARDTOLOC;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.templates.CharTemplate;
public class NewCharacter extends ClientBasePacket public class NewCharacter extends ClientBasePacket
{ {
private static final String _C__0E_NEWCHARACTER = "[C] 0E NewCharacter";
public NewCharacter(byte[] rawPacket, ClientThread client) throws IOException public NewCharacter(byte[] rawPacket, ClientThread client) throws IOException
{ {
super(rawPacket); super(rawPacket);
@@ -54,10 +52,4 @@ public class NewCharacter extends ClientBasePacket
ct.addChar(template); ct.addChar(template);
client.getConnection().sendPacket(ct); client.getConnection().sendPacket(ct);
} }
@Override
public String getType()
{
return _C__0E_NEWCHARACTER;
}
} }

View File

@@ -18,6 +18,7 @@
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.ClientThread;
@@ -26,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.KeyPacket;
public class ProtocolVersion extends ClientBasePacket 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 public ProtocolVersion(byte[] rawPacket, ClientThread client) throws IOException
{ {
@@ -45,16 +46,8 @@ public class ProtocolVersion extends ClientBasePacket
else else
{ {
final Connection con = client.getConnection(); final Connection con = client.getConnection();
final KeyPacket pk = new KeyPacket(); con.sendPacket(new KeyPacket(con.getCryptKey()));
pk.setKey(con.getCryptKey());
con.sendPacket(pk);
con.activateCryptKey(); con.activateCryptKey();
} }
} }
@Override
public String getType()
{
return _C__00_PROTOCOLVERSION;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.enums.CreatureState; import org.l2jmobius.gameserver.enums.CreatureState;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -28,7 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMove;
public class RequestActionUse extends ClientBasePacket 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) public RequestActionUse(byte[] rawPacket, ClientThread client)
{ {
@@ -132,10 +134,4 @@ public class RequestActionUse extends ClientBasePacket
} }
} }
} }
@Override
public String getType()
{
return _C__45_REQUESTACTIONUSE;
}
} }

View File

@@ -19,13 +19,14 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.ClientThread;
import org.l2jmobius.gameserver.network.serverpackets.AllyCrest; import org.l2jmobius.gameserver.network.serverpackets.AllyCrest;
public class RequestAllyCrest extends ClientBasePacket 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 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()); _log.warning("allycrest file is missing:" + crestFile.getAbsolutePath());
} }
} }
@Override
public String getType()
{
return _C__88_REQUESTALLYCREST;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestAnswerJoinParty extends ClientBasePacket public class RequestAnswerJoinParty extends ClientBasePacket
{ {
private static final String _C__2A_REQUESTANSWERPARTY = "[C] 2A RequestAnswerParty";
public RequestAnswerJoinParty(byte[] decrypt, ClientThread client) public RequestAnswerJoinParty(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -50,10 +48,4 @@ public class RequestAnswerJoinParty extends ClientBasePacket
player.setTransactionRequester(null); player.setTransactionRequester(null);
requestor.setTransactionRequester(null); requestor.setTransactionRequester(null);
} }
@Override
public String getType()
{
return _C__2A_REQUESTANSWERPARTY;
}
} }

View File

@@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestAnswerJoinPledge extends ClientBasePacket public class RequestAnswerJoinPledge extends ClientBasePacket
{ {
private static final String _C__25_REQUESTANSWERJOINPLEDGE = "[C] 25 RequestAnswerJoinPledge";
public RequestAnswerJoinPledge(byte[] rawPacket, ClientThread client) public RequestAnswerJoinPledge(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -71,10 +69,4 @@ public class RequestAnswerJoinPledge extends ClientBasePacket
requestor.setTransactionRequester(null); requestor.setTransactionRequester(null);
activeChar.setTransactionRequester(null); activeChar.setTransactionRequester(null);
} }
@Override
public String getType()
{
return _C__25_REQUESTANSWERJOINPLEDGE;
}
} }

View File

@@ -35,8 +35,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestAquireSkill extends ClientBasePacket public class RequestAquireSkill extends ClientBasePacket
{ {
private static final String _C__6C_REQUESTAQUIRESKILL = "[C] 6C RequestAquireSkill";
public RequestAquireSkill(byte[] rawPacket, ClientThread client) public RequestAquireSkill(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -112,10 +110,4 @@ public class RequestAquireSkill extends ClientBasePacket
} }
player.sendPacket(asl); player.sendPacket(asl);
} }
@Override
public String getType()
{
return _C__6C_REQUESTAQUIRESKILL;
}
} }

View File

@@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.AquireSkillInfo;
public class RequestAquireSkillInfo extends ClientBasePacket public class RequestAquireSkillInfo extends ClientBasePacket
{ {
private static final String _C__6B_REQUESTAQUIRESKILLINFO = "[C] 6B RequestAquireSkillInfo";
public RequestAquireSkillInfo(byte[] rawPacket, ClientThread client) public RequestAquireSkillInfo(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -49,10 +47,4 @@ public class RequestAquireSkillInfo extends ClientBasePacket
} }
activeChar.sendPacket(new AquireSkillInfo(skill.getId(), skill.getLevel(), requiredSp)); activeChar.sendPacket(new AquireSkillInfo(skill.getId(), skill.getLevel(), requiredSp));
} }
@Override
public String getType()
{
return _C__6B_REQUESTAQUIRESKILLINFO;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.TradeController; import org.l2jmobius.gameserver.data.TradeController;
import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList;
@@ -31,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestBuyItem extends ClientBasePacket 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) public RequestBuyItem(byte[] decrypt, ClientThread client)
{ {
@@ -117,10 +119,4 @@ public class RequestBuyItem extends ClientBasePacket
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
player.sendPacket(su); player.sendPacket(su);
} }
@Override
public String getType()
{
return _C__1F_REQUESTBUYITEM;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.AdminCommands; import org.l2jmobius.gameserver.AdminCommands;
import org.l2jmobius.gameserver.managers.CommunityBoardManager; import org.l2jmobius.gameserver.managers.CommunityBoardManager;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
@@ -27,7 +29,7 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestBypassToServer extends ClientBasePacket 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) public RequestBypassToServer(byte[] decrypt, ClientThread client)
{ {
@@ -41,7 +43,14 @@ public class RequestBypassToServer extends ClientBasePacket
} }
else if (command.equals("come_here")) 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_")) else if (command.startsWith("npc_"))
{ {
@@ -63,22 +72,4 @@ public class RequestBypassToServer extends ClientBasePacket
_log.warning("Bad RequestBypassToServer: " + e.toString()); _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;
}
} }

View File

@@ -17,28 +17,23 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; 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.ClientThread;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.PetInfo; import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
public class RequestChangePetName extends ClientBasePacket public class RequestChangePetName extends ClientBasePacket
{ {
private static final String REQUESTCHANGEPETNAME__C__89 = "[C] 89 RequestChangePetName";
public RequestChangePetName(byte[] decrypt, ClientThread client) public RequestChangePetName(byte[] decrypt, ClientThread client)
{ {
super(decrypt); 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()); activeChar.getPet().setName(readS());
client.getActiveChar().getPet().broadcastPacket(new NpcInfo(client.getActiveChar().getPet())); activeChar.getPet().broadcastPacket(new NpcInfo(activeChar.getPet()));
client.getActiveChar().sendPacket(new PetInfo(client.getActiveChar().getPet())); activeChar.sendPacket(new PetInfo(activeChar.getPet()));
} }
} }
@Override
public String getType()
{
return REQUESTCHANGEPETNAME__C__89;
}
} }

View File

@@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestDestroyItem extends ClientBasePacket public class RequestDestroyItem extends ClientBasePacket
{ {
private static final String _C__59_REQUESTDESTROYITEM = "[C] 59 RequestDestroyItem";
public RequestDestroyItem(byte[] decrypt, ClientThread client) public RequestDestroyItem(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -80,10 +78,4 @@ public class RequestDestroyItem extends ClientBasePacket
final World world = World.getInstance(); final World world = World.getInstance();
world.removeObject(removedItem); world.removeObject(removedItem);
} }
@Override
public String getType()
{
return _C__59_REQUESTDESTROYITEM;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
@@ -29,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestDropItem extends ClientBasePacket 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) public RequestDropItem(byte[] decrypt, ClientThread client)
{ {
@@ -111,10 +113,4 @@ public class RequestDropItem extends ClientBasePacket
activeChar.sendPacket(msg); activeChar.sendPacket(msg);
} }
} }
@Override
public String getType()
{
return _C__12_REQUESTDROPITEM;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.GMViewPledgeInfo;
public class RequestGMCommand extends ClientBasePacket public class RequestGMCommand extends ClientBasePacket
{ {
private static final String _C__6E_REQUESTGMCOMMAND = "[C] 6e RequestGMCommand";
public RequestGMCommand(byte[] rawPacket, ClientThread client) public RequestGMCommand(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -71,10 +69,4 @@ public class RequestGMCommand extends ClientBasePacket
} }
} }
} }
@Override
public String getType()
{
return _C__6E_REQUESTGMCOMMAND;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.Inventory;
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.ClientThread;
@@ -25,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetInventoryUpdate;
public class RequestGetItemFromPet extends ClientBasePacket 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) public RequestGetItemFromPet(byte[] decrypt, ClientThread client)
{ {
@@ -64,10 +66,4 @@ public class RequestGetItemFromPet extends ClientBasePacket
client.getActiveChar().sendPacket(playerUI); client.getActiveChar().sendPacket(playerUI);
} }
} }
@Override
public String getType()
{
return REQUESTGETITEMFROMPET__C__8C;
}
} }

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
public class RequestGiveItemToPet extends ClientBasePacket public class RequestGiveItemToPet extends ClientBasePacket
{ {
private static final String REQUESTGETITEMFROMPET__C__8C = "[C] 8C RequestGetItemFromPet";
public RequestGiveItemToPet(byte[] decrypt, ClientThread client) public RequestGiveItemToPet(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -56,10 +54,4 @@ public class RequestGiveItemToPet extends ClientBasePacket
client.getActiveChar().sendPacket(playerUI); client.getActiveChar().sendPacket(playerUI);
} }
} }
@Override
public String getType()
{
return REQUESTGETITEMFROMPET__C__8C;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestGiveNickName extends ClientBasePacket public class RequestGiveNickName extends ClientBasePacket
{ {
private static final String _C__55_REQUESTGIVENICKNAME = "[C] 55 RequestGiveNickName";
public RequestGiveNickName(byte[] rawPacket, ClientThread client) public RequestGiveNickName(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -55,10 +53,4 @@ public class RequestGiveNickName extends ClientBasePacket
} }
} }
} }
@Override
public String getType()
{
return _C__55_REQUESTGIVENICKNAME;
}
} }

View File

@@ -22,17 +22,9 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestGmList extends ClientBasePacket public class RequestGmList extends ClientBasePacket
{ {
private static final String _C__81_REQUESTGMLIST = "[C] 81 RequestGmList";
public RequestGmList(byte[] decrypt, ClientThread client) public RequestGmList(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
GmListManager.getInstance().sendListToPlayer(client.getActiveChar()); GmListManager.getInstance().sendListToPlayer(client.getActiveChar());
} }
@Override
public String getType()
{
return _C__81_REQUESTGMLIST;
}
} }

View File

@@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ItemList;
public class RequestItemList extends ClientBasePacket public class RequestItemList extends ClientBasePacket
{ {
private static final String _C__0F_REQUESTITEMLIST = "[C] 0F RequestItemList";
public RequestItemList(byte[] rawPacket, ClientThread client) public RequestItemList(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -32,10 +30,4 @@ public class RequestItemList extends ClientBasePacket
final PlayerInstance activeChar = client.getActiveChar(); final PlayerInstance activeChar = client.getActiveChar();
activeChar.sendPacket(new ItemList(activeChar, true)); activeChar.sendPacket(new ItemList(activeChar, true));
} }
@Override
public String getType()
{
return _C__0F_REQUESTITEMLIST;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -26,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestJoinParty extends ClientBasePacket 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) 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."); _log.warning(client.getActiveChar().getName() + " invited someone who doesn't know him.");
} }
} }
@Override
public String getType()
{
return _C__29_REQUESTJOINPARTY;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestJoinPledge extends ClientBasePacket public class RequestJoinPledge extends ClientBasePacket
{ {
private static final String _C__24_REQUESTJOINPLEDGE = "[C] 24 RequestJoinPledge";
public RequestJoinPledge(byte[] rawPacket, ClientThread client) public RequestJoinPledge(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -69,10 +67,4 @@ public class RequestJoinPledge extends ClientBasePacket
member.sendPacket(ap); member.sendPacket(ap);
} }
} }
@Override
public String getType()
{
return _C__24_REQUESTJOINPLEDGE;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -24,7 +26,7 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestMagicSkillUse extends ClientBasePacket 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) public RequestMagicSkillUse(byte[] rawPacket, ClientThread client)
{ {
@@ -48,10 +50,4 @@ public class RequestMagicSkillUse extends ClientBasePacket
_log.warning(activeChar + " tried to cast skill " + magicId); _log.warning(activeChar + " tried to cast skill " + magicId);
} }
} }
@Override
public String getType()
{
return _C__2F_REQUESTMAGICSKILLUSE;
}
} }

View File

@@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestOustPartyMember extends ClientBasePacket public class RequestOustPartyMember extends ClientBasePacket
{ {
private static final String _C__2C_REQUESTOUSTPARTYMEMBER = "[C] 2C RequestOustPartyMember";
public RequestOustPartyMember(byte[] decrypt, ClientThread client) public RequestOustPartyMember(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -34,10 +32,4 @@ public class RequestOustPartyMember extends ClientBasePacket
activeChar.getParty().oustPartyMember(name); activeChar.getParty().oustPartyMember(name);
} }
} }
@Override
public String getType()
{
return _C__2C_REQUESTOUSTPARTYMEMBER;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.Clan;
import org.l2jmobius.gameserver.model.ClanMember; import org.l2jmobius.gameserver.model.ClanMember;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -29,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestOustPledgeMember extends ClientBasePacket 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) public RequestOustPledgeMember(byte[] rawPacket, ClientThread client)
{ {
@@ -66,10 +68,4 @@ public class RequestOustPledgeMember extends ClientBasePacket
player.sendPacket(new PledgeShowMemberListDeleteAll()); player.sendPacket(new PledgeShowMemberListDeleteAll());
} }
} }
@Override
public String getType()
{
return _C__27_REQUESTOUSTPLEDGEMEMBER;
}
} }

View File

@@ -21,8 +21,6 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestPartyMatchConfig extends ClientBasePacket public class RequestPartyMatchConfig extends ClientBasePacket
{ {
private static final String _C__6F_REQUESTPARTYMATCHCONFIG = "[C] 6F RequestPartyMatchConfig";
public RequestPartyMatchConfig(byte[] decrypt, ClientThread client) public RequestPartyMatchConfig(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -35,10 +33,4 @@ public class RequestPartyMatchConfig extends ClientBasePacket
client.getActiveChar().setPartyMatchingShowClass(showClass == 1); client.getActiveChar().setPartyMatchingShowClass(showClass == 1);
client.getActiveChar().setPartyMatchingMemo(memo); client.getActiveChar().setPartyMatchingMemo(memo);
} }
@Override
public String getType()
{
return _C__6F_REQUESTPARTYMATCHCONFIG;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail;
public class RequestPartyMatchDetail extends ClientBasePacket public class RequestPartyMatchDetail extends ClientBasePacket
{ {
private static final String _C__71_REQUESTPARTYMATCHDETAIL = "[C] 71 RequestPartyMatchDetail";
public RequestPartyMatchDetail(byte[] decrypt, ClientThread client) throws IOException public RequestPartyMatchDetail(byte[] decrypt, ClientThread client) throws IOException
{ {
super(decrypt); super(decrypt);
@@ -36,10 +34,4 @@ public class RequestPartyMatchDetail extends ClientBasePacket
final PartyMatchDetail details = new PartyMatchDetail(player); final PartyMatchDetail details = new PartyMatchDetail(player);
client.getConnection().sendPacket(details); client.getConnection().sendPacket(details);
} }
@Override
public String getType()
{
return _C__71_REQUESTPARTYMATCHDETAIL;
}
} }

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyMatchList;
public class RequestPartyMatchList extends ClientBasePacket public class RequestPartyMatchList extends ClientBasePacket
{ {
private static final String _C__70_REQUESTPARTYMATCHLIST = "[C] 70 RequestPartyMatchList";
public RequestPartyMatchList(byte[] decrypt, ClientThread client) throws IOException public RequestPartyMatchList(byte[] decrypt, ClientThread client) throws IOException
{ {
super(decrypt); super(decrypt);
@@ -45,10 +43,4 @@ public class RequestPartyMatchList extends ClientBasePacket
// _log.fine("Party match status: " + status); // _log.fine("Party match status: " + status);
// } // }
} }
@Override
public String getType()
{
return _C__70_REQUESTPARTYMATCHLIST;
}
} }

View File

@@ -24,22 +24,14 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestPetGetItem extends ClientBasePacket public class RequestPetGetItem extends ClientBasePacket
{ {
private static final String _C__8f_REQUESTPETGETITEM = "[C] 8F RequestPetGetItem";
public RequestPetGetItem(byte[] decrypt, ClientThread client) public RequestPetGetItem(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
final int objectId = readD(); 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().setTarget(item);
client.getActiveChar().getPet().setCurrentState(CreatureState.PICKUP_ITEM); client.getActiveChar().getPet().setCurrentState(CreatureState.PICKUP_ITEM);
client.getActiveChar().getPet().moveTo(item.getX(), item.getY(), item.getZ(), 0); client.getActiveChar().getPet().moveTo(item.getX(), item.getY(), item.getZ(), 0);
} }
@Override
public String getType()
{
return _C__8f_REQUESTPETGETITEM;
}
} }

View File

@@ -19,13 +19,14 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.ClientThread;
import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest; import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest;
public class RequestPledgeCrest extends ClientBasePacket 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 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()); _log.warning("crest file is missing:" + crestFile.getAbsolutePath());
} }
} }
@Override
public String getType()
{
return _C__68_REQUESTPLEDGECREST;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.data.ClanTable; import org.l2jmobius.gameserver.data.ClanTable;
import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.Clan;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -26,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
public class RequestPledgeInfo extends ClientBasePacket 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) public RequestPledgeInfo(byte[] rawPacket, ClientThread client)
{ {
@@ -47,10 +49,4 @@ public class RequestPledgeInfo extends ClientBasePacket
activeChar.sendPacket(pm); activeChar.sendPacket(pm);
} }
} }
@Override
public String getType()
{
return _C__66_REQUESTPLEDGEINFO;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
public class RequestPledgeMemberList extends ClientBasePacket public class RequestPledgeMemberList extends ClientBasePacket
{ {
private static final String _C__3C_REQUESTPLEDGEMEMBERLIST = "[C] 3C RequestPledgeMemberList";
public RequestPledgeMemberList(byte[] rawPacket, ClientThread client) public RequestPledgeMemberList(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -37,10 +35,4 @@ public class RequestPledgeMemberList extends ClientBasePacket
activeChar.sendPacket(pm); activeChar.sendPacket(pm);
} }
} }
@Override
public String getType()
{
return _C__3C_REQUESTPLEDGEMEMBERLIST;
}
} }

View File

@@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PrivateSellListBuy;
public class RequestPrivateStoreBuyManage extends ClientBasePacket public class RequestPrivateStoreBuyManage extends ClientBasePacket
{ {
private static final String _C__90_REQUESTPRIVATESTOREBUYMANAGE = "[C] 90 RequestPrivateStoreBuyManage";
public RequestPrivateStoreBuyManage(byte[] decrypt, ClientThread client) public RequestPrivateStoreBuyManage(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -62,10 +60,4 @@ public class RequestPrivateStoreBuyManage extends ClientBasePacket
player.broadcastPacket(new ChangeWaitType(player, 1)); player.broadcastPacket(new ChangeWaitType(player, 1));
} }
} }
@Override
public String getType()
{
return _C__90_REQUESTPRIVATESTOREBUYMANAGE;
}
} }

View File

@@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestPrivateStoreManage extends ClientBasePacket public class RequestPrivateStoreManage extends ClientBasePacket
{ {
private static final String _C__73_REQUESTPRIVATESTOREMANAGE = "[C] 73 RequestPrivateStoreManage";
public RequestPrivateStoreManage(byte[] decrypt, ClientThread client) public RequestPrivateStoreManage(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -65,10 +63,4 @@ public class RequestPrivateStoreManage extends ClientBasePacket
player.broadcastPacket(new ChangeWaitType(player, 1)); player.broadcastPacket(new ChangeWaitType(player, 1));
} }
} }
@Override
public String getType()
{
return _C__73_REQUESTPRIVATESTOREMANAGE;
}
} }

View File

@@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestPrivateStoreQuitBuy extends ClientBasePacket public class RequestPrivateStoreQuitBuy extends ClientBasePacket
{ {
private static final String _C__93_REQUESTPRIVATESTOREQUITBUY = "[C] 93 RequestPrivateStoreQuitBuy";
public RequestPrivateStoreQuitBuy(byte[] decrypt, ClientThread client) public RequestPrivateStoreQuitBuy(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -33,10 +31,4 @@ public class RequestPrivateStoreQuitBuy extends ClientBasePacket
player.sendPacket(new UserInfo(player)); player.sendPacket(new UserInfo(player));
player.broadcastPacket(new UserInfo(player)); player.broadcastPacket(new UserInfo(player));
} }
@Override
public String getType()
{
return _C__93_REQUESTPRIVATESTOREQUITBUY;
}
} }

View File

@@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestPrivateStoreQuitSell extends ClientBasePacket public class RequestPrivateStoreQuitSell extends ClientBasePacket
{ {
private static final String _C__76_REQUESTPRIVATESTOREQUITSELL = "[C] 76 RequestPrivateStoreQuitSell";
public RequestPrivateStoreQuitSell(byte[] decrypt, ClientThread client) public RequestPrivateStoreQuitSell(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -33,10 +31,4 @@ public class RequestPrivateStoreQuitSell extends ClientBasePacket
player.sendPacket(new UserInfo(player)); player.sendPacket(new UserInfo(player));
player.broadcastPacket(new UserInfo(player)); player.broadcastPacket(new UserInfo(player));
} }
@Override
public String getType()
{
return _C__76_REQUESTPRIVATESTOREQUITSELL;
}
} }

View File

@@ -24,17 +24,9 @@ import org.l2jmobius.gameserver.network.serverpackets.QuestList;
public class RequestQuestList extends ClientBasePacket public class RequestQuestList extends ClientBasePacket
{ {
private static final String _C__63_REQUESTQUESTLIST = "[C] 63 RequestQuestList";
public RequestQuestList(byte[] decrypt, ClientThread client) throws IOException public RequestQuestList(byte[] decrypt, ClientThread client) throws IOException
{ {
super(decrypt); super(decrypt);
client.getConnection().sendPacket(new QuestList()); client.getConnection().sendPacket(new QuestList());
} }
@Override
public String getType()
{
return _C__63_REQUESTQUESTLIST;
}
} }

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RestartResponse;
public class RequestRestart extends ClientBasePacket public class RequestRestart extends ClientBasePacket
{ {
private static final String _C__46_REQUESTRESTART = "[C] 46 RequestRestart";
public RequestRestart(byte[] decrypt, ClientThread client) public RequestRestart(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -54,10 +52,4 @@ public class RequestRestart extends ClientBasePacket
client.setActiveChar(null); client.setActiveChar(null);
} }
} }
@Override
public String getType()
{
return _C__46_REQUESTRESTART;
}
} }

View File

@@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMove;
public class RequestRestartPoint extends ClientBasePacket public class RequestRestartPoint extends ClientBasePacket
{ {
private static final String _C__6d_REQUESTRESTARTPOINT = "[C] 6d RequestRestartPoint";
public RequestRestartPoint(byte[] decrypt, ClientThread client) public RequestRestartPoint(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -50,10 +48,4 @@ public class RequestRestartPoint extends ClientBasePacket
activeChar.broadcastPacket(revive); activeChar.broadcastPacket(revive);
activeChar.setTarget(activeChar); activeChar.setTarget(activeChar);
} }
@Override
public String getType()
{
return _C__6d_REQUESTRESTARTPOINT;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
public class RequestSellItem extends ClientBasePacket public class RequestSellItem extends ClientBasePacket
{ {
private static final String _C__1E_REQUESTSELLITEM = "[C] 1E RequestSellItem";
public RequestSellItem(byte[] decrypt, ClientThread client) public RequestSellItem(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -51,10 +49,4 @@ public class RequestSellItem extends ClientBasePacket
su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad()); su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
activeChar.sendPacket(su); activeChar.sendPacket(su);
} }
@Override
public String getType()
{
return _C__1E_REQUESTSELLITEM;
}
} }

View File

@@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestSetPledgeCrest extends ClientBasePacket public class RequestSetPledgeCrest extends ClientBasePacket
{ {
private static final String _C__53_REQUESTSETPLEDGECREST = "[C] 53 RequestSetPledgeCrest";
public RequestSetPledgeCrest(byte[] rawPacket, ClientThread client) throws IOException public RequestSetPledgeCrest(byte[] rawPacket, ClientThread client) throws IOException
{ {
super(rawPacket); super(rawPacket);
@@ -52,10 +50,4 @@ public class RequestSetPledgeCrest extends ClientBasePacket
final CharInfo ci = new CharInfo(activeChar); final CharInfo ci = new CharInfo(activeChar);
activeChar.broadcastPacket(ci); activeChar.broadcastPacket(ci);
} }
@Override
public String getType()
{
return _C__53_REQUESTSETPLEDGECREST;
}
} }

View File

@@ -17,25 +17,14 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; 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.ClientThread;
public class RequestShortCutDel extends ClientBasePacket public class RequestShortCutDel extends ClientBasePacket
{ {
private static final String _C__35_REQUESTSHORTCUTDEL = "[C] 35 RequestShortCutDel";
public RequestShortCutDel(byte[] rawPacket, ClientThread client) public RequestShortCutDel(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
final PlayerInstance activeChar = client.getActiveChar();
// Connection con = client.getConnection();
final int slot = readD(); final int slot = readD();
activeChar.deleteShortCut(slot); client.getActiveChar().deleteShortCut(slot);
}
@Override
public String getType()
{
return _C__35_REQUESTSHORTCUTDEL;
} }
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class RequestShortCutReg extends ClientBasePacket public class RequestShortCutReg extends ClientBasePacket
{ {
private static final String _C__33_REQUESTSHORTCUTREG = "[C] 33 RequestShortCutReg";
public RequestShortCutReg(byte[] rawPacket, ClientThread client) public RequestShortCutReg(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -57,10 +55,4 @@ public class RequestShortCutReg extends ClientBasePacket
} }
} }
} }
@Override
public String getType()
{
return _C__33_REQUESTSHORTCUTREG;
}
} }

View File

@@ -22,8 +22,6 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestShowBoard extends ClientBasePacket public class RequestShowBoard extends ClientBasePacket
{ {
private static final String _C__57_REQUESTSHOWBOARD = "[C] 57 RequestShowBoard";
public RequestShowBoard(byte[] decrypt, ClientThread client) public RequestShowBoard(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -31,10 +29,4 @@ public class RequestShowBoard extends ClientBasePacket
final int unknown = readD(); final int unknown = readD();
CommunityBoardManager.getInstance().handleCommands(client, "bbs_default"); CommunityBoardManager.getInstance().handleCommands(client, "bbs_default");
} }
@Override
public String getType()
{
return _C__57_REQUESTSHOWBOARD;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SkillList;
public class RequestSkillList extends ClientBasePacket public class RequestSkillList extends ClientBasePacket
{ {
private static final String _C__3F_REQUESTSKILLLIST = "[C] 3F RequestSkillList";
public RequestSkillList(byte[] rawPacket, ClientThread client) public RequestSkillList(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -37,10 +35,4 @@ public class RequestSkillList extends ClientBasePacket
} }
activeChar.sendPacket(response); activeChar.sendPacket(response);
} }
@Override
public String getType()
{
return _C__3F_REQUESTSKILLLIST;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
public class RequestSocialAction extends ClientBasePacket public class RequestSocialAction extends ClientBasePacket
{ {
private static final String _C__1B_REQUESTSOCIALACTION = "[C] 1B RequestSocialAction";
public RequestSocialAction(byte[] decrypt, ClientThread client) public RequestSocialAction(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -38,10 +36,4 @@ public class RequestSocialAction extends ClientBasePacket
activeChar.broadcastPacket(atk); activeChar.broadcastPacket(atk);
} }
} }
@Override
public String getType()
{
return _C__1B_REQUESTSOCIALACTION;
}
} }

View File

@@ -23,8 +23,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
public class RequestTargetCanceld extends ClientBasePacket public class RequestTargetCanceld extends ClientBasePacket
{ {
private static final String _C__37_REQUESTTARGETCANCELD = "[C] 37 RequestTargetCanceld";
public RequestTargetCanceld(byte[] rawPacket, ClientThread client) public RequestTargetCanceld(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -35,10 +33,4 @@ public class RequestTargetCanceld extends ClientBasePacket
activeChar.setTarget(null); activeChar.setTarget(null);
} }
} }
@Override
public String getType()
{
return _C__37_REQUESTTARGETCANCELD;
}
} }

View File

@@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestUnEquipItem extends ClientBasePacket public class RequestUnEquipItem extends ClientBasePacket
{ {
private static final String _C__11_REQUESTUNEQUIPITEM = "[C] 11 RequestUnequipItem";
public RequestUnEquipItem(byte[] decrypt, ClientThread client) public RequestUnEquipItem(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -59,10 +57,4 @@ public class RequestUnEquipItem extends ClientBasePacket
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
} }
@Override
public String getType()
{
return _C__11_REQUESTUNEQUIPITEM;
}
} }

View File

@@ -18,23 +18,18 @@
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.ClientThread;
public class RequestWithDrawalParty extends ClientBasePacket public class RequestWithDrawalParty extends ClientBasePacket
{ {
private static final String _C__2B_REQUESTWITHDRAWALPARTY = "[C] 2B RequestWithDrawalParty"; public RequestWithDrawalParty(byte[] decrypt, ClientThread client)
public RequestWithDrawalParty(byte[] decrypt, PlayerInstance player)
{ {
super(decrypt); super(decrypt);
if (player.isInParty())
final PlayerInstance player = client.getActiveChar();
if ((player != null) && player.isInParty())
{ {
player.getParty().oustPartyMember(player); player.getParty().oustPartyMember(player);
} }
} }
@Override
public String getType()
{
return _C__2B_REQUESTWITHDRAWALPARTY;
}
} }

View File

@@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestWithdrawalPledge extends ClientBasePacket public class RequestWithdrawalPledge extends ClientBasePacket
{ {
private static final String _C__26_REQUESTWITHDRAWALPLEDGE = "[C] 26 RequestWithdrawalPledge";
public RequestWithdrawalPledge(byte[] rawPacket, ClientThread client) public RequestWithdrawalPledge(byte[] rawPacket, ClientThread client)
{ {
super(rawPacket); super(rawPacket);
@@ -52,10 +50,4 @@ public class RequestWithdrawalPledge extends ClientBasePacket
player.broadcastPacket(new CharInfo(player)); player.broadcastPacket(new CharInfo(player));
player.sendPacket(new PledgeShowMemberListDeleteAll()); player.sendPacket(new PledgeShowMemberListDeleteAll());
} }
@Override
public String getType()
{
return _C__26_REQUESTWITHDRAWALPLEDGE;
}
} }

View File

@@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class Say2 extends ClientBasePacket 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 ALL = 0;
public static final int SHOUT = 1; public static final int SHOUT = 1;
public static final int TELL = 2; public static final int TELL = 2;
@@ -90,10 +88,4 @@ public class Say2 extends ClientBasePacket
activeChar.getParty().broadcastToPartyMembers(cs); activeChar.getParty().broadcastToPartyMembers(cs);
} }
} }
@Override
public String getType()
{
return _C__38_SAY2;
}
} }

View File

@@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
public class SendBypassBuildCmd extends ClientBasePacket 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 GM_MESSAGE = 9;
public static final int ANNOUNCEMENT = 10; public static final int ANNOUNCEMENT = 10;
@@ -83,10 +82,4 @@ public class SendBypassBuildCmd extends ClientBasePacket
} }
} }
} }
@Override
public String getType()
{
return _C__5B_SENDBYPASSBUILDCMD;
}
} }

View File

@@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class SendPrivateStoreBuyBuyList extends ClientBasePacket public class SendPrivateStoreBuyBuyList extends ClientBasePacket
{ {
private static final String _C__96_SENDPRIVATESTOREBUYBUYLIST = "[C] 96 SendPrivateStoreBuyBuyList";
public SendPrivateStoreBuyBuyList(byte[] decrypt, ClientThread client) public SendPrivateStoreBuyBuyList(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -71,10 +69,4 @@ public class SendPrivateStoreBuyBuyList extends ClientBasePacket
buyer.getTradeList().updateBuyList(buyer, buyerlist); buyer.getTradeList().updateBuyList(buyer, buyerlist);
} }
} }
@Override
public String getType()
{
return _C__96_SENDPRIVATESTOREBUYBUYLIST;
}
} }

View File

@@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class SendPrivateStoreBuyList extends ClientBasePacket public class SendPrivateStoreBuyList extends ClientBasePacket
{ {
private static final String _C__79_SENDPRIVATESTOREBUYLIST = "[C] 79 SendPrivateStoreBuyList";
public SendPrivateStoreBuyList(byte[] decrypt, ClientThread client) public SendPrivateStoreBuyList(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -71,10 +69,4 @@ public class SendPrivateStoreBuyList extends ClientBasePacket
buyer.sendPacket(msg); buyer.sendPacket(msg);
} }
} }
@Override
public String getType()
{
return _C__79_SENDPRIVATESTOREBUYLIST;
}
} }

View File

@@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SendWareHouseDepositList extends ClientBasePacket public class SendWareHouseDepositList extends ClientBasePacket
{ {
private static final String _C__31_SENDWAREHOUSEDEPOSITLIST = "[C] 31 SendWareHouseDepositList";
public SendWareHouseDepositList(byte[] decrypt, ClientThread client) public SendWareHouseDepositList(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -65,10 +63,4 @@ public class SendWareHouseDepositList extends ClientBasePacket
activeChar.reduceAdena(neededMoney); activeChar.reduceAdena(neededMoney);
activeChar.sendPacket(new ItemList(activeChar, false)); activeChar.sendPacket(new ItemList(activeChar, false));
} }
@Override
public String getType()
{
return _C__31_SENDWAREHOUSEDEPOSITLIST;
}
} }

View File

@@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SendWareHouseWithDrawList extends ClientBasePacket public class SendWareHouseWithDrawList extends ClientBasePacket
{ {
private static final String _C__32_SENDWAREHOUSEWITHDRAWLIST = "[C] 32 SendWareHouseWithDrawList";
public SendWareHouseWithDrawList(byte[] decrypt, ClientThread client) public SendWareHouseWithDrawList(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -70,10 +68,4 @@ public class SendWareHouseWithDrawList extends ClientBasePacket
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
} }
@Override
public String getType()
{
return _C__32_SENDWAREHOUSEWITHDRAWLIST;
}
} }

View File

@@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class SetPrivateStoreListBuy extends ClientBasePacket public class SetPrivateStoreListBuy extends ClientBasePacket
{ {
private static final String _C__91_SETPRIVATESTORELISTBUY = "[C] 91 SetPrivateStoreListSell";
public SetPrivateStoreListBuy(byte[] decrypt, ClientThread client) public SetPrivateStoreListBuy(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -88,10 +86,4 @@ public class SetPrivateStoreListBuy extends ClientBasePacket
player.broadcastPacket(new UserInfo(player)); player.broadcastPacket(new UserInfo(player));
} }
} }
@Override
public String getType()
{
return _C__91_SETPRIVATESTORELISTBUY;
}
} }

View File

@@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class SetPrivateStoreListSell extends ClientBasePacket public class SetPrivateStoreListSell extends ClientBasePacket
{ {
private static final String _C__74_SETPRIVATESTORELISTSELL = "[C] 74 SetPrivateStoreListSell";
public SetPrivateStoreListSell(byte[] decrypt, ClientThread client) public SetPrivateStoreListSell(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -69,10 +67,4 @@ public class SetPrivateStoreListSell extends ClientBasePacket
player.broadcastPacket(new UserInfo(player)); player.broadcastPacket(new UserInfo(player));
} }
} }
@Override
public String getType()
{
return _C__74_SETPRIVATESTORELISTSELL;
}
} }

View File

@@ -17,24 +17,14 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; 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.ClientThread;
public class SetPrivateStoreMsgBuy extends ClientBasePacket public class SetPrivateStoreMsgBuy extends ClientBasePacket
{ {
private static final String _C__94_SETPRIVATESTOREMSGBUY = "[C] 94 SetPrivateStoreMsgBuy";
public SetPrivateStoreMsgBuy(byte[] decrypt, ClientThread client) public SetPrivateStoreMsgBuy(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
final String storename = readS(); final String storename = readS();
final PlayerInstance player = client.getActiveChar(); client.getActiveChar().getTradeList().setBuyStoreName(storename);
player.getTradeList().setBuyStoreName(storename);
}
@Override
public String getType()
{
return _C__94_SETPRIVATESTOREMSGBUY;
} }
} }

View File

@@ -17,24 +17,14 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; 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.ClientThread;
public class SetPrivateStoreMsgSell extends ClientBasePacket public class SetPrivateStoreMsgSell extends ClientBasePacket
{ {
private static final String _C__77_SETPRIVATESTOREMSGSELL = "[C] 77 SetPrivateStoreMsgSell";
public SetPrivateStoreMsgSell(byte[] decrypt, ClientThread client) public SetPrivateStoreMsgSell(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
final String storename = readS(); final String storename = readS();
final PlayerInstance player = client.getActiveChar(); client.getActiveChar().getTradeList().setSellStoreName(storename);
player.getTradeList().setSellStoreName(storename);
}
@Override
public String getType()
{
return _C__77_SETPRIVATESTOREMSGSELL;
} }
} }

View File

@@ -17,26 +17,21 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; 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.ClientThread;
import org.l2jmobius.gameserver.network.serverpackets.BeginRotation; import org.l2jmobius.gameserver.network.serverpackets.BeginRotation;
public class StartRotating extends ClientBasePacket public class StartRotating extends ClientBasePacket
{ {
private static final String _C__4A_STARTROTATING = "[C] 4A StartRotating";
public StartRotating(byte[] decrypt, ClientThread client) public StartRotating(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
final int degree = readD(); final int degree = readD();
final int side = readD(); final int side = readD();
final BeginRotation br = new BeginRotation(client.getActiveChar(), degree, side);
client.getActiveChar().sendPacket(br); final PlayerInstance activeChar = client.getActiveChar();
client.getActiveChar().broadcastPacket(br); final BeginRotation br = new BeginRotation(activeChar, degree, side);
} activeChar.sendPacket(br);
activeChar.broadcastPacket(br);
@Override
public String getType()
{
return _C__4A_STARTROTATING;
} }
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StopRotation;
public class StopMove extends ClientBasePacket public class StopMove extends ClientBasePacket
{ {
private static final String _C__36_STOPMOVE = "[C] 36 StopMove";
public StopMove(byte[] decrypt, ClientThread client) public StopMove(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -46,10 +44,4 @@ public class StopMove extends ClientBasePacket
client.getActiveChar().sendPacket(sr); client.getActiveChar().sendPacket(sr);
client.getActiveChar().broadcastPacket(sr); client.getActiveChar().broadcastPacket(sr);
} }
@Override
public String getType()
{
return _C__36_STOPMOVE;
}
} }

View File

@@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class TradeDone extends ClientBasePacket public class TradeDone extends ClientBasePacket
{ {
private static final String _C__17_TRADEDONE = "[C] 17 TradeDone";
public TradeDone(byte[] decrypt, ClientThread client) public TradeDone(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -81,10 +79,4 @@ public class TradeDone extends ClientBasePacket
player.setTradeList(null); player.setTradeList(null);
} }
} }
@Override
public String getType()
{
return _C__17_TRADEDONE;
}
} }

View File

@@ -17,6 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -26,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class TradeRequest extends ClientBasePacket 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) public TradeRequest(byte[] decrypt, ClientThread client)
{ {
@@ -63,10 +65,4 @@ public class TradeRequest extends ClientBasePacket
_log.info("transaction already in progress."); _log.info("transaction already in progress.");
} }
} }
@Override
public String getType()
{
return TRADEREQUEST__C__15;
}
} }

View File

@@ -18,6 +18,7 @@
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler;
@@ -31,12 +32,13 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class UseItem extends ClientBasePacket 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) public UseItem(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
final int objectId = readD(); final int objectId = readD();
final PlayerInstance activeChar = client.getActiveChar(); final PlayerInstance activeChar = client.getActiveChar();
final ItemInstance item = activeChar.getInventory().getItem(objectId); final ItemInstance item = activeChar.getInventory().getItem(objectId);
if ((item != null) && item.isEquipable() && !activeChar.isInCombat()) if ((item != null) && item.isEquipable() && !activeChar.isInCombat())
@@ -78,30 +80,19 @@ public class UseItem extends ClientBasePacket
final int count = handler.useItem(activeChar, item); final int count = handler.useItem(activeChar, item);
if (count > 0) 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;
}
} }

View File

@@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class ValidatePosition extends ClientBasePacket public class ValidatePosition extends ClientBasePacket
{ {
private static final String _C__48_VALIDATEPOSITION = "[C] 48 ValidatePosition";
public ValidatePosition(byte[] decrypt, ClientThread client) public ValidatePosition(byte[] decrypt, ClientThread client)
{ {
super(decrypt); super(decrypt);
@@ -99,10 +97,4 @@ public class ValidatePosition extends ClientBasePacket
final long dY = a.getY() - b.getY(); final long dY = a.getY() - b.getY();
return (dX * dX) + (dY * dY); return (dX * dX) + (dY * dY);
} }
@Override
public String getType()
{
return _C__48_VALIDATEPOSITION;
}
} }

View File

@@ -19,18 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class ActionFailed extends ServerBasePacket public class ActionFailed extends ServerBasePacket
{ {
private static final String _S__35_ACTIONFAILED = "[S] 35 ActionFailed";
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(53); writeC(0x35);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__35_ACTIONFAILED;
} }
} }

View File

@@ -22,7 +22,6 @@ import java.io.FileInputStream;
public class AllyCrest extends ServerBasePacket public class AllyCrest extends ServerBasePacket
{ {
private static final String _S__C7_ALLYCREST = "[S] C7 AllyCrest";
private final File _crestFile; private final File _crestFile;
private final int _crestId; private final int _crestId;
@@ -33,9 +32,9 @@ public class AllyCrest extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
writeC(199); writeC(0xC7);
writeD(_crestId); writeD(_crestId);
try try
{ {
@@ -54,12 +53,5 @@ public class AllyCrest extends ServerBasePacket
{ {
e.printStackTrace(); e.printStackTrace();
} }
return getBytes();
}
@Override
public String getType()
{
return _S__C7_ALLYCREST;
} }
} }

View File

@@ -21,7 +21,6 @@ import java.util.Vector;
public class AquireSkillInfo extends ServerBasePacket public class AquireSkillInfo extends ServerBasePacket
{ {
private static final String _S__A4_AQUIRESKILLINFO = "[S] A4 AquireSkillInfo";
private final Vector<Req> _reqs = new Vector<>(); private final Vector<Req> _reqs = new Vector<>();
private final int _id; private final int _id;
private final int _level; private final int _level;
@@ -40,9 +39,9 @@ public class AquireSkillInfo extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
writeC(164); writeC(0xA4);
writeD(_id); writeD(_id);
writeD(_level); writeD(_level);
writeD(_spCost); writeD(_spCost);
@@ -55,13 +54,6 @@ public class AquireSkillInfo extends ServerBasePacket
writeD(temp.count); writeD(temp.count);
writeD(temp.unk); writeD(temp.unk);
} }
return getBytes();
}
@Override
public String getType()
{
return _S__A4_AQUIRESKILLINFO;
} }
class Req class Req
@@ -79,5 +71,4 @@ public class AquireSkillInfo extends ServerBasePacket
this.unk = unk; this.unk = unk;
} }
} }
} }

View File

@@ -21,7 +21,6 @@ import java.util.Vector;
public class AquireSkillList extends ServerBasePacket public class AquireSkillList extends ServerBasePacket
{ {
private static final String _S__A3_AQUIRESKILLLIST = "[S] A3 AquireSkillList";
private final Vector<Skill> _skills = new Vector<>(); private final Vector<Skill> _skills = new Vector<>();
public void addSkill(int id, int nextLevel, int maxLevel, int spCost, int requirements) public void addSkill(int id, int nextLevel, int maxLevel, int spCost, int requirements)
@@ -30,9 +29,9 @@ public class AquireSkillList extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
writeC(163); writeC(0xA3);
writeD(_skills.size()); writeD(_skills.size());
for (int i = 0; i < _skills.size(); ++i) for (int i = 0; i < _skills.size(); ++i)
{ {
@@ -43,13 +42,6 @@ public class AquireSkillList extends ServerBasePacket
writeD(temp.spCost); writeD(temp.spCost);
writeD(temp.requirements); writeD(temp.requirements);
} }
return getBytes();
}
@Override
public String getType()
{
return _S__A3_AQUIRESKILLLIST;
} }
class Skill class Skill
@@ -69,5 +61,4 @@ public class AquireSkillList extends ServerBasePacket
this.requirements = requirements; this.requirements = requirements;
} }
} }
} }

View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class AskJoinParty extends ServerBasePacket public class AskJoinParty extends ServerBasePacket
{ {
private static final String _S__4B_ASKJOINPARTY_0X4B = "[S] 4B AskJoinParty 0x4b";
private final int _requestorId; private final int _requestorId;
private final int _itemDistribution; private final int _itemDistribution;
@@ -30,17 +29,10 @@ public class AskJoinParty extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(75); writeC(0x4B);
writeD(_requestorId); writeD(_requestorId);
writeD(_itemDistribution); writeD(_itemDistribution);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__4B_ASKJOINPARTY_0X4B;
} }
} }

View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class AskJoinPledge extends ServerBasePacket public class AskJoinPledge extends ServerBasePacket
{ {
private static final String _S__44_ASKJOINPLEDGE = "[S] 44 AskJoinPledge";
private final int _requestorId; private final int _requestorId;
private final String _pledgeName; private final String _pledgeName;
@@ -30,17 +29,10 @@ public class AskJoinPledge extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(68); writeC(0x44);
writeD(_requestorId); writeD(_requestorId);
writeS(_pledgeName); writeS(_pledgeName);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__44_ASKJOINPLEDGE;
} }
} }

View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class Attack extends ServerBasePacket public class Attack extends ServerBasePacket
{ {
private static final String _S__06_ATTACK = "[S] 06 Attack";
private final int _attackerId; private final int _attackerId;
private final int _defenderId; private final int _defenderId;
private final int _damage; private final int _damage;
@@ -44,9 +43,9 @@ public class Attack extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
writeC(6); writeC(0x06);
writeD(_attackerId); writeD(_attackerId);
writeD(_defenderId); writeD(_defenderId);
writeD(_damage); writeD(_damage);
@@ -68,12 +67,5 @@ public class Attack extends ServerBasePacket
writeD(_y); writeD(_y);
writeD(_z); writeD(_z);
writeH(0); writeH(0);
return getBytes();
}
@Override
public String getType()
{
return _S__06_ATTACK;
} }
} }

View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class AttackCanceld extends ServerBasePacket public class AttackCanceld extends ServerBasePacket
{ {
private static final String _S__0A_MAGICSKILLCANCELD = "[S] 0a AttackCanceld";
private final int _objectId; private final int _objectId;
public AttackCanceld(int objectId) public AttackCanceld(int objectId)
@@ -28,16 +27,9 @@ public class AttackCanceld extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
writeC(10); writeC(0x0A);
writeD(_objectId); writeD(_objectId);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__0A_MAGICSKILLCANCELD;
} }
} }

View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class AuthLoginFail extends ServerBasePacket public class AuthLoginFail extends ServerBasePacket
{ {
private static final String _S__12_AUTHLOGINFAIL = "[S] 12 AuthLoginFail";
public static int NO_TEXT = 0; public static int NO_TEXT = 0;
public static int SYSTEM_ERROR_LOGIN_LATER = 1; public static int SYSTEM_ERROR_LOGIN_LATER = 1;
public static int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT = 2; public static int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT = 2;
@@ -39,16 +38,9 @@ public class AuthLoginFail extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(18); writeC(0x12);
writeD(_reason); writeD(_reason);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__12_AUTHLOGINFAIL;
} }
} }

View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class AutoAttackStart extends ServerBasePacket public class AutoAttackStart extends ServerBasePacket
{ {
private static final String _S__3B_AUTOATTACKSTART = "[S] 3B AutoAttackStart";
private final int _targetId; private final int _targetId;
public AutoAttackStart(int targetId) public AutoAttackStart(int targetId)
@@ -28,16 +27,9 @@ public class AutoAttackStart extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(59); writeC(0x3B);
writeD(_targetId); writeD(_targetId);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__3B_AUTOATTACKSTART;
} }
} }

View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class AutoAttackStop extends ServerBasePacket public class AutoAttackStop extends ServerBasePacket
{ {
private static final String _S__3C_AUTOATTACKSTOP = "[S] 3C AutoAttackStop";
private final int _targetId; private final int _targetId;
public AutoAttackStop(int targetId) public AutoAttackStop(int targetId)
@@ -28,16 +27,9 @@ public class AutoAttackStop extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(60); writeC(0x3C);
writeD(_targetId); writeD(_targetId);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__3C_AUTOATTACKSTOP;
} }
} }

View File

@@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
public class BeginRotation extends ServerBasePacket public class BeginRotation extends ServerBasePacket
{ {
private static final String _S__77_BEGINROTATION = "[S] 77 BeginRotation";
private final PlayerInstance _char; private final PlayerInstance _char;
private final int _degree; private final int _degree;
private final int _side; private final int _side;
@@ -34,18 +33,11 @@ public class BeginRotation extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
writeC(119); writeC(0x77);
writeD(_char.getObjectId()); writeD(_char.getObjectId());
writeD(_degree); writeD(_degree);
writeD(_side); writeD(_side);
return getBytes();
}
@Override
public String getType()
{
return _S__77_BEGINROTATION;
} }
} }

View File

@@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
public class BuyList extends ServerBasePacket public class BuyList extends ServerBasePacket
{ {
private static final String _S__1D_BUYLIST = "[S] 1D BuyList";
private final TradeList _list; private final TradeList _list;
private final int _money; private final int _money;
@@ -35,9 +34,9 @@ public class BuyList extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
writeC(29); writeC(0x1D);
writeD(_money); writeD(_money);
writeD(_list.getListId()); writeD(_list.getListId());
final int count = _list.getItems().size(); final int count = _list.getItems().size();
@@ -62,12 +61,5 @@ public class BuyList extends ServerBasePacket
} }
writeD(temp.getPrice()); writeD(temp.getPrice());
} }
return getBytes();
}
@Override
public String getType()
{
return _S__1D_BUYLIST;
} }
} }

View File

@@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.model.actor.Creature;
public class ChangeMoveType extends ServerBasePacket public class ChangeMoveType extends ServerBasePacket
{ {
private static final String _S__3E_CHANGEMOVETYPE = "[S] 3E ChangeMoveType";
public static int WALK = 0; public static int WALK = 0;
public static int RUN = 1; public static int RUN = 1;
private final Creature _cha; private final Creature _cha;
private final int _moveType; private final int _moveType;
@@ -34,17 +34,10 @@ public class ChangeMoveType extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(62); writeC(0x3E);
writeD(_cha.getObjectId()); writeD(_cha.getObjectId());
writeD(_moveType); writeD(_moveType);
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__3E_CHANGEMOVETYPE;
} }
} }

View File

@@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.model.actor.Creature;
public class ChangeWaitType extends ServerBasePacket public class ChangeWaitType extends ServerBasePacket
{ {
private static final String _S__3F_CHANGEWAITTYPE = "[S] 3F ChangeWaitType";
private final Creature _cha; private final Creature _cha;
private final int _moveType; private final int _moveType;
@@ -32,20 +31,13 @@ public class ChangeWaitType extends ServerBasePacket
} }
@Override @Override
public byte[] getContent() public void writeImpl()
{ {
_bao.write(63); writeC(0x3F);
writeD(_cha.getObjectId()); writeD(_cha.getObjectId());
writeD(_moveType); writeD(_moveType);
writeD(_cha.getX()); writeD(_cha.getX());
writeD(_cha.getY()); writeD(_cha.getY());
writeD(_cha.getZ()); writeD(_cha.getZ());
return _bao.toByteArray();
}
@Override
public String getType()
{
return _S__3F_CHANGEWAITTYPE;
} }
} }

Some files were not shown because too many files have changed in this diff Show More