+{
+ private static final Logger LOGGER = Logger.getLogger(PacketHandler.class.getName());
+
+ @Override
+ public void handle(GameClient client, ReadablePacket packet)
+ {
+ // Read packet id.
+ final int packetId;
+ try
+ {
+ packetId = packet.readByte();
+ }
+ catch (Exception e)
+ {
+ LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
+ LOGGER.warning(CommonUtil.getStackTrace(e));
+ client.disconnect();
+ return;
+ }
+
+ // Check if packet id is within valid range.
+ if ((packetId < 0) || (packetId >= ClientPackets.PACKET_ARRAY.length))
+ {
+ return;
+ }
+
+ // Find packet enum.
+ final ClientPackets packetEnum = ClientPackets.PACKET_ARRAY[packetId];
+ if (packetEnum == null)
+ {
+ return;
+ }
+
+ // Check connection state.
+ if (!packetEnum.getConnectionStates().contains(client.getConnectionState()))
+ {
+ return;
+ }
+
+ // Create new ClientPacket.
+ final ClientPacket newPacket = packetEnum.newPacket();
+ if (newPacket == null)
+ {
+ return;
+ }
+
+ // Continue on another thread.
+ if (Config.THREADS_FOR_CLIENT_PACKETS)
+ {
+ ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
+ }
+ else // Wait for execution.
+ {
+ try
+ {
+ newPacket.read(packet);
+ newPacket.run(client);
+ }
+ catch (Exception e)
+ {
+ LOGGER.warning("PacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+ LOGGER.warning(CommonUtil.getStackTrace(e));
+ }
+ }
+ }
+
+ private class ExecuteTask implements Runnable
+ {
+ private final GameClient _client;
+ private final ReadablePacket _packet;
+ private final ClientPacket _newPacket;
+ private final int _packetId;
+
+ public ExecuteTask(GameClient client, ReadablePacket packet, ClientPacket newPacket, int packetId)
+ {
+ _client = client;
+ _packet = packet;
+ _newPacket = newPacket;
+ _packetId = packetId;
+ }
+
+ @Override
+ public void run()
+ {
+ try
+ {
+ _newPacket.read(_packet);
+ _newPacket.run(_client);
+ }
+ catch (Exception e)
+ {
+ LOGGER.warning("PacketHandler->ExecuteTask: Problem with " + _client + " [Packet: 0x" + Integer.toHexString(_packetId).toUpperCase() + "]");
+ LOGGER.warning(CommonUtil.getStackTrace(e));
+ }
+ }
+ }
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/OutgoingPackets.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/ServerPackets.java
similarity index 95%
rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/OutgoingPackets.java
rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/ServerPackets.java
index 4c2a1a961d..c27c8e1e9a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/OutgoingPackets.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/ServerPackets.java
@@ -17,14 +17,13 @@
package org.l2jmobius.gameserver.network;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * @author UnAfraid
+ * @author Mobius
*/
-public enum OutgoingPackets
+public enum ServerPackets
{
- // Packets
DIE(0x00),
REVIVE(0x01),
ATTACK_OUT_OF_RANGE(0x02),
@@ -883,12 +882,12 @@ public enum OutgoingPackets
EX_SHARED_POSITION_TELEPORT_UI(0xFE, 0x253),
EX_CHAR_INFO(0xFE, 0x254),
EX_AUTH_RECONNECT(0xFE, 0x255),
- EX_SHOW_BIRTH_INFO(0xFE, 0x256),
+ EX_SHOW_HOMUNCULUS_BIRTH_INFO(0xFE, 0x256),
EX_HOMUNCULUS_CREATE_START_RESULT(0xFE, 0x257),
EX_HOMUNCULUS_INSERT_RESULT(0xFE, 0x258),
EX_HOMUNCULUS_SUMMON_RESULT(0xFE, 0x259),
EX_SHOW_HOMUNCULUS_LIST(0xFE, 0x25A),
- EX_DELETE_HOMUNCLUS_DATA_RESULT(0xFE, 0x25B),
+ EX_DELETE_HOMUNCULUS_DATA_RESULT(0xFE, 0x25B),
EX_ACTIVATE_HOMUNCULUS_RESULT(0xFE, 0x25C),
EX_HOMUNCULUS_GET_ENCHANT_POINT_RESULT(0xFE, 0x25D),
EX_HOMUNCULUS_INIT_POINT_RESULT(0xFE, 0x25E),
@@ -987,28 +986,18 @@ public enum OutgoingPackets
private final int _id1;
private final int _id2;
- OutgoingPackets(int id1)
+ ServerPackets(int id1)
{
this(id1, -1);
}
- OutgoingPackets(int id1, int id2)
+ ServerPackets(int id1, int id2)
{
_id1 = id1;
_id2 = id2;
}
- public int getId1()
- {
- return _id1;
- }
-
- public int getId2()
- {
- return _id2;
- }
-
- public void writeId(PacketWriter packet)
+ public void writeId(ServerPacket packet)
{
if (Config.DEBUG_OUTGOING_PACKETS)
{
@@ -1019,22 +1008,10 @@ public enum OutgoingPackets
}
}
- packet.writeC(_id1);
+ packet.writeByte(_id1);
if (_id2 > 0)
{
- packet.writeH(_id2);
+ packet.writeShort(_id2);
}
}
-
- public static OutgoingPackets getPacket(int id1, int id2)
- {
- for (OutgoingPackets packet : values())
- {
- if ((packet.getId1() == id1) && (packet.getId2() == id2))
- {
- return packet;
- }
- }
- return null;
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
index 325ce2830b..26677d9bab 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.options.VariationFee;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public abstract class AbstractRefinePacket implements IClientIncomingPacket
+public abstract class AbstractRefinePacket implements ClientPacket
{
/**
* Checks player, source item, lifestone and gemstone validity for augmentation process
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index a0a6ba4fcc..1630781205 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-public class Action implements IClientIncomingPacket
+public class Action implements ClientPacket
{
private int _objectId;
@SuppressWarnings("unused")
@@ -42,14 +42,13 @@ public class Action implements IClientIncomingPacket
private int _actionId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD(); // Target object Identifier
- _originX = packet.readD();
- _originY = packet.readD();
- _originZ = packet.readD();
- _actionId = packet.readC(); // Action identifier : 0-Simple click, 1-Shift click
- return true;
+ _objectId = packet.readInt(); // Target object Identifier
+ _originX = packet.readInt();
+ _originY = packet.readInt();
+ _originZ = packet.readInt();
+ _actionId = packet.readByte(); // Action identifier : 0-Simple click, 1-Shift click
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
index 8e8ae2c190..08edb54e6d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.World;
@@ -32,19 +32,18 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeUpdate;
/**
* @version $Revision: 1.5.2.2.2.5 $ $Date: 2005/03/27 15:29:29 $
*/
-public class AddTradeItem implements IClientIncomingPacket
+public class AddTradeItem implements ClientPacket
{
private int _tradeId;
private int _objectId;
private long _count;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _tradeId = packet.readD();
- _objectId = packet.readD();
- _count = packet.readQ();
- return true;
+ _tradeId = packet.readInt();
+ _objectId = packet.readInt();
+ _count = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
index c3511dae34..8ff620f8a7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
@@ -17,22 +17,21 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class AllyDismiss implements IClientIncomingPacket
+public class AllyDismiss implements ClientPacket
{
private String _clanName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanName = packet.readS();
- return true;
+ _clanName = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
index b9e6eab661..545c1a1de4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
@@ -17,20 +17,13 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class AllyLeave implements IClientIncomingPacket
+public class AllyLeave implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index acab47f316..78aac61c4a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -29,19 +29,18 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author JIV
*/
-public class AnswerCoupleAction implements IClientIncomingPacket
+public class AnswerCoupleAction implements ClientPacket
{
private int _objectId;
private int _actionId;
private int _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _actionId = packet.readD();
- _answer = packet.readD();
- _objectId = packet.readD();
- return true;
+ _actionId = packet.readInt();
+ _answer = packet.readInt();
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
index 3b32457408..e0a2598a37 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
* Format: (ch) d
* @author -Wooden-, Tryskell
*/
-public class AnswerJoinPartyRoom implements IClientIncomingPacket
+public class AnswerJoinPartyRoom implements ClientPacket
{
private boolean _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _answer = packet.readD() == 1;
- return true;
+ _answer = packet.readInt() == 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
index 568ed16d83..a79f55e434 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author JIV
*/
-public class AnswerPartyLootModification implements IClientIncomingPacket
+public class AnswerPartyLootModification implements ClientPacket
{
public int _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _answer = packet.readD();
- return true;
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index 24ee306c05..bae8f10772 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeDone;
/**
* @version $Revision: 1.5.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class AnswerTradeRequest implements IClientIncomingPacket
+public class AnswerTradeRequest implements ClientPacket
{
private int _response;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _response = packet.readD();
- return true;
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index 370aeba2c5..83923809b0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@@ -30,14 +29,8 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
*
* @version $Revision: 1.3.4.4 $ $Date: 2005/03/29 23:15:33 $
*/
-public class Appearing implements IClientIncomingPacket
+public class Appearing implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
index a38e7b3982..b7bb97129d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.World;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-public class AttackRequest implements IClientIncomingPacket
+public class AttackRequest implements ClientPacket
{
// cddddc
private int _objectId;
@@ -43,14 +43,13 @@ public class AttackRequest implements IClientIncomingPacket
private int _attackId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _originX = packet.readD();
- _originY = packet.readD();
- _originZ = packet.readD();
- _attackId = packet.readC(); // 0 for simple click 1 for shift-click
- return true;
+ _objectId = packet.readInt();
+ _originX = packet.readInt();
+ _originY = packet.readInt();
+ _originZ = packet.readInt();
+ _attackId = packet.readByte(); // 0 for simple click 1 for shift-click
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
index adfcd706e8..86cc54c280 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,27 +24,23 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.9.2.3.2.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class AuthLogin implements IClientIncomingPacket
+public class AuthLogin implements ClientPacket
{
// loginName + keys must match what the loginserver used.
private String _loginName;
- /*
- * private final long _key1; private final long _key2; private final long _key3; private final long _key4;
- */
private int _playKey1;
private int _playKey2;
private int _loginKey1;
private int _loginKey2;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _loginName = packet.readS().toLowerCase();
- _playKey2 = packet.readD();
- _playKey1 = packet.readD();
- _loginKey1 = packet.readD();
- _loginKey2 = packet.readD();
- return true;
+ _loginName = packet.readString().toLowerCase();
+ _playKey2 = packet.readInt();
+ _playKey1 = packet.readInt();
+ _loginKey1 = packet.readInt();
+ _loginKey2 = packet.readInt();
}
@Override
@@ -56,15 +52,15 @@ public class AuthLogin implements IClientIncomingPacket
return;
}
- final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2);
-
- // avoid potential exploits
+ // Avoid potential exploits.
if (client.getAccountName() == null)
{
- // Preventing duplicate login in case client login server socket was disconnected or this packet was not sent yet
+ // Preventing duplicate login in case client login server socket was disconnected or this packet was not sent yet.
if (LoginServerThread.getInstance().addGameServerLogin(_loginName, client))
{
client.setAccountName(_loginName);
+ final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2);
+ // client.setSessionId(key);
LoginServerThread.getInstance().addWaitingClientAndSendRequest(_loginName, client, key);
}
else
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
index 0c5c2d55c7..4bd48ece99 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
@@ -16,14 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExBrLoadEventTopRankers;
/**
* Halloween rank list client packet. Format: (ch)ddd
*/
-public class BrEventRankerList implements IClientIncomingPacket
+public class BrEventRankerList implements ClientPacket
{
private int _eventId;
private int _day;
@@ -31,12 +31,11 @@ public class BrEventRankerList implements IClientIncomingPacket
private int _ranking;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _eventId = packet.readD();
- _day = packet.readD(); // 0 - current, 1 - previous
- _ranking = packet.readD();
- return true;
+ _eventId = packet.readInt();
+ _day = packet.readInt(); // 0 - current, 1 - previous
+ _ranking = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index b47439803f..22e202f0e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.handler.IUserCommandHandler;
import org.l2jmobius.gameserver.handler.UserCommandHandler;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.1.2.1.2.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class BypassUserCmd implements IClientIncomingPacket
+public class BypassUserCmd implements ClientPacket
{
private int _command;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _command = packet.readD();
- return true;
+ _command = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index f88c978dc6..aa9cf92d0a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.1.2.1.2.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class CannotMoveAnymore implements IClientIncomingPacket
+public class CannotMoveAnymore implements ClientPacket
{
private int _x;
private int _y;
@@ -33,13 +33,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
private int _heading;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- _heading = packet.readD();
- return true;
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
+ _heading = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
index ab37b24b64..282ac5d44f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
/**
* @author Maktakien
*/
-public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
+public class CannotMoveAnymoreInVehicle implements ClientPacket
{
private int _x;
private int _y;
@@ -34,14 +34,13 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
private int _boatId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _boatId = packet.readD();
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- _heading = packet.readD();
- return true;
+ _boatId = packet.readInt();
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
+ _heading = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
index bda1bffdab..c797b0a092 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
@@ -53,7 +53,7 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
import org.l2jmobius.gameserver.util.Util;
@SuppressWarnings("unused")
-public class CharacterCreate implements IClientIncomingPacket
+public class CharacterCreate implements ClientPacket
{
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
@@ -73,22 +73,21 @@ public class CharacterCreate implements IClientIncomingPacket
private byte _face;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- _race = packet.readD();
- _sex = (byte) packet.readD();
- _classId = packet.readD();
- _int = packet.readD();
- _str = packet.readD();
- _con = packet.readD();
- _men = packet.readD();
- _dex = packet.readD();
- _wit = packet.readD();
- _hairStyle = (byte) packet.readD();
- _hairColor = (byte) packet.readD();
- _face = (byte) packet.readD();
- return true;
+ _name = packet.readString();
+ _race = packet.readInt();
+ _sex = (byte) packet.readInt();
+ _classId = packet.readInt();
+ _int = packet.readInt();
+ _str = packet.readInt();
+ _con = packet.readInt();
+ _men = packet.readInt();
+ _dex = packet.readInt();
+ _wit = packet.readInt();
+ _hairStyle = (byte) packet.readInt();
+ _hairColor = (byte) packet.readInt();
+ _face = (byte) packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
index f0f6265908..f805618e59 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
import org.l2jmobius.gameserver.model.events.Containers;
@@ -32,16 +32,15 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
/**
* @version $Revision: 1.8.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class CharacterDelete implements IClientIncomingPacket
+public class CharacterDelete implements ClientPacket
{
// cd
private int _charSlot;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _charSlot = packet.readD();
- return true;
+ _charSlot = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
index 75cac54042..d137f4e3dd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.EventType;
@@ -27,16 +27,15 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
/**
* @version $Revision: 1.4.2.1.2.2 $ $Date: 2005/03/27 15:29:29 $
*/
-public class CharacterRestore implements IClientIncomingPacket
+public class CharacterRestore implements ClientPacket
{
// cd
private int _charSlot;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _charSlot = packet.readD();
- return true;
+ _charSlot = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
index 85c4d6f633..1d2d89c387 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.data.xml.SecondaryAuthData;
import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
@@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
/**
* @version $Revision: 1.5.2.1.2.5 $ $Date: 2005/03/27 15:29:30 $
*/
-public class CharacterSelect implements IClientIncomingPacket
+public class CharacterSelect implements ClientPacket
{
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
@@ -62,14 +62,13 @@ public class CharacterSelect implements IClientIncomingPacket
private int _unk4; // new in C4
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _charSlot = packet.readD();
- _unk1 = packet.readH();
- _unk2 = packet.readD();
- _unk3 = packet.readD();
- _unk4 = packet.readD();
- return true;
+ _charSlot = packet.readInt();
+ _unk1 = packet.readShort();
+ _unk2 = packet.readInt();
+ _unk3 = packet.readInt();
+ _unk4 = packet.readInt();
}
@Override
@@ -112,7 +111,7 @@ public class CharacterSelect implements IClientIncomingPacket
// Banned?
if (PunishmentManager.getInstance().hasPunishment(info.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN) //
|| PunishmentManager.getInstance().hasPunishment(client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN) //
- || PunishmentManager.getInstance().hasPunishment(client.getConnectionAddress().getHostAddress(), PunishmentAffect.IP, PunishmentType.BAN))
+ || PunishmentManager.getInstance().hasPunishment(client.getIp(), PunishmentAffect.IP, PunishmentType.BAN))
{
client.close(ServerClose.STATIC_PACKET);
return;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ClientPacket.java
similarity index 77%
rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ClientPacket.java
index 62e69acd86..a66863d984 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ClientPacket.java
@@ -16,13 +16,19 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.IIncomingPacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
/**
- * Packets received by the game server from clients
- * @author KenM
+ * @author Mobius
*/
-public interface IClientIncomingPacket extends IIncomingPacket
+public abstract interface ClientPacket
{
+ default void read(ReadablePacket packet)
+ {
+ }
+
+ default void run(GameClient client)
+ {
+ }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index a1b815e9ea..7049d9ed6e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PlayerAction;
import org.l2jmobius.gameserver.handler.AdminCommandHandler;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -38,19 +38,18 @@ import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/**
* @author Dezmond_snz
*/
-public class DlgAnswer implements IClientIncomingPacket
+public class DlgAnswer implements ClientPacket
{
private int _messageId;
private int _answer;
private int _requesterId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _messageId = packet.readD();
- _answer = packet.readD();
- _requesterId = packet.readD();
- return true;
+ _messageId = packet.readInt();
+ _answer = packet.readInt();
+ _requesterId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/DummyPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/DummyPacket.java
deleted file mode 100644
index 3f3667e138..0000000000
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/DummyPacket.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.l2jmobius.gameserver.network.clientpackets;
-
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-
-/**
- * @author zabbix Lets drink to code!
- */
-public class DummyPacket implements IClientIncomingPacket
-{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return false;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
-}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
index cfe9b20f3d..aa012d0196 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.MovieHolder;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author JIV
*/
-public class EndScenePlayer implements IClientIncomingPacket
+public class EndScenePlayer implements ClientPacket
{
private int _movieId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _movieId = packet.readD();
- return true;
+ _movieId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 8465de5b99..9ecdf052d5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.cache.HtmCache;
@@ -133,29 +133,28 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
* packet format rev87 bddddbdcccccccccccccccccccc
*
*/
-public class EnterWorld implements IClientIncomingPacket
+public class EnterWorld implements ClientPacket
{
private static final Map TRACE_HWINFO = new ConcurrentHashMap<>();
private final int[][] _tracert = new int[5][4];
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
for (int i = 0; i < 5; i++)
{
for (int o = 0; o < 4; o++)
{
- _tracert[i][o] = packet.readC();
+ _tracert[i][o] = packet.readByte();
}
}
- packet.readD(); // Unknown Value
- packet.readD(); // Unknown Value
- packet.readD(); // Unknown Value
- packet.readD(); // Unknown Value
- packet.readB(64); // Unknown Byte Array
- packet.readD(); // Unknown Value
- return true;
+ packet.readInt(); // Unknown Value
+ packet.readInt(); // Unknown Value
+ packet.readInt(); // Unknown Value
+ packet.readInt(); // Unknown Value
+ packet.readBytes(64); // Unknown Byte Array
+ packet.readInt(); // Unknown Value
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
index 05d943f009..66e9817af6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
@@ -16,22 +16,20 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.IIncomingPacket;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Sdw
*/
-public class ExBookmarkPacket implements IClientIncomingPacket
+public class ExBookmarkPacket implements ClientPacket
{
- private IIncomingPacket _exBookmarkPacket;
+ private ClientPacket _exBookmarkPacket;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int subId = packet.readD();
-
+ final int subId = packet.readInt();
switch (subId)
{
case 0:
@@ -65,12 +63,19 @@ public class ExBookmarkPacket implements IClientIncomingPacket
break;
}
}
- return (_exBookmarkPacket != null) && _exBookmarkPacket.read(client, packet);
+
+ if (_exBookmarkPacket != null)
+ {
+ _exBookmarkPacket.read(packet);
+ }
}
@Override
- public void run(GameClient client) throws Exception
+ public void run(GameClient client)
{
- _exBookmarkPacket.run(client);
+ if (_exBookmarkPacket != null)
+ {
+ _exBookmarkPacket.run(client);
+ }
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
index 14e8153478..33904e57d6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
@@ -16,14 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
/**
* Format: (c) dddd d: dx d: dy d: dz d: AirShip id ??
* @author -Wooden-
*/
-public class ExGetOnAirShip implements IClientIncomingPacket
+public class ExGetOnAirShip implements ClientPacket
{
@SuppressWarnings("unused")
private int _x;
@@ -35,13 +35,12 @@ public class ExGetOnAirShip implements IClientIncomingPacket
private int _shipId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- _shipId = packet.readD();
- return false;
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
+ _shipId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExLetterCollectorTakeReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExLetterCollectorTakeReward.java
index adc923b811..4ace775fa9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExLetterCollectorTakeReward.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExLetterCollectorTakeReward.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.instancemanager.events.LetterCollectorManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -31,15 +31,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @author Index, Mobius
*/
-public class ExLetterCollectorTakeReward implements IClientIncomingPacket
+public class ExLetterCollectorTakeReward implements ClientPacket
{
private int _wordId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _wordId = packet.readD();
- return true;
+ _wordId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java
index 75f39586b1..920fdd9df6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
/**
* @author Mobius
*/
-public class ExOpenHtml implements IClientIncomingPacket
+public class ExOpenHtml implements ClientPacket
{
private int _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readC();
- return true;
+ _type = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
index 5882794071..c085efd4ca 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
/**
* @author Mobius
*/
-public class ExPCCafeRequestOpenWindowWithoutNPC implements IClientIncomingPacket
+public class ExPCCafeRequestOpenWindowWithoutNPC implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPacket.java
index 75c26ee8c9..6a214a705c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPacket.java
@@ -16,49 +16,55 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.IIncomingPacket;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.ExIncomingPackets;
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.gameserver.network.ExClientPackets;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Nos
*/
-public class ExPacket implements IClientIncomingPacket
+public class ExPacket implements ClientPacket
{
- // private static final Logger LOGGER = Logger.getLogger(ExPacket.class.getName());
-
- private ExIncomingPackets _exIncomingPacket;
- private IIncomingPacket _exPacket;
+ private ExClientPackets _packetEnum;
+ private ClientPacket _newPacket;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int exPacketId = packet.readH() & 0xFFFF;
- if ((exPacketId < 0) || (exPacketId >= ExIncomingPackets.PACKET_ARRAY.length))
+ final int exPacketId = packet.readShort() & 0xFFFF;
+ if ((exPacketId < 0) || (exPacketId >= ExClientPackets.PACKET_ARRAY.length))
{
- return false;
- }
-
- _exIncomingPacket = ExIncomingPackets.PACKET_ARRAY[exPacketId];
- if (_exIncomingPacket == null)
- {
- // LOGGER.finer(getClass().getSimpleName() + ": Unknown packet: " + Integer.toHexString(exPacketId));
- return false;
- }
-
- _exPacket = _exIncomingPacket.newIncomingPacket();
- return (_exPacket != null) && _exPacket.read(client, packet);
- }
-
- @Override
- public void run(GameClient client) throws Exception
- {
- if (!_exIncomingPacket.getConnectionStates().contains(client.getConnectionState()))
- {
- // LOGGER.finer(_exIncomingPacket + ": Connection at invalid state: " + client.getConnectionState() + " Required State: " + _exIncomingPacket.getConnectionStates());
return;
}
- _exPacket.run(client);
+
+ _packetEnum = ExClientPackets.PACKET_ARRAY[exPacketId];
+ if (_packetEnum == null)
+ {
+ return;
+ }
+
+ _newPacket = _packetEnum.newPacket();
+ if (_newPacket == null)
+ {
+ return;
+ }
+
+ _newPacket.read(packet);
+ }
+
+ @Override
+ public void run(GameClient client)
+ {
+ if (_newPacket == null)
+ {
+ return;
+ }
+
+ if (!_packetEnum.getConnectionStates().contains(client.getConnectionState()))
+ {
+ return;
+ }
+
+ _newPacket.run(client);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPvpBookList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPvpBookList.java
index 8d84e901cf..d535eaab32 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPvpBookList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExPvpBookList.java
@@ -16,21 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PvpBookList;
/**
* @author JoeAlisson
*/
-public class ExPvpBookList implements IClientIncomingPacket
+public class ExPvpBookList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java
index a4fcb58e21..27ad1bcc90 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java
@@ -16,22 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author St3eT
*/
-public class ExRequestAutoFish implements IClientIncomingPacket
+public class ExRequestAutoFish implements ClientPacket
{
private boolean _start;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _start = packet.readC() != 0;
- return true;
+ _start = packet.readByte() != 0;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java
index 06fc0c3893..1beb8d593e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java
@@ -16,22 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author St3eT
*/
-public class ExSendSelectedQuestZoneID implements IClientIncomingPacket
+public class ExSendSelectedQuestZoneID implements ClientPacket
{
private int _questZoneId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _questZoneId = packet.readD();
- return true;
+ _questZoneId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
index 3b59829eca..a7760b41f5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.StopRotation;
@@ -25,18 +25,17 @@ import org.l2jmobius.gameserver.network.serverpackets.StopRotation;
/**
* @version $Revision: 1.1.4.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class FinishRotating implements IClientIncomingPacket
+public class FinishRotating implements ClientPacket
{
private int _degree;
@SuppressWarnings("unused")
private int _unknown;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _degree = packet.readD();
- _unknown = packet.readD();
- return true;
+ _degree = packet.readInt();
+ _unknown = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
index 4e91188f5c..17794f928d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
@@ -20,7 +20,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.PacketLogger;
* Format: c dddd
* @author KenM
*/
-public class GameGuardReply implements IClientIncomingPacket
+public class GameGuardReply implements ClientPacket
{
private static final byte[] VALID =
{
@@ -57,12 +57,17 @@ public class GameGuardReply implements IClientIncomingPacket
private final byte[] _reply = new byte[8];
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readB(_reply, 0, 4);
- packet.readD();
- packet.readB(_reply, 4, 4);
- return true;
+ _reply[0] = (byte) packet.readByte();
+ _reply[1] = (byte) packet.readByte();
+ _reply[2] = (byte) packet.readByte();
+ _reply[3] = (byte) packet.readByte();
+ packet.readInt();
+ _reply[4] = (byte) packet.readByte();
+ _reply[5] = (byte) packet.readByte();
+ _reply[6] = (byte) packet.readByte();
+ _reply[7] = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
index e511566482..08bb0fabf7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -34,16 +33,10 @@ import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/**
* @version $Revision: 1.9.4.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class Logout implements IClientIncomingPacket
+public class Logout implements ClientPacket
{
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index e003159829..a3f5e226d7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Arrays;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.DoorData;
import org.l2jmobius.gameserver.enums.AdminTeleportType;
@@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.network.serverpackets.sayune.ExFlyMove;
import org.l2jmobius.gameserver.network.serverpackets.sayune.ExFlyMoveBroadcast;
import org.l2jmobius.gameserver.util.Broadcast;
-public class MoveBackwardToLocation implements IClientIncomingPacket
+public class MoveBackwardToLocation implements ClientPacket
{
private int _targetX;
private int _targetY;
@@ -54,16 +54,15 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
private int _movementMode;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetX = packet.readD();
- _targetY = packet.readD();
- _targetZ = packet.readD();
- _originX = packet.readD();
- _originY = packet.readD();
- _originZ = packet.readD();
- _movementMode = packet.readD(); // is 0 if cursor keys are used 1 if mouse is used
- return true;
+ _targetX = packet.readInt();
+ _targetY = packet.readInt();
+ _targetZ = packet.readInt();
+ _originX = packet.readInt();
+ _originY = packet.readInt();
+ _originZ = packet.readInt();
+ _movementMode = packet.readInt(); // is 0 if cursor keys are used 1 if mouse is used
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
index 2f458a0955..4440faa6e5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.AirShipManager;
import org.l2jmobius.gameserver.model.Location;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.instance.AirShip;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class MoveToLocationAirShip implements IClientIncomingPacket
+public class MoveToLocationAirShip implements ClientPacket
{
public static final int MIN_Z = -895;
public static final int MAX_Z = 6105;
@@ -38,15 +38,14 @@ public class MoveToLocationAirShip implements IClientIncomingPacket
private int _param2 = 0;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _command = packet.readD();
- _param1 = packet.readD();
- if (packet.getReadableBytes() > 0)
+ _command = packet.readInt();
+ _param1 = packet.readInt();
+ if (packet.getRemainingLength() > 0)
{
- _param2 = packet.readD();
+ _param2 = packet.readInt();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
index 0fdbec0a51..2711a76556 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.AirShip;
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
* format: ddddddd X:%d Y:%d Z:%d OriginX:%d OriginY:%d OriginZ:%d
* @author GodKratos
*/
-public class MoveToLocationInAirShip implements IClientIncomingPacket
+public class MoveToLocationInAirShip implements ClientPacket
{
private int _shipId;
private int _targetX;
@@ -41,16 +41,15 @@ public class MoveToLocationInAirShip implements IClientIncomingPacket
private int _originZ;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _shipId = packet.readD();
- _targetX = packet.readD();
- _targetY = packet.readD();
- _targetZ = packet.readD();
- _originX = packet.readD();
- _originY = packet.readD();
- _originZ = packet.readD();
- return true;
+ _shipId = packet.readInt();
+ _targetX = packet.readInt();
+ _targetY = packet.readInt();
+ _targetZ = packet.readInt();
+ _originX = packet.readInt();
+ _originY = packet.readInt();
+ _originZ = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
index c07cf28c6f..1eb521b9ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
@@ -16,14 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
/**
* Format: (c) ddd d: dx d: dy d: dz
* @author -Wooden-
*/
-public class MoveWithDelta implements IClientIncomingPacket
+public class MoveWithDelta implements ClientPacket
{
@SuppressWarnings("unused")
private int _dx;
@@ -33,12 +33,11 @@ public class MoveWithDelta implements IClientIncomingPacket
private int _dz;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _dx = packet.readD();
- _dy = packet.readD();
- _dz = packet.readD();
- return false;
+ _dx = packet.readInt();
+ _dy = packet.readInt();
+ _dz = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index c093e8bb2f..224152296e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.EnsoulData;
@@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
* The Class MultiSellChoose.
*/
-public class MultiSellChoose implements IClientIncomingPacket
+public class MultiSellChoose implements ClientPacket
{
private int _listId;
private int _entryId;
@@ -72,35 +72,34 @@ public class MultiSellChoose implements IClientIncomingPacket
private EnsoulOption[] _soulCrystalSpecialOptions;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _listId = packet.readD();
- _entryId = packet.readD();
- _amount = packet.readQ();
- _enchantLevel = packet.readH();
- _augmentOption1 = packet.readD();
- _augmentOption2 = packet.readD();
- _attackAttribute = (short) packet.readH();
- _attributePower = (short) packet.readH();
- _fireDefence = (short) packet.readH();
- _waterDefence = (short) packet.readH();
- _windDefence = (short) packet.readH();
- _earthDefence = (short) packet.readH();
- _holyDefence = (short) packet.readH();
- _darkDefence = (short) packet.readH();
- _soulCrystalOptions = new EnsoulOption[packet.readC()]; // Ensoul size
+ _listId = packet.readInt();
+ _entryId = packet.readInt();
+ _amount = packet.readLong();
+ _enchantLevel = packet.readShort();
+ _augmentOption1 = packet.readInt();
+ _augmentOption2 = packet.readInt();
+ _attackAttribute = (short) packet.readShort();
+ _attributePower = (short) packet.readShort();
+ _fireDefence = (short) packet.readShort();
+ _waterDefence = (short) packet.readShort();
+ _windDefence = (short) packet.readShort();
+ _earthDefence = (short) packet.readShort();
+ _holyDefence = (short) packet.readShort();
+ _darkDefence = (short) packet.readShort();
+ _soulCrystalOptions = new EnsoulOption[packet.readByte()]; // Ensoul size
for (int i = 0; i < _soulCrystalOptions.length; i++)
{
- final int ensoulId = packet.readD(); // Ensoul option id
+ final int ensoulId = packet.readInt(); // Ensoul option id
_soulCrystalOptions[i] = EnsoulData.getInstance().getOption(ensoulId);
}
- _soulCrystalSpecialOptions = new EnsoulOption[packet.readC()]; // Special ensoul size
+ _soulCrystalSpecialOptions = new EnsoulOption[packet.readByte()]; // Special ensoul size
for (int i = 0; i < _soulCrystalSpecialOptions.length; i++)
{
- final int ensoulId = packet.readD(); // Special ensoul option id.
+ final int ensoulId = packet.readInt(); // Special ensoul option id.
_soulCrystalSpecialOptions[i] = EnsoulData.getInstance().getOption(ensoulId);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
index 7e89838e75..17faef7fe5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.PlayerTemplateData;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess;
/**
* @author Zoey76
*/
-public class NewCharacter implements IClientIncomingPacket
+public class NewCharacter implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java
index 2e972f196b..0ba2f29e65 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Sdw
*/
-public class NotifyExitBeautyShop implements IClientIncomingPacket
+public class NotifyExitBeautyShop implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
index 7fd51301c9..55b2d0a819 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
@@ -16,21 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.7.4.4 $ $Date: 2005/03/27 18:46:19 $
*/
-public class ObserverReturn implements IClientIncomingPacket
+public class ObserverReturn implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
index b8b7ec4d5c..c723992666 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
@@ -19,33 +19,32 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.KeyPacket;
/**
* @version $Revision: 1.5.2.8.2.8 $ $Date: 2005/04/02 10:43:04 $
*/
-public class ProtocolVersion implements IClientIncomingPacket
+public class ProtocolVersion implements ClientPacket
{
private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
private int _version;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _version = packet.readD();
- return true;
+ _version = packet.readInt();
}
@Override
public void run(GameClient client)
{
- // this packet is never encrypted
+ // This packet is never encrypted.
if (_version == -2)
{
- // this is just a ping attempt from the new C2 client
+ // This is just a ping attempt from the new C2 client.
client.closeNow();
}
else if (!Config.PROTOCOL_LIST.contains(_version))
@@ -56,9 +55,9 @@ public class ProtocolVersion implements IClientIncomingPacket
}
else
{
- client.sendPacket(new KeyPacket(client.enableCrypt(), 1));
client.setProtocolVersion(_version);
client.setProtocolOk(true);
+ client.sendPacket(new KeyPacket(client.enableCrypt(), 1));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 08190bc383..9af76cd03a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.enums.AcquireSkillType;
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.util.Util;
* Request Acquire Skill client packet implementation.
* @author Zoey76
*/
-public class RequestAcquireSkill implements IClientIncomingPacket
+public class RequestAcquireSkill implements ClientPacket
{
/*
* private static final String[] REVELATION_VAR_NAMES = { PlayerVariables.REVELATION_SKILL_1_MAIN_CLASS, PlayerVariables.REVELATION_SKILL_2_MAIN_CLASS }; private static final String[] DUALCLASS_REVELATION_VAR_NAMES = { PlayerVariables.REVELATION_SKILL_1_DUAL_CLASS,
@@ -73,16 +73,15 @@ public class RequestAcquireSkill implements IClientIncomingPacket
private int _subType;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- _level = packet.readD();
- _skillType = AcquireSkillType.getAcquireSkillType(packet.readD());
+ _id = packet.readInt();
+ _level = packet.readInt();
+ _skillType = AcquireSkillType.getAcquireSkillType(packet.readInt());
if (_skillType == AcquireSkillType.SUBPLEDGE)
{
- _subType = packet.readD();
+ _subType = packet.readInt();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index beeceb0a96..a7a258aac2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.enums.AcquireSkillType;
@@ -35,19 +35,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo;
* Request Acquire Skill Info client packet implementation.
* @author Zoey76
*/
-public class RequestAcquireSkillInfo implements IClientIncomingPacket
+public class RequestAcquireSkillInfo implements ClientPacket
{
private int _id;
private int _level;
private AcquireSkillType _skillType;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- _level = packet.readD();
- _skillType = AcquireSkillType.getAcquireSkillType(packet.readD());
- return true;
+ _id = packet.readInt();
+ _level = packet.readInt();
+ _skillType = AcquireSkillType.getAcquireSkillType(packet.readInt());
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 0b8b67f9a0..877179d829 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Arrays;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.ActionData;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
@@ -39,19 +39,18 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
* This class manages the action use request packet.
* @author Zoey76
*/
-public class RequestActionUse implements IClientIncomingPacket
+public class RequestActionUse implements ClientPacket
{
private int _actionId;
private boolean _ctrlPressed;
private boolean _shiftPressed;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _actionId = packet.readD();
- _ctrlPressed = (packet.readD() == 1);
- _shiftPressed = (packet.readC() == 1);
- return true;
+ _actionId = packet.readInt();
+ _ctrlPressed = (packet.readInt() == 1);
+ _shiftPressed = (packet.readByte() == 1);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java
index cd7d17dc20..39e91af794 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.Quest;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Sdw
*/
-public class RequestAddExpandQuestAlarm implements IClientIncomingPacket
+public class RequestAddExpandQuestAlarm implements ClientPacket
{
private int _questId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _questId = packet.readD();
- return true;
+ _questId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 94911328a2..4351c95bda 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExAlchemySkillList;
/**
* @author UnAfraid
*/
-public class RequestAlchemySkillList implements IClientIncomingPacket
+public class RequestAlchemySkillList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index fb6b18d662..d774848bc0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowAgitInfo;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowAgitInfo;
/**
* @author KenM
*/
-public class RequestAllAgitInfo implements IClientIncomingPacket
+public class RequestAllAgitInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index b6f8d4fb9e..46033582f3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowCastleInfo;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowCastleInfo;
/**
* @author KenM
*/
-public class RequestAllCastleInfo implements IClientIncomingPacket
+public class RequestAllCastleInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index beb5024780..86e0004b81 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressInfo;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressInfo;
/**
* @author KenM
*/
-public class RequestAllFortressInfo implements IClientIncomingPacket
+public class RequestAllFortressInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 3e864837f8..7384ba7f98 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.AllyCrest;
@@ -24,17 +24,16 @@ import org.l2jmobius.gameserver.network.serverpackets.AllyCrest;
/**
* @version $Revision: 1.3.4.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestAllyCrest implements IClientIncomingPacket
+public class RequestAllyCrest implements ClientPacket
{
private int _crestId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _crestId = packet.readD();
- packet.readD(); // Ally ID
- packet.readD(); // Server ID
- return true;
+ _crestId = packet.readInt();
+ packet.readInt(); // Ally ID
+ packet.readInt(); // Server ID
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 4dc52e2648..683c961938 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanInfo;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,14 +26,8 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1479 $ $Date: 2005-11-09 00:47:42 +0100 (mer., 09 nov. 2005) $
*/
-public class RequestAllyInfo implements IClientIncomingPacket
+public class RequestAllyInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
index dd87921944..37bc45b9ad 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
@@ -16,21 +16,20 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class RequestAnswerJoinAlly implements IClientIncomingPacket
+public class RequestAnswerJoinAlly implements ClientPacket
{
private int _response;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _response = packet.readD();
- return true;
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
index 074b35b319..057b9c5c2a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PartyMessageType;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.JoinParty;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-public class RequestAnswerJoinParty implements IClientIncomingPacket
+public class RequestAnswerJoinParty implements ClientPacket
{
private int _response;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _response = packet.readD();
- return true;
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index 084ad4ade9..2728233490 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -35,15 +35,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestAnswerJoinPledge implements IClientIncomingPacket
+public class RequestAnswerJoinPledge implements ClientPacket
{
private int _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _answer = packet.readD();
- return true;
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
index 8b105bb9ab..e77eccef32 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* Format: (ch) S
* @author -Wooden-, Tryskell
*/
-public class RequestAskJoinPartyRoom implements IClientIncomingPacket
+public class RequestAskJoinPartyRoom implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index e3f670c775..0099fb36e3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -32,19 +32,18 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Unknown, UnAfraid
*/
-public class RequestAutoSoulShot implements IClientIncomingPacket
+public class RequestAutoSoulShot implements ClientPacket
{
private int _itemId;
private boolean _enable;
private int _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemId = packet.readD();
- _enable = packet.readD() == 1;
- _type = packet.readD();
- return true;
+ _itemId = packet.readInt();
+ _enable = packet.readInt() == 1;
+ _type = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 4b817c3e70..4681c21d7f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.handler.CommunityBoardHandler;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.GameClient;
* RequestBBSwrite client packet implementation.
* @author -Wooden-, Zoey76
*/
-public class RequestBBSwrite implements IClientIncomingPacket
+public class RequestBBSwrite implements ClientPacket
{
private String _url;
private String _arg1;
@@ -35,15 +35,14 @@ public class RequestBBSwrite implements IClientIncomingPacket
private String _arg5;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _url = packet.readS();
- _arg1 = packet.readS();
- _arg2 = packet.readS();
- _arg3 = packet.readS();
- _arg4 = packet.readS();
- _arg5 = packet.readS();
- return true;
+ _url = packet.readString();
+ _arg1 = packet.readString();
+ _arg2 = packet.readString();
+ _arg3 = packet.readString();
+ _arg4 = packet.readString();
+ _arg5 = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
index bbcd1c8223..714439550d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.itemauction.ItemAuction;
@@ -27,17 +27,16 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Forsaiken
*/
-public class RequestBidItemAuction implements IClientIncomingPacket
+public class RequestBidItemAuction implements ClientPacket
{
private int _instanceId;
private long _bid;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _instanceId = packet.readD();
- _bid = packet.readQ();
- return true;
+ _instanceId = packet.readInt();
+ _bid = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
index 76649875f1..c56aacbe04 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.model.BlockList;
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-public class RequestBlock implements IClientIncomingPacket
+public class RequestBlock implements ClientPacket
{
private static final int BLOCK = 0;
private static final int UNBLOCK = 1;
@@ -38,14 +38,13 @@ public class RequestBlock implements IClientIncomingPacket
private Integer _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readD(); // 0x00 - block, 0x01 - unblock, 0x03 - allblock, 0x04 - allunblock
+ _type = packet.readInt(); // 0x00 - block, 0x01 - unblock, 0x03 - allblock, 0x04 - allunblock
if ((_type == BLOCK) || (_type == UNBLOCK))
{
- _name = packet.readS();
+ _name = packet.readString();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
index b5a7a3cf15..78b8aabe3b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
/**
* @author ShanSoft Packets Structure: chddd
*/
-public class RequestBookMarkSlotInfo implements IClientIncomingPacket
+public class RequestBookMarkSlotInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index aac31eeb48..f8da3e6475 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.BuyListData;
import org.l2jmobius.gameserver.enums.TaxType;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
import org.l2jmobius.gameserver.util.Util;
-public class RequestBuyItem implements IClientIncomingPacket
+public class RequestBuyItem implements ClientPacket
{
private static final int BATCH_LENGTH = 12;
private static final int CUSTOM_CB_SELL_LIST = 423;
@@ -49,28 +49,27 @@ public class RequestBuyItem implements IClientIncomingPacket
private List _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _listId = packet.readD();
- final int size = packet.readD();
- if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != packet.getReadableBytes()))
+ _listId = packet.readInt();
+ final int size = packet.readInt();
+ if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
- final int itemId = packet.readD();
- final long count = packet.readQ();
+ final int itemId = packet.readInt();
+ final long count = packet.readLong();
if ((itemId < 1) || (count < 1))
{
_items = null;
- return false;
+ return;
}
_items.add(new ItemHolder(itemId, count));
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index f841f306a1..1f0314fe45 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
@@ -44,35 +44,34 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author l3x
*/
-public class RequestBuySeed implements IClientIncomingPacket
+public class RequestBuySeed implements ClientPacket
{
private static final int BATCH_LENGTH = 12; // length of the one item
private int _manorId;
private List _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _manorId = packet.readD();
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ _manorId = packet.readInt();
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ArrayList<>(count);
for (int i = 0; i < count; i++)
{
- final int itemId = packet.readD();
- final long cnt = packet.readQ();
+ final int itemId = packet.readInt();
+ final long cnt = packet.readLong();
if ((cnt < 1) || (itemId < 1))
{
_items = null;
- return false;
+ return;
}
_items.add(new ItemHolder(itemId, cnt));
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
index efed813dbf..ad386aa347 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
@@ -16,18 +16,11 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-public class RequestBuySellUIClose implements IClientIncomingPacket
+public class RequestBuySellUIClose implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index c9fd20f8a1..f138339094 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.StringTokenizer;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.MultisellData;
import org.l2jmobius.gameserver.handler.AdminCommandHandler;
@@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.util.Util;
* RequestBypassToServer client packet implementation.
* @author HorridoJoho
*/
-public class RequestBypassToServer implements IClientIncomingPacket
+public class RequestBypassToServer implements ClientPacket
{
// FIXME: This is for compatibility, will be changed when bypass functionality got an overhaul by NosBit
private static final String[] _possibleNonHtmlCommands =
@@ -72,10 +72,9 @@ public class RequestBypassToServer implements IClientIncomingPacket
private String _command;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _command = packet.readS();
- return true;
+ _command = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
index 34b382b1c8..874904506f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.instancemanager.MailManager;
@@ -37,15 +37,14 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Migi, DS
*/
-public class RequestCancelPostAttachment implements IClientIncomingPacket
+public class RequestCancelPostAttachment implements ClientPacket
{
private int _msgId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _msgId = packet.readD();
- return true;
+ _msgId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
index 8d17d84a27..64f7f12390 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
@@ -16,22 +16,9 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-
/**
* @author ShanSoft Packets Structure: chddd
*/
-public class RequestChangeBookMarkSlot implements IClientIncomingPacket
+public class RequestChangeBookMarkSlot implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return false;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
index 080e9ff29b..98c21a6c12 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author KenM, Gnacik
*/
-public class RequestChangeNicknameColor implements IClientIncomingPacket
+public class RequestChangeNicknameColor implements ClientPacket
{
private static final int[] COLORS =
{
@@ -45,12 +45,11 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket
private String _title;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _colorNum = packet.readD();
- _title = packet.readS();
- _itemId = packet.readD();
- return true;
+ _colorNum = packet.readInt();
+ _title = packet.readString();
+ _itemId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
index 83cddc7124..c3518203ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* This packet is received from client when a party leader requests to change the leadership to another player in his party.
*/
-public class RequestChangePartyLeader implements IClientIncomingPacket
+public class RequestChangePartyLeader implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java
index 522e1a6da9..b348a16b3f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.EventType;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/**
* @author Sdw
*/
-public class RequestChangeToAwakenedClass implements IClientIncomingPacket
+public class RequestChangeToAwakenedClass implements ClientPacket
{
private boolean _change;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _change = packet.readD() == 1;
- return true;
+ _change = packet.readInt() == 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java
index 3a08bf1d31..3d9c94fd64 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class RequestCharacterNameCreatable implements IClientIncomingPacket
+public class RequestCharacterNameCreatable implements ClientPacket
{
private String _name;
@@ -38,10 +38,9 @@ public class RequestCharacterNameCreatable implements IClientIncomingPacket
public static final int CANNOT_CREATE_SERVER = 5;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index eade985c62..464169a152 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,17 +25,16 @@ import org.l2jmobius.gameserver.network.serverpackets.AskJoinPledge;
/**
* @author Mobius
*/
-public class RequestClanAskJoinByName implements IClientIncomingPacket
+public class RequestClanAskJoinByName implements ClientPacket
{
private String _playerName;
private int _pledgeType;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _playerName = packet.readS();
- _pledgeType = packet.readD();
- return true;
+ _playerName = packet.readString();
+ _pledgeType = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index b65ad7c589..8aad2ed4ac 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.VariationData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,15 +30,14 @@ import org.l2jmobius.gameserver.util.Util;
* Format(ch) d
* @author -Wooden-
*/
-public class RequestConfirmCancelItem implements IClientIncomingPacket
+public class RequestConfirmCancelItem implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index 5ae334f854..9216569367 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.VariationData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -37,13 +37,12 @@ public class RequestConfirmGemStone extends AbstractRefinePacket
private long _feeCount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- _mineralItemObjId = packet.readD();
- _feeItemObjId = packet.readD();
- _feeCount = packet.readQ();
- return true;
+ _targetItemObjId = packet.readInt();
+ _mineralItemObjId = packet.readInt();
+ _feeItemObjId = packet.readInt();
+ _feeCount = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
index f95c21b0bd..2cdb65cc90 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.VariationData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -35,11 +35,10 @@ public class RequestConfirmRefinerItem extends AbstractRefinePacket
private int _refinerItemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- _refinerItemObjId = packet.readD();
- return true;
+ _targetItemObjId = packet.readInt();
+ _refinerItemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index dd69523f80..900723a65e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,19 +28,18 @@ import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
+public class RequestConfirmSiegeWaitingList implements ClientPacket
{
private int _approved;
private int _castleId;
private int _clanId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _castleId = packet.readD();
- _clanId = packet.readD();
- _approved = packet.readD();
- return true;
+ _castleId = packet.readInt();
+ _clanId = packet.readInt();
+ _approved = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index b2f53bed92..3aaacfd604 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.VariationData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -33,10 +33,9 @@ public class RequestConfirmTargetItem extends AbstractRefinePacket
private int _itemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemObjId = packet.readD();
- return true;
+ _itemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 75daf16dee..64c560aad2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@@ -41,17 +41,16 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.2.2.3.2.5 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestCrystallizeItem implements IClientIncomingPacket
+public class RequestCrystallizeItem implements ClientPacket
{
private int _objectId;
private long _count;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _count = packet.readQ();
- return true;
+ _objectId = packet.readInt();
+ _count = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 5fd67b8759..2801763a7e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExCursedWeaponList;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExCursedWeaponList;
* Format: (ch)
* @author -Wooden-
*/
-public class RequestCursedWeaponList implements IClientIncomingPacket
+public class RequestCursedWeaponList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 193c436d7e..28423026ed 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.model.CursedWeapon;
import org.l2jmobius.gameserver.model.Location;
@@ -32,14 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExCursedWeaponLocation.Cur
* Format: (ch)
* @author -Wooden-
*/
-public class RequestCursedWeaponLocation implements IClientIncomingPacket
+public class RequestCursedWeaponLocation implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
index 0877699e00..8b4aae6af8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.GameClient;
* @author ShanSoft
* @structure: chdd
*/
-public class RequestDeleteBookMarkSlot implements IClientIncomingPacket
+public class RequestDeleteBookMarkSlot implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- return true;
+ _id = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
index 4533703b07..55dbe099b5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
@@ -16,19 +16,18 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-public class RequestDeleteMacro implements IClientIncomingPacket
+public class RequestDeleteMacro implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- return true;
+ _id = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index 8685cb4867..99cb13776a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,27 +30,26 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Migi, DS
*/
-public class RequestDeleteReceivedPost implements IClientIncomingPacket
+public class RequestDeleteReceivedPost implements ClientPacket
{
private static final int BATCH_LENGTH = 4; // length of the one item
int[] _msgIds = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_msgIds = new int[count];
for (int i = 0; i < count; i++)
{
- _msgIds[i] = packet.readD();
+ _msgIds[i] = packet.readInt();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index c4d3846ad7..8d33a862ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,27 +30,27 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Migi, DS
*/
-public class RequestDeleteSentPost implements IClientIncomingPacket
+public class RequestDeleteSentPost implements ClientPacket
{
private static final int BATCH_LENGTH = 4; // length of the one item
int[] _msgIds = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_msgIds = new int[count];
for (int i = 0; i < count; i++)
{
- _msgIds[i] = packet.readD();
+ _msgIds[i] = packet.readInt();
}
- return true;
+ return;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index bedac1793b..6de26c2529 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.handler.AdminCommandHandler;
@@ -43,17 +43,16 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.7.2.4.2.6 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestDestroyItem implements IClientIncomingPacket
+public class RequestDestroyItem implements ClientPacket
{
private int _objectId;
private long _count;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _count = packet.readQ();
- return true;
+ _objectId = packet.readInt();
+ _count = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 5227396561..603a9ad9c0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestDismissAlly implements IClientIncomingPacket
+public class RequestDismissAlly implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
index 1f3e8056cd..618744f50a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
@@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Gnacik
*/
-public class RequestDismissPartyRoom implements IClientIncomingPacket
+public class RequestDismissPartyRoom implements ClientPacket
{
private int _roomid;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomid = packet.readD();
- packet.readD();
- return true;
+ _roomid = packet.readInt();
+ packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
index 62fda61953..22c3fa9a2a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author KenM
*/
-public class RequestDispel implements IClientIncomingPacket
+public class RequestDispel implements ClientPacket
{
private int _objectId;
private int _skillId;
@@ -37,13 +37,12 @@ public class RequestDispel implements IClientIncomingPacket
private int _skillSubLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _skillId = packet.readD();
- _skillLevel = packet.readH();
- _skillSubLevel = packet.readH();
- return true;
+ _objectId = packet.readInt();
+ _skillId = packet.readInt();
+ _skillLevel = packet.readShort();
+ _skillSubLevel = packet.readShort();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
index d53c021ecd..5d022ff335 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.11.2.1.2.7 $ $Date: 2005/04/02 21:25:21 $
*/
-public class RequestDropItem implements IClientIncomingPacket
+public class RequestDropItem implements ClientPacket
{
private int _objectId;
private long _count;
@@ -49,14 +49,13 @@ public class RequestDropItem implements IClientIncomingPacket
private int _z;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _count = packet.readQ();
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- return true;
+ _objectId = packet.readInt();
+ _count = packet.readLong();
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
index 6ec10de1a5..629adfef5e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.DuelManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* Format:(ch) ddd
* @author -Wooden-
*/
-public class RequestDuelAnswerStart implements IClientIncomingPacket
+public class RequestDuelAnswerStart implements ClientPacket
{
private int _partyDuel;
@SuppressWarnings("unused")
@@ -35,12 +35,11 @@ public class RequestDuelAnswerStart implements IClientIncomingPacket
private int _response;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _partyDuel = packet.readD();
- _unk1 = packet.readD();
- _response = packet.readD();
- return true;
+ _partyDuel = packet.readInt();
+ _unk1 = packet.readInt();
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
index 3b49a0610c..69ff0eabc2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.model.Party;
@@ -33,17 +33,16 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* Format:(ch) Sd
* @author -Wooden-
*/
-public class RequestDuelStart implements IClientIncomingPacket
+public class RequestDuelStart implements ClientPacket
{
private String _player;
private int _partyDuel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _player = packet.readS();
- _partyDuel = packet.readD();
- return true;
+ _player = packet.readString();
+ _partyDuel = packet.readInt();
}
private void scheduleDeny(Player player, String name)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index f5607f7fa5..fabc17c47e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.DuelManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.GameClient;
* Format:(ch) just a trigger
* @author -Wooden-
*/
-public class RequestDuelSurrender implements IClientIncomingPacket
+public class RequestDuelSurrender implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 32996f3bb5..3488a5ec79 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.enums.ItemSkillType;
@@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Broadcast;
import org.l2jmobius.gameserver.util.Util;
-public class RequestEnchantItem implements IClientIncomingPacket
+public class RequestEnchantItem implements ClientPacket
{
protected static final Logger LOGGER_ENCHANT = Logger.getLogger("enchant.items");
@@ -52,11 +52,10 @@ public class RequestEnchantItem implements IClientIncomingPacket
private int _supportId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _supportId = packet.readD();
- return true;
+ _objectId = packet.readInt();
+ _supportId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
index 863609e4fd..146bf739c2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.SecondaryAuthData;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
* Format: (ch)
* @author mrTJO
*/
-public class RequestEx2ndPasswordCheck implements IClientIncomingPacket
+public class RequestEx2ndPasswordCheck implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
index 997fb9af10..116736bb9a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.SecondaryAuthData;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck;
@@ -26,22 +26,21 @@ import org.l2jmobius.gameserver.security.SecondaryPasswordAuth;
* (ch)cS{S} c: change pass? S: current password S: new password
* @author mrTJO
*/
-public class RequestEx2ndPasswordReq implements IClientIncomingPacket
+public class RequestEx2ndPasswordReq implements ClientPacket
{
private int _changePass;
private String _password;
private String _newPassword;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _changePass = packet.readC();
- _password = packet.readS();
+ _changePass = packet.readByte();
+ _password = packet.readString();
if (_changePass == 2)
{
- _newPassword = packet.readS();
+ _newPassword = packet.readString();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
index a2a66efe7d..1c72367072 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.SecondaryAuthData;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.GameClient;
* Format: (ch)S S: numerical password
* @author mrTJO
*/
-public class RequestEx2ndPasswordVerify implements IClientIncomingPacket
+public class RequestEx2ndPasswordVerify implements ClientPacket
{
private String _password;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _password = packet.readS();
- return true;
+ _password = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
index e14047e578..201410515a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* format: (ch) d
* @author -Wooden-
*/
-public class RequestExAcceptJoinMPCC implements IClientIncomingPacket
+public class RequestExAcceptJoinMPCC implements ClientPacket
{
private int _response;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _response = packet.readD();
- return true;
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
index 0f0d3f2a47..dcb1cb30fe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExConfirmAddingContact;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExConfirmAddingContact;
* Format: (ch)S S: Character Name
* @author UnAfraid & mrTJO
*/
-public class RequestExAddContactToContactList implements IClientIncomingPacket
+public class RequestExAddContactToContactList implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
index 1c6df952cc..1b86f47f4b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
@@ -29,17 +29,16 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResu
/**
* @author Sdw
*/
-public class RequestExAddEnchantScrollItem implements IClientIncomingPacket
+public class RequestExAddEnchantScrollItem implements ClientPacket
{
private int _scrollObjectId;
private int _enchantObjectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _scrollObjectId = packet.readD();
- _enchantObjectId = packet.readD();
- return true;
+ _scrollObjectId = packet.readInt();
+ _enchantObjectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
index 36d53489fe..71055ecd75 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,15 +30,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* D0 0D 00 5A 00 77 00 65 00 72 00 67 00 00 00
* @author chris_00
*/
-public class RequestExAskJoinMPCC implements IClientIncomingPacket
+public class RequestExAskJoinMPCC implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 22d6a0efa5..4f413597e3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.EnchantResult;
/**
* @author KenM
*/
-public class RequestExCancelEnchantItem implements IClientIncomingPacket
+public class RequestExCancelEnchantItem implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
index e8bfc249c9..12fce0700c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName;
@@ -25,19 +25,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName;
* Reply for {@link ExNeedToChangeName}
* @author JIV
*/
-public class RequestExChangeName implements IClientIncomingPacket
+public class RequestExChangeName implements ClientPacket
{
private String _newName;
private int _type;
private int _charSlot;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readD();
- _newName = packet.readS();
- _charSlot = packet.readD();
- return true;
+ _type = packet.readInt();
+ _newName = packet.readString();
+ _charSlot = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
index c2f02f89ad..edf4a96572 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,18 +26,17 @@ import org.l2jmobius.gameserver.network.PacketLogger;
* Format: chdd d: Arena d: Team
* @author mrTJO
*/
-public class RequestExCubeGameChangeTeam implements IClientIncomingPacket
+public class RequestExCubeGameChangeTeam implements ClientPacket
{
private int _arena;
private int _team;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
// client sends -1,0,1,2 for arena parameter
- _arena = packet.readD() + 1;
- _team = packet.readD();
- return true;
+ _arena = packet.readInt() + 1;
+ _team = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
index d72fdfc413..469c512697 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,19 +26,18 @@ import org.l2jmobius.gameserver.network.PacketLogger;
* Format: chddd d: Arena d: Answer
* @author mrTJO
*/
-public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket
+public class RequestExCubeGameReadyAnswer implements ClientPacket
{
private int _arena;
private int _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
// client sends -1,0,1,2 for arena parameter
- _arena = packet.readD() + 1;
+ _arena = packet.readInt() + 1;
// client sends 1 if clicked confirm on not clicked, 0 if clicked cancel
- _answer = packet.readD();
- return true;
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
index 81e0666178..100ca6e5f1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
* Format: (ch)S S: Character Name
* @author UnAfraid & mrTJO
*/
-public class RequestExDeleteContactFromContactList implements IClientIncomingPacket
+public class RequestExDeleteContactFromContactList implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java
index bb00a50983..b535f17429 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Sdw
*/
-public class RequestExDismissMpccRoom implements IClientIncomingPacket
+public class RequestExDismissMpccRoom implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 750e81a43e..4915186632 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.ElementalAttributeData;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@@ -34,17 +34,16 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.util.Util;
-public class RequestExEnchantItemAttribute implements IClientIncomingPacket
+public class RequestExEnchantItemAttribute implements ClientPacket
{
private int _objectId;
private long _count;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _count = packet.readQ();
- return true;
+ _objectId = packet.readInt();
+ _count = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index b60aac9631..ab953d4fc4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.data.xml.SkillData;
@@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
+import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
@@ -39,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author -Wooden-
*/
-public class RequestExEnchantSkill implements IClientIncomingPacket
+public class RequestExEnchantSkill implements ClientPacket
{
private static final Logger LOGGER = Logger.getLogger(RequestExEnchantSkill.class.getName());
private static final Logger LOGGER_ENCHANT = Logger.getLogger("enchant.skills");
@@ -50,20 +51,19 @@ public class RequestExEnchantSkill implements IClientIncomingPacket
private int _skillSubLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int type = packet.readD();
+ final int type = packet.readInt();
if ((type < 0) || (type >= SkillEnchantType.values().length))
{
- LOGGER.warning("Client: " + client + " send incorrect type " + type + " on packet: " + getClass().getSimpleName());
- return false;
+ PacketLogger.warning("Client send incorrect type " + type + " on packet: " + getClass().getSimpleName());
+ return;
}
_type = SkillEnchantType.values()[type];
- _skillId = packet.readD();
- _skillLevel = packet.readH();
- _skillSubLevel = packet.readH();
- return true;
+ _skillId = packet.readInt();
+ _skillLevel = packet.readShort();
+ _skillSubLevel = packet.readShort();
}
@Override
@@ -74,14 +74,15 @@ public class RequestExEnchantSkill implements IClientIncomingPacket
return;
}
- if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
{
return;
}
- final Player player = client.getPlayer();
- if (player == null)
+ if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0))
{
+ PacketLogger.warning(player + " tried to exploit RequestExEnchantSkill!");
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 921de5a2ad..de43eeb532 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,19 +30,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfo;
* Format (ch) dd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill level
* @author -Wooden-
*/
-public class RequestExEnchantSkillInfo implements IClientIncomingPacket
+public class RequestExEnchantSkillInfo implements ClientPacket
{
private int _skillId;
private int _skillLevel;
private int _skillSubLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _skillId = packet.readD();
- _skillLevel = packet.readH();
- _skillSubLevel = packet.readH();
- return true;
+ _skillId = packet.readInt();
+ _skillLevel = packet.readShort();
+ _skillSubLevel = packet.readShort();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 54a540188c..d3238e599e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.SkillEnchantType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
/**
* @author -Wooden-
*/
-public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
+public class RequestExEnchantSkillInfoDetail implements ClientPacket
{
private SkillEnchantType _type;
private int _skillId;
@@ -33,13 +33,12 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
private int _skillSubLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = SkillEnchantType.values()[packet.readD()];
- _skillId = packet.readD();
- _skillLevel = packet.readH();
- _skillSubLevel = packet.readH();
- return true;
+ _type = SkillEnchantType.values()[packet.readInt()];
+ _skillId = packet.readInt();
+ _skillLevel = packet.readShort();
+ _skillSubLevel = packet.readShort();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java
index 9293c69407..c3eaf2f5a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.MovieHolder;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author St3eT
*/
-public class RequestExEscapeScene implements IClientIncomingPacket
+public class RequestExEscapeScene implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
@@ -46,6 +39,7 @@ public class RequestExEscapeScene implements IClientIncomingPacket
{
return;
}
+
holder.playerEscapeVote(player);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
index 3347f01941..c7267c1989 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.PacketLogger;
* Format: (ch) just a trigger
* @author -Wooden-
*/
-public class RequestExFishRanking implements IClientIncomingPacket
+public class RequestExFishRanking implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 79088e0c3a..ec375c60a1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.friend.FriendList;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.friend.FriendList;
/**
* @author mrTJO & UnAfraid
*/
-public class RequestExFriendListExtended implements IClientIncomingPacket
+public class RequestExFriendListExtended implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java
index 778e48cf73..7dcc254616 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Sdw
*/
-public class RequestExJoinMpccRoom implements IClientIncomingPacket
+public class RequestExJoinMpccRoom implements ClientPacket
{
private int _roomId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomId = packet.readD();
- return true;
+ _roomId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java
index 7b7e2615ae..f3be57d21f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExListMpccWaiting;
@@ -24,19 +24,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExListMpccWaiting;
/**
* @author Sdw
*/
-public class RequestExListMpccWaiting implements IClientIncomingPacket
+public class RequestExListMpccWaiting implements ClientPacket
{
private int _page;
private int _location;
private int _level;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _page = packet.readD();
- _location = packet.readD();
- _level = packet.readD();
- return true;
+ _page = packet.readInt();
+ _location = packet.readInt();
+ _level = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 150caed567..cd590aa104 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExMPCCShowPartyMemberInfo;
* Format:(ch) d
* @author chris_00
*/
-public class RequestExMPCCShowPartyMembersInfo implements IClientIncomingPacket
+public class RequestExMPCCShowPartyMembersInfo implements ClientPacket
{
private int _partyLeaderId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _partyLeaderId = packet.readD();
- return true;
+ _partyLeaderId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 667ce7f17c..4ca0aa29ee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
* Format:(ch) dddddc
* @author -Wooden-
*/
-public class RequestExMagicSkillUseGround implements IClientIncomingPacket
+public class RequestExMagicSkillUseGround implements ClientPacket
{
private int _x;
private int _y;
@@ -42,15 +42,14 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket
private boolean _shiftPressed;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- _skillId = packet.readD();
- _ctrlPressed = packet.readD() != 0;
- _shiftPressed = packet.readC() != 0;
- return true;
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
+ _skillId = packet.readInt();
+ _ctrlPressed = packet.readInt() != 0;
+ _shiftPressed = packet.readByte() != 0;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java
index 24863e19a2..674441bab5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExMPCCRoomInfo;
/**
* @author Sdw
*/
-public class RequestExManageMpccRoom implements IClientIncomingPacket
+public class RequestExManageMpccRoom implements ClientPacket
{
private int _roomId;
private int _maxMembers;
@@ -37,15 +37,14 @@ public class RequestExManageMpccRoom implements IClientIncomingPacket
private String _title;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomId = packet.readD();
- _maxMembers = packet.readD();
- _minLevel = packet.readD();
- _maxLevel = packet.readD();
- packet.readD(); // Party Distrubtion Type
- _title = packet.readS();
- return true;
+ _roomId = packet.readInt();
+ _maxMembers = packet.readInt();
+ _minLevel = packet.readInt();
+ _maxLevel = packet.readInt();
+ packet.readInt(); // Party Distrubtion Type
+ _title = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java
index ac1c2ee10e..2b423cf31c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java
@@ -20,7 +20,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -31,14 +30,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExMPCCPartymasterList;
/**
* @author Sdw
*/
-public class RequestExMpccPartymasterList implements IClientIncomingPacket
+public class RequestExMpccPartymasterList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
index b858084554..751b20943b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMatchList;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMatchList;
* Format: (ch)d d: unknown (always 0?)
* @author mrTJO
*/
-public class RequestExOlympiadMatchListRefresh implements IClientIncomingPacket
+public class RequestExOlympiadMatchListRefresh implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
index 01b0e6cdf7..92ceed77b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* D0 0F 00 5A 00 77 00 65 00 72 00 67 00 00 00
* @author -Wooden-
*/
-public class RequestExOustFromMPCC implements IClientIncomingPacket
+public class RequestExOustFromMPCC implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java
index 7783e2eb37..6b3dcc15ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author jeremy
*/
-public class RequestExOustFromMpccRoom implements IClientIncomingPacket
+public class RequestExOustFromMpccRoom implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 3ee3f7a9aa..a07c861399 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.model.Crest;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,17 +26,16 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeEmblem;
/**
* @author -Wooden-, Sdw
*/
-public class RequestExPledgeCrestLarge implements IClientIncomingPacket
+public class RequestExPledgeCrestLarge implements ClientPacket
{
private int _crestId;
private int _clanId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _crestId = packet.readD();
- _clanId = packet.readD();
- return true;
+ _crestId = packet.readInt();
+ _clanId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
index 64d9bcd359..8b3c8aaf6a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -26,14 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItem
/**
* @author Sdw
*/
-public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket
+public class RequestExRemoveEnchantSupportItem implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 123b2f35ec..e0f0afff9a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Weapon;
@@ -28,18 +28,17 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
-public class RequestExRemoveItemAttribute implements IClientIncomingPacket
+public class RequestExRemoveItemAttribute implements ClientPacket
{
private int _objectId;
private long _price;
private byte _element;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _element = (byte) packet.readD();
- return true;
+ _objectId = packet.readInt();
+ _element = (byte) packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index 2b1000f445..4b6a52c322 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink;
/**
* @author KenM
*/
-public class RequestExRqItemLink implements IClientIncomingPacket
+public class RequestExRqItemLink implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index efa35ef799..401b4a0ce0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.enums.CrestType;
import org.l2jmobius.gameserver.model.Crest;
@@ -30,27 +30,31 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
* Format : chdb c (id) 0xD0 h (subid) 0x11 d data size b raw data (picture i think ;) )
* @author -Wooden-
*/
-public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket
+public class RequestExSetPledgeCrestLarge implements ClientPacket
{
private int _length;
private byte[] _data = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _length = packet.readD();
+ _length = packet.readInt();
if (_length > 2176)
{
- return false;
+ return;
}
- _data = packet.readB(_length);
- return true;
+ _data = packet.readBytes(_length);
}
@Override
public void run(GameClient client)
{
+ if (_data == null)
+ {
+ return;
+ }
+
final Player player = client.getPlayer();
if (player == null)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index 056262b4ab..2ba3b9bf74 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowContactList;
@@ -26,14 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowContactList;
* Format: (ch)
* @author mrTJO & UnAfraid
*/
-public class RequestExShowContactList implements IClientIncomingPacket
+public class RequestExShowContactList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
index 3d5ac76a53..55a3fd2a64 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
@@ -30,17 +30,16 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemRes
/**
* @author KenM
*/
-public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacket
+public class RequestExTryToPutEnchantSupportItem implements ClientPacket
{
private int _supportObjectId;
private int _enchantObjectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _supportObjectId = packet.readD();
- _enchantObjectId = packet.readD();
- return true;
+ _supportObjectId = packet.readInt();
+ _enchantObjectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index bcd4fd9f3b..f86563c8df 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
@@ -32,15 +32,14 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author KenM
*/
-public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
+public class RequestExTryToPutEnchantTargetItem implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java
index 7feb18be3d..5521e53f36 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Sdw
*/
-public class RequestExWithdrawMpccRoom implements IClientIncomingPacket
+public class RequestExWithdrawMpccRoom implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
index 00a678c82a..5764833c6f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Gnacik
*/
-public class RequestExitPartyMatchingWaitingRoom implements IClientIncomingPacket
+public class RequestExitPartyMatchingWaitingRoom implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index a2667da070..5dc0b830fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo;
/**
* @author KenM
*/
-public class RequestFortressMapInfo implements IClientIncomingPacket
+public class RequestFortressMapInfo implements ClientPacket
{
private int _fortressId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _fortressId = packet.readD();
- return true;
+ _fortressId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index 1355a122ce..3cb99c6138 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -26,14 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo;
/**
* @author KenM
*/
-public class RequestFortressSiegeInfo implements IClientIncomingPacket
+public class RequestFortressSiegeInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
index c821eb6b2d..f16b79f11d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -33,17 +33,16 @@ import org.l2jmobius.gameserver.network.serverpackets.GmViewQuestInfo;
/**
* @version $Revision: 1.1.2.2.2.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestGMCommand implements IClientIncomingPacket
+public class RequestGMCommand implements ClientPacket
{
private String _targetName;
private int _command;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetName = packet.readS();
- _command = packet.readD();
- return true;
+ _targetName = packet.readString();
+ _command = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
index 27ced7e5f8..da17917327 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.PacketLogger;
* Format: (ch) d
* @author -Wooden-
*/
-public class RequestGetBossRecord implements IClientIncomingPacket
+public class RequestGetBossRecord implements ClientPacket
{
private int _bossId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _bossId = packet.readD();
- return true;
+ _bossId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 1233ad294b..0185c76176 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
/**
* @author Maktakien
*/
-public class RequestGetOffVehicle implements IClientIncomingPacket
+public class RequestGetOffVehicle implements ClientPacket
{
private int _boatId;
private int _x;
@@ -35,13 +35,12 @@ public class RequestGetOffVehicle implements IClientIncomingPacket
private int _z;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _boatId = packet.readD();
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- return true;
+ _boatId = packet.readInt();
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index 10070bbbeb..cc403d4915 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.BoatManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -29,17 +29,16 @@ import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
/**
* @version $Revision: 1.1.4.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestGetOnVehicle implements IClientIncomingPacket
+public class RequestGetOnVehicle implements ClientPacket
{
private int _boatId;
private Location _pos;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _boatId = packet.readD();
- _pos = new Location(packet.readD(), packet.readD(), packet.readD());
- return true;
+ _boatId = packet.readInt();
+ _pos = new Location(packet.readInt(), packet.readInt(), packet.readInt());
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index 71e028b3be..610c530a3f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class RequestGiveNickName implements IClientIncomingPacket
+public class RequestGiveNickName implements ClientPacket
{
private String _target;
private String _title;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _target = packet.readS();
- _title = packet.readS();
- return true;
+ _target = packet.readString();
+ _title = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
index af59712311..af4e9fa516 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.GameClient;
* This class handles RequestGmLista packet triggered by /gmlist command
* @version $Revision: 1.1.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestGmList implements IClientIncomingPacket
+public class RequestGmList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
index 61ed1e33cd..395d8321fc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
* (ch)
* @author KenM
*/
-public class RequestGotoLobby implements IClientIncomingPacket
+public class RequestGotoLobby implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
index a824e87cb9..34cfb6d9b0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
@@ -16,14 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Mobius
*/
-public class RequestHardWareInfo implements IClientIncomingPacket
+public class RequestHardWareInfo implements ClientPacket
{
private String _macAddress;
private int _windowsPlatformId;
@@ -46,32 +46,31 @@ public class RequestHardWareInfo implements IClientIncomingPacket
private String _vgaDriverVersion;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _macAddress = packet.readS();
- _windowsPlatformId = packet.readD();
- _windowsMajorVersion = packet.readD();
- _windowsMinorVersion = packet.readD();
- _windowsBuildNumber = packet.readD();
- _directxVersion = packet.readD();
- _directxRevision = packet.readD();
- packet.readB(16);
- _cpuName = packet.readS();
- _cpuSpeed = packet.readD();
- _cpuCoreCount = packet.readC();
- packet.readD();
- _vgaCount = packet.readD();
- _vgaPcxSpeed = packet.readD();
- _physMemorySlot1 = packet.readD();
- _physMemorySlot2 = packet.readD();
- _physMemorySlot3 = packet.readD();
- packet.readC();
- _videoMemory = packet.readD();
- packet.readD();
- _vgaVersion = packet.readH();
- _vgaName = packet.readS();
- _vgaDriverVersion = packet.readS();
- return true;
+ _macAddress = packet.readString();
+ _windowsPlatformId = packet.readInt();
+ _windowsMajorVersion = packet.readInt();
+ _windowsMinorVersion = packet.readInt();
+ _windowsBuildNumber = packet.readInt();
+ _directxVersion = packet.readInt();
+ _directxRevision = packet.readInt();
+ packet.readBytes(16);
+ _cpuName = packet.readString();
+ _cpuSpeed = packet.readInt();
+ _cpuCoreCount = packet.readByte();
+ packet.readInt();
+ _vgaCount = packet.readInt();
+ _vgaPcxSpeed = packet.readInt();
+ _physMemorySlot1 = packet.readInt();
+ _physMemorySlot2 = packet.readInt();
+ _physMemorySlot3 = packet.readInt();
+ packet.readByte();
+ _videoMemory = packet.readInt();
+ packet.readInt();
+ _vgaVersion = packet.readShort();
+ _vgaName = packet.readString();
+ _vgaDriverVersion = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index bb111e8c17..4b37039d78 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -33,15 +33,14 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Zoey76
*/
-public class RequestHennaEquip implements IClientIncomingPacket
+public class RequestHennaEquip implements ClientPacket
{
private int _symbolId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _symbolId = packet.readD();
- return true;
+ _symbolId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index 0fb3a57829..6681d159a7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo;
/**
* @author Zoey76
*/
-public class RequestHennaItemInfo implements IClientIncomingPacket
+public class RequestHennaItemInfo implements ClientPacket
{
private int _symbolId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _symbolId = packet.readD();
- return true;
+ _symbolId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
index 8379ba8544..5e33069b96 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList;
@@ -24,16 +24,12 @@ import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList;
/**
* @author Tempy, Zoey76
*/
-public class RequestHennaItemList implements IClientIncomingPacket
+public class RequestHennaItemList implements ClientPacket
{
- @SuppressWarnings("unused")
- private int _unknown;
-
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unknown = packet.readD(); // TODO: Identify.
- return true;
+ packet.readInt(); // Unknown.
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index 044ebba720..5a4e6daae5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo;
/**
* @author Zoey76
*/
-public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
+public class RequestHennaItemRemoveInfo implements ClientPacket
{
private int _symbolId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _symbolId = packet.readD();
- return true;
+ _symbolId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index b31caa1777..d6181291cb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/**
* @author Zoey76
*/
-public class RequestHennaRemove implements IClientIncomingPacket
+public class RequestHennaRemove implements ClientPacket
{
private int _symbolId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _symbolId = packet.readD();
- return true;
+ _symbolId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 2240af9a6e..df3e52cd93 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -16,21 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.HennaRemoveList;
-public class RequestHennaRemoveList implements IClientIncomingPacket
+public class RequestHennaRemoveList implements ClientPacket
{
- @SuppressWarnings("unused")
- private int _unknown;
-
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unknown = packet.readD(); // TODO: Identify.
- return true;
+ packet.readInt(); // Unknown.
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index bc9710d465..ce9d1ccf5b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.itemauction.ItemAuction;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExItemAuctionInfoPacket;
/**
* @author Forsaiken
*/
-public class RequestInfoItemAuction implements IClientIncomingPacket
+public class RequestInfoItemAuction implements ClientPacket
{
private int _instanceId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _instanceId = packet.readD();
- return true;
+ _instanceId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index f9e67ea1ed..d9bb939401 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/**
* @author Mobius
*/
-public class RequestInzoneWaitingTime implements IClientIncomingPacket
+public class RequestInzoneWaitingTime implements ClientPacket
{
private boolean _hide;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _hide = packet.readC() == 0;
- return true;
+ _hide = packet.readByte() == 0;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 42404bdd99..794bd87e58 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -16,21 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.3.4.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestItemList implements IClientIncomingPacket
+public class RequestItemList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
index 1abf3eb136..571b29fc2f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.AskJoinAlly;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-public class RequestJoinAlly implements IClientIncomingPacket
+public class RequestJoinAlly implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index 165d9a5916..9ca00c74c5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.enums.PartyDistributionType;
@@ -37,17 +37,16 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* sample 29 42 00 00 10 01 00 00 00 format cdd
* @version $Revision: 1.7.4.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestJoinParty implements IClientIncomingPacket
+public class RequestJoinParty implements ClientPacket
{
private String _name;
private int _partyDistributionTypeId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- _partyDistributionTypeId = packet.readD();
- return true;
+ _name = packet.readString();
+ _partyDistributionTypeId = packet.readInt();
}
private void scheduleDeny(Player player)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
index 12de7c6044..bc544acd6c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.model.World;
@@ -30,17 +30,16 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1.3.4.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestJoinPledge implements IClientIncomingPacket
+public class RequestJoinPledge implements ClientPacket
{
private int _target;
private int _pledgeType;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _target = packet.readD();
- _pledgeType = packet.readD();
- return true;
+ _target = packet.readInt();
+ _pledgeType = packet.readInt();
}
private void scheduleDeny(Player player, String name)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index d4e22b4a84..a8ebb2010c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -28,19 +28,18 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @author KenM
*/
-public class RequestJoinSiege implements IClientIncomingPacket
+public class RequestJoinSiege implements ClientPacket
{
private int _castleId;
private int _isAttacker;
private int _isJoining;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _castleId = packet.readD();
- _isAttacker = packet.readD();
- _isJoining = packet.readD();
- return true;
+ _castleId = packet.readInt();
+ _isAttacker = packet.readInt();
+ _isJoining = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index f5713d967d..5bb158e541 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.util.Util;
* Lets drink to code!
* @author zabbix, HorridoJoho
*/
-public class RequestLinkHtml implements IClientIncomingPacket
+public class RequestLinkHtml implements ClientPacket
{
private String _link;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _link = packet.readS();
- return true;
+ _link = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index 96b1664122..fc8115a30e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExListPartyMatchingWaiting
/**
* @author Gnacik
*/
-public class RequestListPartyMatchingWaitingRoom implements IClientIncomingPacket
+public class RequestListPartyMatchingWaitingRoom implements ClientPacket
{
private int _page;
private int _minLevel;
@@ -37,25 +37,24 @@ public class RequestListPartyMatchingWaitingRoom implements IClientIncomingPacke
private String _query;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _page = packet.readD();
- _minLevel = packet.readD();
- _maxLevel = packet.readD();
- final int size = packet.readD();
+ _page = packet.readInt();
+ _minLevel = packet.readInt();
+ _maxLevel = packet.readInt();
+ final int size = packet.readInt();
if ((size > 0) && (size < 128))
{
_classId = new LinkedList<>();
for (int i = 0; i < size; i++)
{
- _classId.add(ClassId.getClassId(packet.readD()));
+ _classId.add(ClassId.getClassId(packet.readInt()));
}
}
- if (packet.getReadableBytes() > 0)
+ if (packet.getRemainingLength() > 0)
{
- _query = packet.readS();
+ _query = packet.readString();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java
index 2e1c1c83f6..bfdb785dee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author UnAfraid
*/
-public class RequestMagicSkillList implements IClientIncomingPacket
+public class RequestMagicSkillList implements ClientPacket
{
private int _objectId;
@SuppressWarnings("unused")
@@ -33,12 +33,11 @@ public class RequestMagicSkillList implements IClientIncomingPacket
private int _unk;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _charId = packet.readD();
- _unk = packet.readD();
- return true;
+ _objectId = packet.readInt();
+ _charId = packet.readInt();
+ _unk = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 81aa7694f6..83f7ca1e06 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.actor.Playable;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -27,19 +27,18 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-public class RequestMagicSkillUse implements IClientIncomingPacket
+public class RequestMagicSkillUse implements ClientPacket
{
private int _magicId;
private boolean _ctrlPressed;
private boolean _shiftPressed;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _magicId = packet.readD(); // Identifier of the used skill
- _ctrlPressed = packet.readD() != 0; // True if it's a ForceAttack : Ctrl pressed
- _shiftPressed = packet.readC() != 0; // True if Shift pressed
- return true;
+ _magicId = packet.readInt(); // Identifier of the used skill
+ _ctrlPressed = packet.readInt() != 0; // True if it's a ForceAttack : Ctrl pressed
+ _shiftPressed = packet.readByte() != 0; // True if Shift pressed
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
index 7da45ff804..8311916a66 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MacroType;
import org.l2jmobius.gameserver.model.Macro;
import org.l2jmobius.gameserver.model.MacroCmd;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class RequestMakeMacro implements IClientIncomingPacket
+public class RequestMakeMacro implements ClientPacket
{
private Macro _macro;
private int _commandsLength = 0;
@@ -35,14 +35,14 @@ public class RequestMakeMacro implements IClientIncomingPacket
private static final int MAX_MACRO_LENGTH = 12;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int _id = packet.readD();
- final String _name = packet.readS();
- final String _desc = packet.readS();
- final String _acronym = packet.readS();
- final int icon = packet.readD();
- int count = packet.readC();
+ final int id = packet.readInt();
+ final String name = packet.readString();
+ final String desc = packet.readString();
+ final String acronym = packet.readString();
+ final int icon = packet.readInt();
+ int count = packet.readByte();
if (count > MAX_MACRO_LENGTH)
{
count = MAX_MACRO_LENGTH;
@@ -51,16 +51,15 @@ public class RequestMakeMacro implements IClientIncomingPacket
final List commands = new ArrayList<>(count);
for (int i = 0; i < count; i++)
{
- final int entry = packet.readC();
- final int type = packet.readC(); // 1 = skill, 3 = action, 4 = shortcut
- final int d1 = packet.readD(); // skill or page number for shortcuts
- final int d2 = packet.readC();
- final String command = packet.readS();
+ final int entry = packet.readByte();
+ final int type = packet.readByte(); // 1 = skill, 3 = action, 4 = shortcut
+ final int d1 = packet.readInt(); // skill or page number for shortcuts
+ final int d2 = packet.readByte();
+ final String command = packet.readString();
_commandsLength += command.length();
commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command));
}
- _macro = new Macro(_id, icon, _name, _desc, _acronym, commands);
- return true;
+ _macro = new Macro(id, icon, name, desc, acronym, commands);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 9fcb5e9736..c695111c70 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExSendManorList;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExSendManorList;
/**
* @author l3x
*/
-public class RequestManorList implements IClientIncomingPacket
+public class RequestManorList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
index 06084ff683..4c4fa9894c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,21 +24,20 @@ import org.l2jmobius.gameserver.network.GameClient;
* @author ShanSoft
* @structure chddSdS
*/
-public class RequestModifyBookMarkSlot implements IClientIncomingPacket
+public class RequestModifyBookMarkSlot implements ClientPacket
{
- private int id;
- private int icon;
- private String name;
- private String tag;
+ private int _id;
+ private int _icon;
+ private String _name;
+ private String _tag;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- id = packet.readD();
- name = packet.readS();
- icon = packet.readD();
- tag = packet.readS();
- return true;
+ _id = packet.readInt();
+ _name = packet.readString();
+ _icon = packet.readInt();
+ _tag = packet.readString();
}
@Override
@@ -49,6 +48,7 @@ public class RequestModifyBookMarkSlot implements IClientIncomingPacket
{
return;
}
- player.teleportBookmarkModify(id, icon, tag, name);
+
+ player.teleportBookmarkModify(_id, _icon, _tag, _name);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index cf47485a02..add1ff99b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.BoatManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.MoveToLocationInVehicle;
import org.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
-public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
+public class RequestMoveToLocationInVehicle implements ClientPacket
{
private int _boatId;
private int _targetX;
@@ -40,16 +40,15 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
private int _originZ;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _boatId = packet.readD(); // objectId of boat
- _targetX = packet.readD();
- _targetY = packet.readD();
- _targetZ = packet.readD();
- _originX = packet.readD();
- _originY = packet.readD();
- _originZ = packet.readD();
- return true;
+ _boatId = packet.readInt(); // objectId of boat
+ _targetX = packet.readInt();
+ _targetY = packet.readInt();
+ _targetZ = packet.readInt();
+ _originX = packet.readInt();
+ _originY = packet.readInt();
+ _originZ = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
index 9f3cb709cf..bd77724b4c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.handler.BypassHandler;
import org.l2jmobius.gameserver.handler.IBypassHandler;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,16 +25,10 @@ import org.l2jmobius.gameserver.network.GameClient;
* format ch c: (id) 0xD0 h: (subid) 0x13
* @author -Wooden-
*/
-public class RequestOlympiadMatchList implements IClientIncomingPacket
+public class RequestOlympiadMatchList implements ClientPacket
{
private static final String COMMAND = "arenalist";
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
index 24d5719bd4..6739bdb4fb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.GameClient;
* format ch c: (id) 0xD0 h: (subid) 0x12
* @author -Wooden-
*/
-public class RequestOlympiadObserverEnd implements IClientIncomingPacket
+public class RequestOlympiadObserverEnd implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 90fe58124a..d71eb047bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.World;
@@ -29,15 +29,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
* format (ch) d
* @author -Wooden-
*/
-public class RequestOustFromPartyRoom implements IClientIncomingPacket
+public class RequestOustFromPartyRoom implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
index 0001731f7c..7535c3123c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PartyMessageType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestOustPartyMember implements IClientIncomingPacket
+public class RequestOustPartyMember implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 2268449145..5d3ffe355a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
@@ -32,15 +32,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestOustPledgeMember implements IClientIncomingPacket
+public class RequestOustPledgeMember implements ClientPacket
{
private String _target;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _target = packet.readS();
- return true;
+ _target = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
index 209835b319..accc9b5c2c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.PacketLogger;
* Format: (ch) S
* @author -Wooden- TODO: GodKratos: This packet is wrong in Gracia Final!!
*/
-public class RequestPCCafeCouponUse implements IClientIncomingPacket
+public class RequestPCCafeCouponUse implements ClientPacket
{
private String _str;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _str = packet.readS();
- return true;
+ _str = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
index 7e24c2d6b4..228eaeb495 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
@@ -16,23 +16,9 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-
/**
* @author KenM
*/
-public class RequestPVPMatchRecord implements IClientIncomingPacket
+public class RequestPVPMatchRecord implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return false;
- }
-
- @Override
- public void run(GameClient client)
- {
- // TODO: Implement me
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
index 292b1b20a2..7159b26066 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.util.Util;
* @author -Wooden-
* @author UnAfraid Thanks mrTJO
*/
-public class RequestPackageSend implements IClientIncomingPacket
+public class RequestPackageSend implements ClientPacket
{
private static final int BATCH_LENGTH = 12; // length of the one item
@@ -43,30 +43,29 @@ public class RequestPackageSend implements IClientIncomingPacket
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
+ _objectId = packet.readInt();
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ItemHolder[count];
for (int i = 0; i < count; i++)
{
- final int objId = packet.readD();
- final long cnt = packet.readQ();
+ final int objId = packet.readInt();
+ final long cnt = packet.readLong();
if ((objId < 1) || (cnt < 0))
{
_items = null;
- return false;
+ return;
}
_items[i] = new ItemHolder(objId, cnt);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index de3adf72c3..956275e9bc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PackageSendableList;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.serverpackets.PackageSendableList;
/**
* @author Mobius
*/
-public class RequestPackageSendableItemList implements IClientIncomingPacket
+public class RequestPackageSendableItemList implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
index 0bd52f639c..c621a6f974 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PartyDistributionType;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author JIV
*/
-public class RequestPartyLootModification implements IClientIncomingPacket
+public class RequestPartyLootModification implements ClientPacket
{
private int _partyDistributionTypeId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _partyDistributionTypeId = packet.readD();
- return true;
+ _partyDistributionTypeId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
index 5b4d5039ef..95173605d0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PartyMatchingRoomLevelType;
import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.model.CommandChannel;
@@ -27,19 +27,18 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ListPartyWaiting;
-public class RequestPartyMatchConfig implements IClientIncomingPacket
+public class RequestPartyMatchConfig implements ClientPacket
{
private int _page;
private int _location;
private PartyMatchingRoomLevelType _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _page = packet.readD();
- _location = packet.readD();
- _type = packet.readD() == 0 ? PartyMatchingRoomLevelType.MY_LEVEL_RANGE : PartyMatchingRoomLevelType.ALL;
- return true;
+ _page = packet.readInt();
+ _location = packet.readInt();
+ _type = packet.readInt() == 0 ? PartyMatchingRoomLevelType.MY_LEVEL_RANGE : PartyMatchingRoomLevelType.ALL;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
index 85f63c85ec..991f679b86 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
@@ -25,19 +25,18 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Gnacik
*/
-public class RequestPartyMatchDetail implements IClientIncomingPacket
+public class RequestPartyMatchDetail implements ClientPacket
{
private int _roomId;
private int _location;
private int _level;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomId = packet.readD();
- _location = packet.readD();
- _level = packet.readD();
- return true;
+ _roomId = packet.readInt();
+ _location = packet.readInt();
+ _level = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 4d5e1fc2d0..8cca7dbebc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyRoomInfo;
/**
* author: Gnacik
*/
-public class RequestPartyMatchList implements IClientIncomingPacket
+public class RequestPartyMatchList implements ClientPacket
{
private int _roomId;
private int _maxMembers;
@@ -37,15 +37,14 @@ public class RequestPartyMatchList implements IClientIncomingPacket
private String _roomTitle;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomId = packet.readD();
- _maxMembers = packet.readD();
- _minLevel = packet.readD();
- _maxLevel = packet.readD();
- _lootType = packet.readD();
- _roomTitle = packet.readS();
- return true;
+ _roomId = packet.readInt();
+ _maxMembers = packet.readInt();
+ _minLevel = packet.readInt();
+ _maxLevel = packet.readInt();
+ _lootType = packet.readInt();
+ _roomTitle = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 0a32bfeddd..3eeb6cdcb9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.instancemanager.PetitionManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -35,17 +35,16 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*
* @author -Wooden-, TempyIncursion
*/
-public class RequestPetition implements IClientIncomingPacket
+public class RequestPetition implements ClientPacket
{
private String _content;
private int _type; // 1 = on : 0 = off;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _content = packet.readS();
- _type = packet.readD();
- return true;
+ _content = packet.readString();
+ _type = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
index 43a6b49171..cb4cd3e7f5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.PetitionManager;
@@ -36,16 +35,8 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*
* @author -Wooden-, TempyIncursion
*/
-public class RequestPetitionCancel implements IClientIncomingPacket
+public class RequestPetitionCancel implements ClientPacket
{
- // private int _unknown;
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- // _unknown = packet.readD(); This is pretty much a trigger packet.
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
index f2f627bb6d..f282a04888 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@@ -29,23 +29,20 @@ import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author Plim
*/
-public class RequestPetitionFeedback implements IClientIncomingPacket
+public class RequestPetitionFeedback implements ClientPacket
{
private static final String INSERT_FEEDBACK = "INSERT INTO petition_feedback VALUES (?,?,?,?,?)";
// cdds
- // private int _unknown;
private int _rate; // 4=VeryGood, 3=Good, 2=Fair, 1=Poor, 0=VeryPoor
private String _message;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- // _unknown =
- packet.readD(); // unknown
- _rate = packet.readD();
- _message = packet.readS();
- return true;
+ packet.readInt(); // unknown
+ _rate = packet.readInt();
+ _message = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index 7d148f2d91..701cbf85f3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest;
@@ -24,16 +24,15 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest;
/**
* @version $Revision: 1.4.4.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPledgeCrest implements IClientIncomingPacket
+public class RequestPledgeCrest implements ClientPacket
{
private int _crestId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _crestId = packet.readD();
- packet.readD(); // clanId
- return true;
+ _crestId = packet.readInt();
+ packet.readInt(); // clanId
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index bd5b51bacc..e07746d544 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo;
@@ -27,17 +27,16 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Sdw
*/
-public class RequestPledgeDraftListApply implements IClientIncomingPacket
+public class RequestPledgeDraftListApply implements ClientPacket
{
private int _applyType;
private int _karma;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _applyType = packet.readD();
- _karma = packet.readD();
- return true;
+ _applyType = packet.readInt();
+ _karma = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index 34af0251ca..2427d92667 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeDraftListSearch;
/**
* @author Sdw
*/
-public class RequestPledgeDraftListSearch implements IClientIncomingPacket
+public class RequestPledgeDraftListSearch implements ClientPacket
{
private int _levelMin;
private int _levelMax;
@@ -36,15 +36,14 @@ public class RequestPledgeDraftListSearch implements IClientIncomingPacket
private boolean _descending;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _levelMin = CommonUtil.constrain(packet.readD(), 0, 107);
- _levelMax = CommonUtil.constrain(packet.readD(), 0, 107);
- _classId = packet.readD();
- _query = packet.readS();
- _sortBy = packet.readD();
- _descending = packet.readD() == 2;
- return true;
+ _levelMin = CommonUtil.constrain(packet.readInt(), 0, 107);
+ _levelMax = CommonUtil.constrain(packet.readInt(), 0, 107);
+ _classId = packet.readInt();
+ _query = packet.readString();
+ _sortBy = packet.readInt();
+ _descending = packet.readInt() == 2;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
index 42fb37d366..78cbf9bf94 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
@@ -16,23 +16,22 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
/**
* Format: (c) S S: pledge name?
* @author -Wooden-
*/
-public class RequestPledgeExtendedInfo implements IClientIncomingPacket
+public class RequestPledgeExtendedInfo implements ClientPacket
{
@SuppressWarnings("unused")
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index a4f9ba1784..d088c29307 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -16,22 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PledgeInfo;
-public class RequestPledgeInfo implements IClientIncomingPacket
+public class RequestPledgeInfo implements ClientPacket
{
private int _clanId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanId = packet.readD();
- return true;
+ _clanId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 4c077a4c9e..b9711c65d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
@@ -27,18 +27,17 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeReceiveMemberInfo;
* Format: (ch) dS
* @author -Wooden-
*/
-public class RequestPledgeMemberInfo implements IClientIncomingPacket
+public class RequestPledgeMemberInfo implements ClientPacket
{
@SuppressWarnings("unused")
private int _unk1;
private String _player;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unk1 = packet.readD();
- _player = packet.readS();
- return true;
+ _unk1 = packet.readInt();
+ _player = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
index d70d1f94b4..76ffc4db71 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
/**
* @version $Revision: 1.5.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPledgeMemberList implements IClientIncomingPacket
+public class RequestPledgeMemberList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
index 4cd01ed0fa..1702930ec1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
@@ -27,18 +27,17 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeReceivePowerInfo;
* Format: (ch) dS
* @author -Wooden-
*/
-public class RequestPledgeMemberPowerInfo implements IClientIncomingPacket
+public class RequestPledgeMemberPowerInfo implements ClientPacket
{
@SuppressWarnings("unused")
private int _unk1;
private String _player;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unk1 = packet.readD();
- _player = packet.readS();
- return true;
+ _unk1 = packet.readInt();
+ _player = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index 464ad76c9f..28ffa550c0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -16,32 +16,31 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ManagePledgePower;
-public class RequestPledgePower implements IClientIncomingPacket
+public class RequestPledgePower implements ClientPacket
{
private int _rank;
private int _action;
private int _privs;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _rank = packet.readD();
- _action = packet.readD();
+ _rank = packet.readInt();
+ _action = packet.readInt();
if (_action == 2)
{
- _privs = packet.readD();
+ _privs = packet.readInt();
}
else
{
_privs = 0;
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
index d6743043ab..97eeb7a235 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,14 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList;
* Format: (ch)
* @author -Wooden-
*/
-public class RequestPledgePowerGradeList implements IClientIncomingPacket
+public class RequestPledgePowerGradeList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
index 364bd9e1de..4cfd2c8066 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ClanEntryStatus;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,14 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitApplyInfo;
/**
* @author Sdw
*/
-public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket
+public class RequestPledgeRecruitApplyInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
index af078f76e8..34a3a27aa4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Sdw
*/
-public class RequestPledgeRecruitBoardAccess implements IClientIncomingPacket
+public class RequestPledgeRecruitBoardAccess implements ClientPacket
{
private int _applyType;
private int _karma;
@@ -39,15 +39,14 @@ public class RequestPledgeRecruitBoardAccess implements IClientIncomingPacket
private int _recruitingType;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _applyType = packet.readD();
- _karma = packet.readD();
- _information = packet.readS();
- _datailedInformation = packet.readS();
- _applicationType = packet.readD(); // 0 - Allow, 1 - Public
- _recruitingType = packet.readD(); // 0 - Main clan
- return true;
+ _applyType = packet.readInt();
+ _karma = packet.readInt();
+ _information = packet.readString();
+ _datailedInformation = packet.readString();
+ _applicationType = packet.readInt(); // 0 - Allow, 1 - Public
+ _recruitingType = packet.readInt(); // 0 - Main clan
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index beee5121dd..a29cf1adff 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitBoardDetail
/**
* @author Sdw
*/
-public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
+public class RequestPledgeRecruitBoardDetail implements ClientPacket
{
private int _clanId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanId = packet.readD();
- return true;
+ _clanId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java
index 23db2ed1d7..bb4943fc17 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitBoardSearch
/**
* @author Sdw
*/
-public class RequestPledgeRecruitBoardSearch implements IClientIncomingPacket
+public class RequestPledgeRecruitBoardSearch implements ClientPacket
{
private int _clanLevel;
private int _karma;
@@ -38,17 +38,16 @@ public class RequestPledgeRecruitBoardSearch implements IClientIncomingPacket
private int _applicationType;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanLevel = packet.readD();
- _karma = packet.readD();
- _type = packet.readD();
- _query = packet.readS();
- _sort = packet.readD();
- _descending = packet.readD() == 2;
- _page = packet.readD();
- _applicationType = packet.readD(); // Helios
- return true;
+ _clanLevel = packet.readInt();
+ _karma = packet.readInt();
+ _type = packet.readInt();
+ _query = packet.readString();
+ _sort = packet.readInt();
+ _descending = packet.readInt() == 2;
+ _page = packet.readInt();
+ _applicationType = packet.readInt(); // Helios
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
index 55ff8a5e5a..d49bd6da3c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitInfo;
/**
* @author Sdw
*/
-public class RequestPledgeRecruitInfo implements IClientIncomingPacket
+public class RequestPledgeRecruitInfo implements ClientPacket
{
private int _clanId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanId = packet.readD();
- return true;
+ _clanId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
index e27eff6935..b4ec5a6bc7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
* Format: (ch) dSdS
* @author -Wooden-
*/
-public class RequestPledgeReorganizeMember implements IClientIncomingPacket
+public class RequestPledgeReorganizeMember implements ClientPacket
{
private int _isMemberSelected;
private String _memberName;
@@ -35,13 +35,12 @@ public class RequestPledgeReorganizeMember implements IClientIncomingPacket
private String _selectedMember;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _isMemberSelected = packet.readD();
- _memberName = packet.readS();
- _newPledgeType = packet.readD();
- _selectedMember = packet.readS();
- return true;
+ _isMemberSelected = packet.readInt();
+ _memberName = packet.readString();
+ _newPledgeType = packet.readInt();
+ _selectedMember = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
index f6b7b46902..374239d740 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
@@ -29,19 +29,18 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* Format: (ch) dSS
* @author -Wooden-
*/
-public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket
+public class RequestPledgeSetAcademyMaster implements ClientPacket
{
private String _currPlayerName;
private int _set; // 1 set, 0 delete
private String _targetPlayerName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _set = packet.readD();
- _currPlayerName = packet.readS();
- _targetPlayerName = packet.readS();
- return true;
+ _set = packet.readInt();
+ _currPlayerName = packet.readString();
+ _targetPlayerName = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
index 2d2ab25119..3a383a3ff8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
@@ -30,17 +30,16 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* Format: (ch) Sd
* @author -Wooden-
*/
-public class RequestPledgeSetMemberPowerGrade implements IClientIncomingPacket
+public class RequestPledgeSetMemberPowerGrade implements ClientPacket
{
private String _member;
private int _powerGrade;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _member = packet.readS();
- _powerGrade = packet.readD();
- return true;
+ _member = packet.readString();
+ _powerGrade = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
index ee245b4191..ed26920141 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,16 +38,15 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Mobius
*/
-public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingPacket
+public class RequestPledgeSignInForOpenJoiningMethod implements ClientPacket
{
private int _clanId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanId = packet.readD();
- packet.readD();
- return true;
+ _clanId = packet.readInt();
+ packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java
index 9e8997c89a..6a9d415a1a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingListApplied
/**
* @author Sdw
*/
-public class RequestPledgeWaitingApplied implements IClientIncomingPacket
+public class RequestPledgeWaitingApplied implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 552511d6f6..67494ed41a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.ClanEntryStatus;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
@@ -33,19 +33,18 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Sdw
*/
-public class RequestPledgeWaitingApply implements IClientIncomingPacket
+public class RequestPledgeWaitingApply implements ClientPacket
{
private int _karma;
private int _clanId;
private String _message;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _karma = packet.readD();
- _clanId = packet.readD();
- _message = packet.readS();
- return true;
+ _karma = packet.readInt();
+ _clanId = packet.readInt();
+ _message = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index dde18f32a4..5c96cc894d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingList;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingList;
/**
* @author Sdw
*/
-public class RequestPledgeWaitingList implements IClientIncomingPacket
+public class RequestPledgeWaitingList implements ClientPacket
{
private int _clanId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanId = packet.readD();
- return true;
+ _clanId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index 618c787a17..21009265f4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
@@ -27,17 +27,16 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingUser;
/**
* @author Sdw
*/
-public class RequestPledgeWaitingUser implements IClientIncomingPacket
+public class RequestPledgeWaitingUser implements ClientPacket
{
private int _clanId;
private int _playerId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _clanId = packet.readD();
- _playerId = packet.readD();
- return true;
+ _clanId = packet.readInt();
+ _playerId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
index 64d1d0efc1..3ccebc2198 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -37,18 +37,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Sdw
*/
-public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
+public class RequestPledgeWaitingUserAccept implements ClientPacket
{
private boolean _acceptRequest;
private int _playerId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _acceptRequest = packet.readD() == 1;
- _playerId = packet.readD();
- packet.readD(); // Clan Id.
- return true;
+ _acceptRequest = packet.readInt() == 1;
+ _playerId = packet.readInt();
+ packet.readInt(); // Clan Id.
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
index 642dd9e000..d013253edd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PledgeReceiveWarList;
@@ -25,18 +25,17 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeReceiveWarList;
* Format: (ch) dd
* @author -Wooden-
*/
-public class RequestPledgeWarList implements IClientIncomingPacket
+public class RequestPledgeWarList implements ClientPacket
{
@SuppressWarnings("unused")
private int _page;
private int _tab;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _page = packet.readD();
- _tab = packet.readD();
- return true;
+ _page = packet.readInt();
+ _tab = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d6353fe936..294ac4be6a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@@ -40,15 +40,14 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Migi, DS
*/
-public class RequestPostAttachment implements IClientIncomingPacket
+public class RequestPostAttachment implements ClientPacket
{
private int _msgId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _msgId = packet.readD();
- return true;
+ _msgId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 2a75d35297..909da7f13d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,14 +26,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExReplyPostItemList;
/**
* @author Migi, DS
*/
-public class RequestPostItemList implements IClientIncomingPacket
+public class RequestPostItemList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index a038920c8b..dc6c27976f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.BuyListData;
import org.l2jmobius.gameserver.enums.Race;
@@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
** @author Gnacik
*/
-public class RequestPreviewItem implements IClientIncomingPacket
+public class RequestPreviewItem implements ClientPacket
{
@SuppressWarnings("unused")
private int _unk;
@@ -80,18 +80,18 @@ public class RequestPreviewItem implements IClientIncomingPacket
}
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unk = packet.readD();
- _listId = packet.readD();
- _count = packet.readD();
+ _unk = packet.readInt();
+ _listId = packet.readInt();
+ _count = packet.readInt();
if (_count < 0)
{
_count = 0;
}
if (_count > 100)
{
- return false; // prevent too long lists
+ return; // prevent too long lists
}
// Create _items table that will contain all ItemID to Wear
@@ -100,9 +100,8 @@ public class RequestPreviewItem implements IClientIncomingPacket
// Fill _items table with all ItemID to Wear
for (int i = 0; i < _count; i++)
{
- _items[i] = packet.readD();
+ _items[i] = packet.readInt();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index f70e24e74c..2fdf748846 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -22,7 +22,7 @@ import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.OfflineTraderTable;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ItemRequest;
@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.2.2.1.2.5 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPrivateStoreBuy implements IClientIncomingPacket
+public class RequestPrivateStoreBuy implements ClientPacket
{
private static final int BATCH_LENGTH = 20; // length of the one item
@@ -46,29 +46,28 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
private Set _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _storePlayerId = packet.readD();
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ _storePlayerId = packet.readInt();
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new HashSet<>();
for (int i = 0; i < count; i++)
{
- final int objectId = packet.readD();
- final long cnt = packet.readQ();
- final long price = packet.readQ();
+ final int objectId = packet.readInt();
+ final long cnt = packet.readLong();
+ final long price = packet.readLong();
if ((objectId < 1) || (cnt < 1) || (price < 0))
{
_items = null;
- return false;
+ return;
}
_items.add(new ItemRequest(objectId, cnt, price));
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
index d558a927d6..de08516474 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
@@ -16,28 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPrivateStoreManageBuy implements IClientIncomingPacket
+public class RequestPrivateStoreManageBuy implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- player.tryOpenPrivateBuyStore();
+ return;
}
+
+ player.tryOpenPrivateBuyStore();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index bb2f0e8e6f..29f842d2e5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/**
* @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPrivateStoreManageSell implements IClientIncomingPacket
+public class RequestPrivateStoreManageSell implements ClientPacket
{
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
// TODO: implement me properly
- // packet.readD();
- // packet.readQ();
- return true;
+ // packet.readInt();
+ // packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
index 721015c5df..e7f35cef9e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPrivateStoreQuitBuy implements IClientIncomingPacket
+public class RequestPrivateStoreQuitBuy implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
index 07e4c5a414..b0f96ac728 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPrivateStoreQuitSell implements IClientIncomingPacket
+public class RequestPrivateStoreQuitSell implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 243e4a3674..7126c063f2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import static org.l2jmobius.gameserver.model.actor.Npc.INTERACTION_DISTANCE;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.OfflineTraderTable;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ItemRequest;
@@ -30,50 +30,50 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-public class RequestPrivateStoreSell implements IClientIncomingPacket
+public class RequestPrivateStoreSell implements ClientPacket
{
private int _storePlayerId;
private ItemRequest[] _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _storePlayerId = packet.readD();
- final int itemsCount = packet.readD();
+ _storePlayerId = packet.readInt();
+ final int itemsCount = packet.readInt();
if ((itemsCount <= 0) || (itemsCount > Config.MAX_ITEM_IN_PACKET))
{
- return false;
+ return;
}
+
_items = new ItemRequest[itemsCount];
for (int i = 0; i < itemsCount; i++)
{
- final int slot = packet.readD();
- final int itemId = packet.readD();
- packet.readH(); // TODO analyse this
- packet.readH(); // TODO analyse this
- final long count = packet.readQ();
- final long price = packet.readQ();
- packet.readD(); // visual id
- packet.readD(); // option 1
- packet.readD(); // option 2
- final int soulCrystals = packet.readC();
+ final int slot = packet.readInt();
+ final int itemId = packet.readInt();
+ packet.readShort(); // TODO analyse this
+ packet.readShort(); // TODO analyse this
+ final long count = packet.readLong();
+ final long price = packet.readLong();
+ packet.readInt(); // visual id
+ packet.readInt(); // option 1
+ packet.readInt(); // option 2
+ final int soulCrystals = packet.readByte();
for (int s = 0; s < soulCrystals; s++)
{
- packet.readD(); // soul crystal option
+ packet.readInt(); // soul crystal option
}
- final int soulCrystals2 = packet.readC();
+ final int soulCrystals2 = packet.readByte();
for (int s = 0; s < soulCrystals2; s++)
{
- packet.readD(); // sa effect
+ packet.readInt(); // sa effect
}
if (/* (slot < 1) || */ (itemId < 1) || (count < 1) || (price < 0))
{
_items = null;
- return false;
+ return;
}
_items[i] = new ItemRequest(slot, itemId, count, price);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index 365e1f598f..2615352236 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.CropProcure;
@@ -38,36 +38,35 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author l3x
*/
-public class RequestProcureCropList implements IClientIncomingPacket
+public class RequestProcureCropList implements ClientPacket
{
private static final int BATCH_LENGTH = 20; // length of the one item
private List _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ArrayList<>(count);
for (int i = 0; i < count; i++)
{
- final int objId = packet.readD();
- final int itemId = packet.readD();
- final int manorId = packet.readD();
- final long cnt = packet.readQ();
+ final int objId = packet.readInt();
+ final int itemId = packet.readInt();
+ final int manorId = packet.readInt();
+ final long cnt = packet.readLong();
if ((objId < 1) || (itemId < 1) || (manorId < 0) || (cnt < 0))
{
_items = null;
- return false;
+ return;
}
_items.add(new CropHolder(objId, itemId, cnt, manorId));
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
index 6c4e2d8c77..9c09dfa9fb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.QuestType;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -32,15 +32,14 @@ import org.l2jmobius.gameserver.network.serverpackets.QuestList;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestQuestAbort implements IClientIncomingPacket
+public class RequestQuestAbort implements ClientPacket
{
private int _questId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _questId = packet.readD();
- return true;
+ _questId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index 21ba9b39af..e52c364192 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.QuestList;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.QuestList;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestQuestList implements IClientIncomingPacket
+public class RequestQuestList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index cbf78835a6..56c82eb219 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -31,15 +31,14 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Migi, DS
*/
-public class RequestReceivedPost implements IClientIncomingPacket
+public class RequestReceivedPost implements ClientPacket
{
private int _msgId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _msgId = packet.readD();
- return true;
+ _msgId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 06d51160dd..12dce1c737 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowReceivedPostList;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowReceivedPostList;
/**
* @author Migi, DS
*/
-public class RequestReceivedPostList implements IClientIncomingPacket
+public class RequestReceivedPostList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
index 9dcd710dae..3dbe26bea2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
@@ -16,22 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.RecipeData;
import org.l2jmobius.gameserver.model.RecipeList;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList;
-public class RequestRecipeBookDestroy implements IClientIncomingPacket
+public class RequestRecipeBookDestroy implements ClientPacket
{
private int _recipeID;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _recipeID = packet.readD();
- return true;
+ _recipeID = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 71dc3aa8da..e54a963c6a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -16,21 +16,20 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class RequestRecipeBookOpen implements IClientIncomingPacket
+public class RequestRecipeBookOpen implements ClientPacket
{
private boolean _isDwarvenCraft;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _isDwarvenCraft = (packet.readD() == 0);
- return true;
+ _isDwarvenCraft = (packet.readInt() == 0);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index e30bee1ac5..4ffa9896e9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -16,20 +16,19 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.RecipeItemMakeInfo;
-public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
+public class RequestRecipeItemMakeInfo implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- return true;
+ _id = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
index da23ab96d5..e1fc7b8a79 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Administrator
*/
-public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
+public class RequestRecipeItemMakeSelf implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- return true;
+ _id = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 04ca270c1d..5af9eda14c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.RecipeData;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem;
@@ -37,34 +37,33 @@ import org.l2jmobius.gameserver.util.Util;
/**
* RequestRecipeShopListSet client packet class.
*/
-public class RequestRecipeShopListSet implements IClientIncomingPacket
+public class RequestRecipeShopListSet implements ClientPacket
{
private static final int BATCH_LENGTH = 12;
private ManufactureItem[] _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ManufactureItem[count];
for (int i = 0; i < count; i++)
{
- final int id = packet.readD();
- final long cost = packet.readQ();
+ final int id = packet.readInt();
+ final long cost = packet.readLong();
if (cost < 0)
{
_items = null;
- return false;
+ return;
}
_items[i] = new ManufactureItem(id, cost);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index b82a2048c7..851296e8ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,17 +26,16 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopItemInfo;
/**
* @version $Revision: 1.1.2.1.2.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
+public class RequestRecipeShopMakeInfo implements ClientPacket
{
private int _playerObjectId;
private int _recipeId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _playerObjectId = packet.readD();
- _recipeId = packet.readD();
- return true;
+ _playerObjectId = packet.readInt();
+ _recipeId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
index b9430dc234..4b6ed036bb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.model.World;
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Administrator
*/
-public class RequestRecipeShopMakeItem implements IClientIncomingPacket
+public class RequestRecipeShopMakeItem implements ClientPacket
{
private int _id;
private int _recipeId;
@@ -35,12 +35,11 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
private long _unknown;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- _recipeId = packet.readD();
- _unknown = packet.readQ();
- return true;
+ _id = packet.readInt();
+ _recipeId = packet.readInt();
+ _unknown = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index afc1ee3ecc..6e7b4135c7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -16,21 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
-public class RequestRecipeShopManageList implements IClientIncomingPacket
+public class RequestRecipeShopManageList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 82f12af318..d34b85456e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopSellList;
/**
* @version $Revision: 1.1.2.1.2.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestRecipeShopManagePrev implements IClientIncomingPacket
+public class RequestRecipeShopManagePrev implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
index 768fcb0f1d..3ba07a13cb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.1.2.2.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestRecipeShopManageQuit implements IClientIncomingPacket
+public class RequestRecipeShopManageQuit implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
index ac8373ebdf..18d528a1d5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.util.Util;
@@ -25,17 +25,16 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.1.2.2.2.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestRecipeShopMessageSet implements IClientIncomingPacket
+public class RequestRecipeShopMessageSet implements ClientPacket
{
private static final int MAX_MSG_LENGTH = 29;
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 87a0574a9f..c629ddf3d6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
-public class RequestRecordInfo implements IClientIncomingPacket
+public class RequestRecordInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
index b84ac7619d..1440f095de 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.VariationData;
import org.l2jmobius.gameserver.model.VariationInstance;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -39,13 +39,12 @@ public class RequestRefine extends AbstractRefinePacket
private long _feeCount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- _mineralItemObjId = packet.readD();
- packet.readD(); // _feeItemObjId
- _feeCount = packet.readQ();
- return true;
+ _targetItemObjId = packet.readInt();
+ _mineralItemObjId = packet.readInt();
+ packet.readInt(); // _feeItemObjId
+ _feeCount = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 3d01f1e525..49e712f0e3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.VariationData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -31,15 +31,14 @@ import org.l2jmobius.gameserver.util.Util;
* Format(ch) d
* @author -Wooden-
*/
-public class RequestRefineCancel implements IClientIncomingPacket
+public class RequestRefineCancel implements ClientPacket
{
private int _targetItemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- return true;
+ _targetItemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 64746d217e..26d06fd972 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import static org.l2jmobius.gameserver.model.actor.Npc.INTERACTION_DISTANCE;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.BuyListData;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* RequestRefundItem client packet class.
*/
-public class RequestRefundItem implements IClientIncomingPacket
+public class RequestRefundItem implements ClientPacket
{
private static final int BATCH_LENGTH = 4; // length of the one item
private static final int CUSTOM_CB_SELL_LIST = 423;
@@ -47,21 +47,20 @@ public class RequestRefundItem implements IClientIncomingPacket
private int[] _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _listId = packet.readD();
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ _listId = packet.readInt();
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new int[count];
for (int i = 0; i < count; i++)
{
- _items[i] = packet.readD();
+ _items[i] = packet.readInt();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java
index 5ac284d09e..b3d068fa01 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.BeautyShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.beautyshop.BeautyData;
@@ -28,19 +28,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyRegistRese
/**
* @author Sdw
*/
-public class RequestRegistBeauty implements IClientIncomingPacket
+public class RequestRegistBeauty implements ClientPacket
{
private int _hairId;
private int _faceId;
private int _colorId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _hairId = packet.readD();
- _faceId = packet.readD();
- _colorId = packet.readD();
- return true;
+ _hairId = packet.readInt();
+ _faceId = packet.readInt();
+ _colorId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index 154c1276dd..39a305da1c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MailType;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
@@ -33,15 +33,14 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Migi, DS
*/
-public class RequestRejectPostAttachment implements IClientIncomingPacket
+public class RequestRejectPostAttachment implements ClientPacket
{
private int _msgId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _msgId = packet.readD();
- return true;
+ _msgId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
index 3be21b3d55..9ba12b755f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.ClanWarState;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,16 +28,15 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestReplyStartPledgeWar implements IClientIncomingPacket
+public class RequestReplyStartPledgeWar implements ClientPacket
{
private int _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readS();
- _answer = packet.readD();
- return true;
+ packet.readString();
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
index 75bf19143f..74a649c8f7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestReplyStopPledgeWar implements IClientIncomingPacket
+public class RequestReplyStopPledgeWar implements ClientPacket
{
private int _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readS();
- _answer = packet.readD();
- return true;
+ packet.readString();
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
index 8a2f42272a..93f6f08044 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
@@ -16,23 +16,22 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket
+public class RequestReplySurrenderPledgeWar implements ClientPacket
{
private String _reqName;
private int _answer;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _reqName = packet.readS();
- _answer = packet.readD();
- return true;
+ _reqName = packet.readString();
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
index b10b15d786..c1247be878 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
@@ -16,21 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author KenM
*/
-public class RequestResetNickname implements IClientIncomingPacket
+public class RequestResetNickname implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index dfda7319fc..f499b8bd33 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -36,16 +35,10 @@ import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/**
* @version $Revision: 1.11.2.1.2.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestRestart implements IClientIncomingPacket
+public class RequestRestart implements ClientPacket
{
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
@@ -105,7 +98,7 @@ public class RequestRestart implements IClientIncomingPacket
// Send character list.
final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1);
- client.sendPacket(cl);
+ client.sendPacket(new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1));
client.setCharSelection(cl.getCharInfo());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
index 2f0d3e3ac7..8ffeffef60 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.ClanHallData;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
@@ -53,7 +53,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestRestartPoint implements IClientIncomingPacket
+public class RequestRestartPoint implements ClientPacket
{
protected int _requestedPointType;
protected boolean _continuation;
@@ -61,15 +61,14 @@ public class RequestRestartPoint implements IClientIncomingPacket
protected int _resCount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _requestedPointType = packet.readD();
- if (packet.getReadableBytes() != 0)
+ _requestedPointType = packet.readInt();
+ if (packet.getRemainingLength() != 0)
{
- _resItemID = packet.readD();
- _resCount = packet.readD();
+ _resItemID = packet.readInt();
+ _resCount = packet.readInt();
}
- return true;
}
class DeathTask implements Runnable
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
index 4450c26f03..cb35819b9e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,19 +25,18 @@ import org.l2jmobius.gameserver.network.GameClient;
* @author ShanSoft
* @structure chdSdS
*/
-public class RequestSaveBookMarkSlot implements IClientIncomingPacket
+public class RequestSaveBookMarkSlot implements ClientPacket
{
private int icon;
private String name;
private String tag;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- name = packet.readS();
- icon = packet.readD();
- tag = packet.readS();
- return true;
+ name = packet.readString();
+ icon = packet.readInt();
+ tag = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
index 7ea8c00de2..bfdb6e29c3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.GameClient;
* Format:(ch) d[dd]
* @author -Wooden-
*/
-public class RequestSaveInventoryOrder implements IClientIncomingPacket
+public class RequestSaveInventoryOrder implements ClientPacket
{
private List _order;
@@ -38,18 +38,17 @@ public class RequestSaveInventoryOrder implements IClientIncomingPacket
private static final int LIMIT = 125;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- int sz = packet.readD();
+ int sz = packet.readInt();
sz = Math.min(sz, LIMIT);
_order = new ArrayList<>(sz);
for (int i = 0; i < sz; i++)
{
- final int objectId = packet.readD();
- final int order = packet.readD();
+ final int objectId = packet.readInt();
+ final int order = packet.readInt();
_order.add(new InventoryOrder(objectId, order));
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
index 79ad4aa3b5..900627c3e7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowSeedMapInfo;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowSeedMapInfo;
/**
* RequestSeedPhase client packet
*/
-public class RequestSeedPhase implements IClientIncomingPacket
+public class RequestSeedPhase implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index af5f6876b7..3eaab19bb3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.BuyListData;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* RequestSellItem client packet class.
*/
-public class RequestSellItem implements IClientIncomingPacket
+public class RequestSellItem implements ClientPacket
{
private static final int BATCH_LENGTH = 16;
private static final int CUSTOM_CB_SELL_LIST = 423;
@@ -49,28 +49,27 @@ public class RequestSellItem implements IClientIncomingPacket
private List _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _listId = packet.readD();
- final int size = packet.readD();
- if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != packet.getReadableBytes()))
+ _listId = packet.readInt();
+ final int size = packet.readInt();
+ if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
- final int objectId = packet.readD();
- final int itemId = packet.readD();
- final long count = packet.readQ();
+ final int objectId = packet.readInt();
+ final int itemId = packet.readInt();
+ final long count = packet.readLong();
if ((objectId < 1) || (itemId < 1) || (count < 1))
{
_items = null;
- return false;
+ return;
}
_items.add(new UniqueItemHolder(itemId, objectId, count));
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
index 58cf805178..182b5f234f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
@@ -20,7 +20,7 @@ import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID;
import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
@@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Migi, DS
*/
-public class RequestSendPost implements IClientIncomingPacket
+public class RequestSendPost implements ClientPacket
{
private static final int BATCH_LENGTH = 12; // length of the one item
@@ -65,17 +65,17 @@ public class RequestSendPost implements IClientIncomingPacket
private long _reqAdena;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _receiver = packet.readS();
- _isCod = packet.readD() != 0;
- _subject = packet.readS();
- _text = packet.readS();
+ _receiver = packet.readString();
+ _isCod = packet.readInt() != 0;
+ _subject = packet.readString();
+ _text = packet.readString();
- final int attachCount = packet.readD();
- if ((attachCount < 0) || (attachCount > Config.MAX_ITEM_IN_PACKET) || (((attachCount * BATCH_LENGTH) + 8) != packet.getReadableBytes()))
+ final int attachCount = packet.readInt();
+ if ((attachCount < 0) || (attachCount > Config.MAX_ITEM_IN_PACKET) || (((attachCount * BATCH_LENGTH) + 8) != packet.getRemainingLength()))
{
- return false;
+ return;
}
if (attachCount > 0)
@@ -83,19 +83,19 @@ public class RequestSendPost implements IClientIncomingPacket
_items = new AttachmentItem[attachCount];
for (int i = 0; i < attachCount; i++)
{
- final int objectId = packet.readD();
- final long count = packet.readQ();
+ final int objectId = packet.readInt();
+ final long count = packet.readLong();
if ((objectId < 1) || (count < 0))
{
_items = null;
- return false;
+ return;
}
_items[i] = new AttachmentItem(objectId, count);
}
}
- _reqAdena = packet.readQ();
- return true;
+ _reqAdena = packet.readLong();
+ return;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index 9f4036d402..50da4c6f89 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,15 +30,14 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Migi, DS
*/
-public class RequestSentPost implements IClientIncomingPacket
+public class RequestSentPost implements ClientPacket
{
private int _msgId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _msgId = packet.readD();
- return true;
+ _msgId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 05a414f453..678e27e82d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowSentPostList;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowSentPostList;
/**
* @author Migi, DS
*/
-public class RequestSentPostList implements IClientIncomingPacket
+public class RequestSentPostList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
index f5f0054337..86ea86b53a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.enums.CrestType;
@@ -29,22 +29,21 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* Client packet for setting ally crest.
*/
-public class RequestSetAllyCrest implements IClientIncomingPacket
+public class RequestSetAllyCrest implements ClientPacket
{
private int _length;
private byte[] _data = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _length = packet.readD();
+ _length = packet.readInt();
if (_length > 192)
{
- return false;
+ return;
}
- _data = packet.readB(_length);
- return true;
+ _data = packet.readBytes(_length);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
index b5d130046c..0d49594cb4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
@@ -20,7 +20,7 @@ import java.util.Calendar;
import java.util.Date;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
@@ -34,18 +34,17 @@ import org.l2jmobius.gameserver.util.Broadcast;
/**
* @author UnAfraid
*/
-public class RequestSetCastleSiegeTime implements IClientIncomingPacket
+public class RequestSetCastleSiegeTime implements ClientPacket
{
private int _castleId;
private long _time;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _castleId = packet.readD();
- _time = packet.readD();
+ _castleId = packet.readInt();
+ _time = packet.readInt();
_time *= 1000;
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 197ab07190..98f6cd046a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.CropProcure;
import org.l2jmobius.gameserver.model.Seed;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/**
* @author l3x
*/
-public class RequestSetCrop implements IClientIncomingPacket
+public class RequestSetCrop implements ClientPacket
{
private static final int BATCH_LENGTH = 21; // length of the one item
@@ -40,26 +40,26 @@ public class RequestSetCrop implements IClientIncomingPacket
private List _items;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _manorId = packet.readD();
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ _manorId = packet.readInt();
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ArrayList<>(count);
for (int i = 0; i < count; i++)
{
- final int itemId = packet.readD();
- final long sales = packet.readQ();
- final long price = packet.readQ();
- final int type = packet.readC();
+ final int itemId = packet.readInt();
+ final long sales = packet.readLong();
+ final long price = packet.readLong();
+ final int type = packet.readByte();
if ((itemId < 1) || (sales < 0) || (price < 0))
{
_items.clear();
- return false;
+ return;
}
if (sales > 0)
@@ -67,7 +67,6 @@ public class RequestSetCrop implements IClientIncomingPacket
_items.add(new CropProcure(itemId, sales, type, sales, price));
}
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
index c9f0171c5b..23d5065815 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.enums.CrestType;
import org.l2jmobius.gameserver.model.Crest;
@@ -29,22 +29,21 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* Client packet for setting/deleting clan crest.
*/
-public class RequestSetPledgeCrest implements IClientIncomingPacket
+public class RequestSetPledgeCrest implements ClientPacket
{
private int _length;
private byte[] _data = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _length = packet.readD();
+ _length = packet.readInt();
if (_length > 256)
{
- return false;
+ return;
}
- _data = packet.readB(_length);
- return true;
+ _data = packet.readBytes(_length);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index a3e3ded0a3..6c2683af87 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.Seed;
import org.l2jmobius.gameserver.model.SeedProduction;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/**
* @author l3x
*/
-public class RequestSetSeed implements IClientIncomingPacket
+public class RequestSetSeed implements ClientPacket
{
private static final int BATCH_LENGTH = 20; // length of the one item
@@ -40,25 +40,25 @@ public class RequestSetSeed implements IClientIncomingPacket
private List _items;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _manorId = packet.readD();
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ _manorId = packet.readInt();
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ArrayList<>(count);
for (int i = 0; i < count; i++)
{
- final int itemId = packet.readD();
- final long sales = packet.readQ();
- final long price = packet.readQ();
+ final int itemId = packet.readInt();
+ final long sales = packet.readLong();
+ final long price = packet.readLong();
if ((itemId < 1) || (sales < 0) || (price < 0))
{
_items.clear();
- return false;
+ return;
}
if (sales > 0)
@@ -66,7 +66,6 @@ public class RequestSetSeed implements IClientIncomingPacket
_items.add(new SeedProduction(itemId, sales, price, sales));
}
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index c3f17e40a8..13769a126c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.ShortCuts;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,18 +26,17 @@ import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestShortCutDel implements IClientIncomingPacket
+public class RequestShortCutDel implements ClientPacket
{
private int _slot;
private int _page;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int position = packet.readD();
+ final int position = packet.readInt();
_slot = position % ShortCuts.MAX_SHORTCUTS_PER_BAR;
_page = position / ShortCuts.MAX_SHORTCUTS_PER_BAR;
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 07e48b893f..2cab040e00 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.ShortCuts;
import org.l2jmobius.gameserver.model.Shortcut;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
-public class RequestShortCutReg implements IClientIncomingPacket
+public class RequestShortCutReg implements ClientPacket
{
private ShortcutType _type;
private int _id;
@@ -41,19 +41,18 @@ public class RequestShortCutReg implements IClientIncomingPacket
private boolean _active;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int typeId = packet.readD();
+ final int typeId = packet.readInt();
_type = ShortcutType.values()[(typeId < 1) || (typeId > 6) ? 0 : typeId];
- final int position = packet.readD();
+ final int position = packet.readInt();
_slot = position % ShortCuts.MAX_SHORTCUTS_PER_BAR;
_page = position / ShortCuts.MAX_SHORTCUTS_PER_BAR;
- _active = packet.readC() == 1; // 228
- _id = packet.readD();
- _level = packet.readH();
- _subLevel = packet.readH(); // Sublevel
- _characterType = packet.readD();
- return true;
+ _active = packet.readByte() == 1; // 228
+ _id = packet.readInt();
+ _level = packet.readShort();
+ _subLevel = packet.readShort(); // Sublevel
+ _characterType = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index fc2725daa7..9e4eb65d46 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyList;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyList;
/**
* @author Sdw
*/
-public class RequestShowBeautyList implements IClientIncomingPacket
+public class RequestShowBeautyList implements ClientPacket
{
private int _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readD();
- return true;
+ _type = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 541b987e91..f803deffb5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.handler.CommunityBoardHandler;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,16 +26,12 @@ import org.l2jmobius.gameserver.network.GameClient;
* RequestShowBoard client packet implementation.
* @author Zoey76
*/
-public class RequestShowBoard implements IClientIncomingPacket
+public class RequestShowBoard implements ClientPacket
{
- @SuppressWarnings("unused")
- private int _unknown;
-
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unknown = packet.readD();
- return true;
+ packet.readInt(); // Unused.
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index f74c3abf4d..18163de255 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap;
* sample format d
* @version $Revision: 1 $ $Date: 2005/04/10 00:17:44 $
*/
-public class RequestShowMiniMap implements IClientIncomingPacket
+public class RequestShowMiniMap implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java
index 6773d7311e..4ce7622115 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.BeautyShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.beautyshop.BeautyData;
@@ -27,19 +27,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyRegistRese
/**
* @author Sdw
*/
-public class RequestShowResetShopList implements IClientIncomingPacket
+public class RequestShowResetShopList implements ClientPacket
{
private int _hairId;
private int _faceId;
private int _colorId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _hairId = packet.readD();
- _faceId = packet.readD();
- _colorId = packet.readD();
- return true;
+ _hairId = packet.readInt();
+ _faceId = packet.readInt();
+ _colorId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index f055ad8a57..fd33d40b2a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestSiegeAttackerList implements IClientIncomingPacket
+public class RequestSiegeAttackerList implements ClientPacket
{
private int _castleId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _castleId = packet.readD();
- return true;
+ _castleId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index a8d4c9f6d0..d5741e0815 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestSiegeDefenderList implements IClientIncomingPacket
+public class RequestSiegeDefenderList implements ClientPacket
{
private int _castleId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _castleId = packet.readD();
- return true;
+ _castleId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
index bc7b96271e..5165e4de4d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
@@ -16,24 +16,10 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-
/**
* Format: (c) (no data, trigger)
* @author -Wooden-
*/
-public class RequestSiegeInfo implements IClientIncomingPacket
+public class RequestSiegeInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return false;
- }
-
- @Override
- public void run(GameClient client)
- {
- // TODO this
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 51c42f7b7c..3a4c2663ec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -16,21 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @version 1.4
*/
-public class RequestSkillList implements IClientIncomingPacket
+public class RequestSkillList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index cf3c5ba1f4..50b0e9d367 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.ClanWarState;
import org.l2jmobius.gameserver.enums.UserInfoType;
@@ -32,15 +32,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.PledgeReceiveWarList;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-public class RequestStartPledgeWar implements IClientIncomingPacket
+public class RequestStartPledgeWar implements ClientPacket
{
private String _pledgeName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _pledgeName = packet.readS();
- return true;
+ _pledgeName = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartShowKrateisCubeRank.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartShowKrateisCubeRank.java
index 66f0b1f724..f378b64ca0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartShowKrateisCubeRank.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartShowKrateisCubeRank.java
@@ -16,20 +16,13 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Mobius
*/
-public class RequestStartShowKrateisCubeRank implements IClientIncomingPacket
+public class RequestStartShowKrateisCubeRank implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return false;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopMove.java
index c20be0994d..d4eae3fe09 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopMove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopMove.java
@@ -16,21 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Mobius
*/
-public class RequestStopMove implements IClientIncomingPacket
+public class RequestStopMove implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index 756841a7b4..d644eb2258 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -29,15 +29,14 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeReceiveWarList;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-public class RequestStopPledgeWar implements IClientIncomingPacket
+public class RequestStopPledgeWar implements ClientPacket
{
private String _pledgeName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _pledgeName = packet.readS();
- return true;
+ _pledgeName = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopShowKrateisCubeRank.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopShowKrateisCubeRank.java
index 6832b79b38..ca7a82eab0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopShowKrateisCubeRank.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopShowKrateisCubeRank.java
@@ -16,20 +16,13 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Mobius
*/
-public class RequestStopShowKrateisCubeRank implements IClientIncomingPacket
+public class RequestStopShowKrateisCubeRank implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return false;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index dec25745f5..5377071d2a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.ClanWarState;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -29,15 +29,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-public class RequestSurrenderPledgeWar implements IClientIncomingPacket
+public class RequestSurrenderPledgeWar implements ClientPacket
{
private String _pledgeName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _pledgeName = packet.readS();
- return true;
+ _pledgeName = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 6cfe5bcf65..71cce0bdf6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Mobius
*/
-public class RequestTargetActionMenu implements IClientIncomingPacket
+public class RequestTargetActionMenu implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- packet.readH(); // action?
- return true;
+ _objectId = packet.readInt();
+ packet.readShort(); // action?
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index 59e488052c..a16906a32a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
/**
* @author Mobius
*/
-public class RequestTargetCanceld implements IClientIncomingPacket
+public class RequestTargetCanceld implements ClientPacket
{
private boolean _targetLost;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetLost = packet.readH() != 0;
- return true;
+ _targetLost = packet.readShort() != 0;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
index 906847373d..a364c6fdde 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
@@ -16,22 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
* @author ShanSoft Packets Structure: chdd
*/
-public class RequestTeleportBookMark implements IClientIncomingPacket
+public class RequestTeleportBookMark implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- return true;
+ _id = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
index 44af777260..35faa3d317 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
@@ -16,20 +16,19 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.network.GameClient;
-public class RequestTutorialClientEvent implements IClientIncomingPacket
+public class RequestTutorialClientEvent implements ClientPacket
{
int _eventId = 0;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _eventId = packet.readD();
- return true;
+ _eventId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index be5307d5d7..dcd93aa93f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -16,23 +16,22 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.handler.AdminCommandHandler;
import org.l2jmobius.gameserver.handler.BypassHandler;
import org.l2jmobius.gameserver.handler.IBypassHandler;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-public class RequestTutorialLinkHtml implements IClientIncomingPacket
+public class RequestTutorialLinkHtml implements ClientPacket
{
private String _bypass;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readD();
- _bypass = packet.readS();
- return true;
+ packet.readInt();
+ _bypass = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index a2be9e6348..1d4652f76e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.handler.AdminCommandHandler;
import org.l2jmobius.gameserver.handler.BypassHandler;
import org.l2jmobius.gameserver.handler.IBypassHandler;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass;
import org.l2jmobius.gameserver.network.GameClient;
-public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
+public class RequestTutorialPassCmdToServer implements ClientPacket
{
private String _bypass = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _bypass = packet.readS();
- return true;
+ _bypass = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
index bb44a7b0b2..7f624f2eca 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
@@ -16,23 +16,22 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark;
import org.l2jmobius.gameserver.network.GameClient;
-public class RequestTutorialQuestionMark implements IClientIncomingPacket
+public class RequestTutorialQuestionMark implements ClientPacket
{
private int _number = 0;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readC(); // index ?
- _number = packet.readD();
- return true;
+ packet.readByte(); // index ?
+ _number = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index 0c96c1a205..429c9abc5d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.EtcItem;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Zoey76
*/
-public class RequestUnEquipItem implements IClientIncomingPacket
+public class RequestUnEquipItem implements ClientPacket
{
private int _slot;
@@ -40,10 +40,9 @@ public class RequestUnEquipItem implements IClientIncomingPacket
* Packet type id 0x16 format: cd
*/
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _slot = packet.readD();
- return true;
+ _slot = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 9e95fb93e1..eceed3f0d4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
-public class RequestVoteNew implements IClientIncomingPacket
+public class RequestVoteNew implements ClientPacket
{
private int _targetId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetId = packet.readD();
- return true;
+ _targetId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 79c24f96df..c623caa74d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.PremiumItem;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -28,19 +28,18 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Gnacik
*/
-public class RequestWithDrawPremiumItem implements IClientIncomingPacket
+public class RequestWithDrawPremiumItem implements ClientPacket
{
private int _itemNum;
private int _charId;
private long _itemCount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemNum = packet.readD();
- _charId = packet.readD();
- _itemCount = packet.readQ();
- return true;
+ _itemNum = packet.readInt();
+ _charId = packet.readInt();
+ _itemCount = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
index f9a6cefc60..10f3c17370 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.PartyMessageType;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,14 +25,8 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestWithDrawalParty implements IClientIncomingPacket
+public class RequestWithDrawalParty implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
index d342057610..383b7bfb95 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Gnacik
*/
-public class RequestWithdrawPartyRoom implements IClientIncomingPacket
+public class RequestWithdrawPartyRoom implements ClientPacket
{
private int _roomId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomId = packet.readD();
- return true;
+ _roomId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index 479ca1ebcd..d1de0cff83 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
@@ -29,14 +28,8 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestWithdrawalPledge implements IClientIncomingPacket
+public class RequestWithdrawalPledge implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
index 3b2494978b..3e73679827 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.olympiad.Hero;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.GameClient;
* Format chS c (id) 0xD0 h (subid) 0x0C S the hero's words :)
* @author -Wooden-
*/
-public class RequestWriteHeroWords implements IClientIncomingPacket
+public class RequestWriteHeroWords implements ClientPacket
{
private String _heroWords;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _heroWords = packet.readS();
- return true;
+ _heroWords = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
index fa42244c9a..a130c149d6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.handler.ChatHandler;
import org.l2jmobius.gameserver.handler.IChatHandler;
@@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.16.2.12.2.7 $ $Date: 2005/04/11 10:06:11 $
*/
-public class Say2 implements IClientIncomingPacket
+public class Say2 implements ClientPacket
{
private static Logger LOGGER_CHAT = Logger.getLogger("chat");
@@ -91,17 +91,16 @@ public class Say2 implements IClientIncomingPacket
private boolean _shareLocation;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _text = packet.readS();
- _type = packet.readD();
- _shareLocation = packet.readC() == 1;
+ _text = packet.readString();
+ _type = packet.readInt();
+ _shareLocation = packet.readByte() == 1;
if (_type == ChatType.WHISPER.getClientId())
{
- _target = packet.readS();
+ _target = packet.readString();
_shareLocation = false;
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index ed11410f59..6f2c9611e9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.handler.AdminCommandHandler;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.GameClient;
* This class handles all GM commands triggered by //command
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:29 $
*/
-public class SendBypassBuildCmd implements IClientIncomingPacket
+public class SendBypassBuildCmd implements ClientPacket
{
public static final int GM_MESSAGE = 9;
public static final int ANNOUNCEMENT = 10;
@@ -33,14 +33,13 @@ public class SendBypassBuildCmd implements IClientIncomingPacket
private String _command;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _command = packet.readS();
+ _command = packet.readString();
if (_command != null)
{
_command = _command.trim();
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 8e354c0c64..52084b98fe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -38,34 +38,33 @@ import org.l2jmobius.gameserver.util.Util;
/**
* SendWareHouseDepositList client packet class.
*/
-public class SendWareHouseDepositList implements IClientIncomingPacket
+public class SendWareHouseDepositList implements ClientPacket
{
private static final int BATCH_LENGTH = 12;
private List _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int size = packet.readD();
- if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != packet.getReadableBytes()))
+ final int size = packet.readInt();
+ if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
- final int objId = packet.readD();
- final long count = packet.readQ();
+ final int objId = packet.readInt();
+ final long count = packet.readLong();
if ((objId < 1) || (count < 0))
{
_items = null;
- return false;
+ return;
}
_items.add(new ItemHolder(objId, count));
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
index 7f8843c3a1..8d06438fa2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,34 +33,33 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/03/29 23:15:16 $
*/
-public class SendWareHouseWithDrawList implements IClientIncomingPacket
+public class SendWareHouseWithDrawList implements ClientPacket
{
private static final int BATCH_LENGTH = 12; // length of the one item
private ItemHolder[] _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
- if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ final int count = packet.readInt();
+ if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new ItemHolder[count];
for (int i = 0; i < count; i++)
{
- final int objId = packet.readD();
- final long cnt = packet.readQ();
+ final int objId = packet.readInt();
+ final long cnt = packet.readLong();
if ((objId < 1) || (cnt < 0))
{
_items = null;
- return false;
+ return;
}
_items[i] = new ItemHolder(objId, cnt);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
index f02aaa9ace..0668bfc65f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
@@ -21,7 +21,7 @@ import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA;
import java.util.Arrays;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.EnsoulData;
import org.l2jmobius.gameserver.enums.AttributeType;
@@ -40,61 +40,61 @@ import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgBuy;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
import org.l2jmobius.gameserver.util.Util;
-public class SetPrivateStoreListBuy implements IClientIncomingPacket
+public class SetPrivateStoreListBuy implements ClientPacket
{
private TradeItem[] _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
+ final int count = packet.readInt();
if ((count < 1) || (count > Config.MAX_ITEM_IN_PACKET))
{
- return false;
+ return;
}
_items = new TradeItem[count];
for (int i = 0; i < count; i++)
{
- final int itemId = packet.readD();
+ final int itemId = packet.readInt();
final ItemTemplate template = ItemTable.getInstance().getTemplate(itemId);
if (template == null)
{
_items = null;
- return false;
+ return;
}
- final int enchantLevel = packet.readH();
- packet.readH(); // TODO analyse this
+ final int enchantLevel = packet.readShort();
+ packet.readShort(); // TODO analyse this
- final long cnt = packet.readQ();
- final long price = packet.readQ();
+ final long cnt = packet.readLong();
+ final long price = packet.readLong();
if ((itemId < 1) || (cnt < 1) || (price < 0))
{
_items = null;
- return false;
+ return;
}
- final int option1 = packet.readD();
- final int option2 = packet.readD();
- final short attackAttributeId = (short) packet.readH();
- final int attackAttributeValue = packet.readH();
- final int defenceFire = packet.readH();
- final int defenceWater = packet.readH();
- final int defenceWind = packet.readH();
- final int defenceEarth = packet.readH();
- final int defenceHoly = packet.readH();
- final int defenceDark = packet.readH();
- final int visualId = packet.readD();
- final EnsoulOption[] soulCrystalOptions = new EnsoulOption[packet.readC()];
+ final int option1 = packet.readInt();
+ final int option2 = packet.readInt();
+ final short attackAttributeId = (short) packet.readShort();
+ final int attackAttributeValue = packet.readShort();
+ final int defenceFire = packet.readShort();
+ final int defenceWater = packet.readShort();
+ final int defenceWind = packet.readShort();
+ final int defenceEarth = packet.readShort();
+ final int defenceHoly = packet.readShort();
+ final int defenceDark = packet.readShort();
+ final int visualId = packet.readInt();
+ final EnsoulOption[] soulCrystalOptions = new EnsoulOption[packet.readByte()];
for (int k = 0; k < soulCrystalOptions.length; k++)
{
- soulCrystalOptions[k] = EnsoulData.getInstance().getOption(packet.readD());
+ soulCrystalOptions[k] = EnsoulData.getInstance().getOption(packet.readInt());
}
- final EnsoulOption[] soulCrystalSpecialOptions = new EnsoulOption[packet.readC()];
+ final EnsoulOption[] soulCrystalSpecialOptions = new EnsoulOption[packet.readByte()];
for (int k = 0; k < soulCrystalSpecialOptions.length; k++)
{
- soulCrystalSpecialOptions[k] = EnsoulData.getInstance().getOption(packet.readD());
+ soulCrystalSpecialOptions[k] = EnsoulData.getInstance().getOption(packet.readInt());
}
final TradeItem item = new TradeItem(template, cnt, price);
@@ -113,7 +113,6 @@ public class SetPrivateStoreListBuy implements IClientIncomingPacket
item.setSoulCrystalSpecialOptions(Arrays.asList(soulCrystalSpecialOptions));
_items[i] = item;
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
index f82eb92a63..78e6a7a086 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.2.2.1.2.5 $ $Date: 2005/03/27 15:29:30 $
*/
-public class SetPrivateStoreListSell implements IClientIncomingPacket
+public class SetPrivateStoreListSell implements ClientPacket
{
private static final int BATCH_LENGTH = 20; // length of the one item
@@ -44,29 +44,28 @@ public class SetPrivateStoreListSell implements IClientIncomingPacket
private Item[] _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _packageSale = (packet.readD() == 1);
- final int count = packet.readD();
- if ((count < 1) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ _packageSale = (packet.readInt() == 1);
+ final int count = packet.readInt();
+ if ((count < 1) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getRemainingLength()))
{
- return false;
+ return;
}
_items = new Item[count];
for (int i = 0; i < count; i++)
{
- final int itemId = packet.readD();
- final long cnt = packet.readQ();
- final long price = packet.readQ();
+ final int itemId = packet.readInt();
+ final long cnt = packet.readLong();
+ final long price = packet.readLong();
if ((itemId < 1) || (cnt < 1) || (price < 0))
{
_items = null;
- return false;
+ return;
}
_items[i] = new Item(itemId, cnt, price);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index 89261d5490..21f4eca0fb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgBuy;
@@ -26,17 +26,16 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.2.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
+public class SetPrivateStoreMsgBuy implements ClientPacket
{
private static final int MAX_MSG_LENGTH = 29;
private String _storeMsg;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _storeMsg = packet.readS();
- return true;
+ _storeMsg = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index 88e04641cf..6cd2e35b57 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgSell;
@@ -26,17 +26,16 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.2.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class SetPrivateStoreMsgSell implements IClientIncomingPacket
+public class SetPrivateStoreMsgSell implements ClientPacket
{
private static final int MAX_MSG_LENGTH = 29;
private String _storeMsg;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _storeMsg = packet.readS();
- return true;
+ _storeMsg = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index 38de85007e..15114ab909 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
@@ -26,17 +26,16 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author KenM
*/
-public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
+public class SetPrivateStoreWholeMsg implements ClientPacket
{
private static final int MAX_MSG_LENGTH = 29;
private String _msg;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _msg = packet.readS();
- return true;
+ _msg = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
index 954f295788..c72a9ee63a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author -Wooden-
*/
-public class SnoopQuit implements IClientIncomingPacket
+public class SnoopQuit implements ClientPacket
{
private int _snoopID;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _snoopID = packet.readD();
- return true;
+ _snoopID = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java
index 02b140e2c8..8e2f5c8fc3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.StartRotation;
@@ -25,17 +25,16 @@ import org.l2jmobius.gameserver.network.serverpackets.StartRotation;
/**
* @version $Revision: 1.1.4.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class StartRotating implements IClientIncomingPacket
+public class StartRotating implements ClientPacket
{
private int _degree;
private int _side;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _degree = packet.readD();
- _side = packet.readD();
- return true;
+ _degree = packet.readInt();
+ _side = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
index 3b207d8a9e..77a021623c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* This packet manages the trade response.
*/
-public class TradeDone implements IClientIncomingPacket
+public class TradeDone implements ClientPacket
{
private int _response;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _response = packet.readD();
- return true;
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 7459de6a55..171b80d0cd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.BotReportTable;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
@@ -39,15 +39,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* This packet manages the trade request.
*/
-public class TradeRequest implements IClientIncomingPacket
+public class TradeRequest implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
private void scheduleDeny(Player player, String name)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index c9403e2780..8dc534558b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -57,18 +57,17 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow;
import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-public class UseItem implements IClientIncomingPacket
+public class UseItem implements ClientPacket
{
private int _objectId;
private boolean _ctrlPressed;
private int _itemId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _ctrlPressed = packet.readD() != 0;
- return true;
+ _objectId = packet.readInt();
+ _ctrlPressed = packet.readInt() != 0;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
index 6512e23973..5ce3ac1fb4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.DoorData;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
-public class ValidatePosition implements IClientIncomingPacket
+public class ValidatePosition implements ClientPacket
{
private int _x;
private int _y;
@@ -32,14 +32,13 @@ public class ValidatePosition implements IClientIncomingPacket
private int _heading;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- _heading = packet.readD();
- packet.readD(); // vehicle id
- return true;
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
+ _heading = packet.readInt();
+ packet.readInt(); // vehicle id
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java
index 0b767cbd2b..23660f3221 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java
@@ -18,31 +18,30 @@ package org.l2jmobius.gameserver.network.clientpackets.adenadistribution;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.AdenaDistributionRequest;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaCancel;
import org.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaDone;
/**
* @author Sdw
*/
-public class RequestDivideAdena implements IClientIncomingPacket
+public class RequestDivideAdena implements ClientPacket
{
private int _adenaObjId;
private long _adenaCount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _adenaObjId = packet.readD();
- _adenaCount = packet.readQ();
- return true;
+ _adenaObjId = packet.readInt();
+ _adenaCount = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java
index 939672e99c..adb6de50d4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.adenadistribution;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.AdenaDistributionRequest;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaCancel;
/**
* @author Sdw
*/
-public class RequestDivideAdenaCancel implements IClientIncomingPacket
+public class RequestDivideAdenaCancel implements ClientPacket
{
private boolean _cancel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _cancel = packet.readC() == 0;
- return true;
+ _cancel = packet.readByte() == 0;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java
index 1ef4b840c5..e982131943 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java
@@ -18,27 +18,20 @@ package org.l2jmobius.gameserver.network.clientpackets.adenadistribution;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.AdenaDistributionRequest;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaStart;
/**
* @author Sdw
*/
-public class RequestDivideAdenaStart implements IClientIncomingPacket
+public class RequestDivideAdenaStart implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index 3ccf45b47f..359e61863a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -16,24 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.appearance;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.appearance.ExShapeShiftingResult;
/**
* @author UnAfraid
*/
-public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
+public class RequestExCancelShape_Shifting_Item implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index d94b79c9c4..802a82f8b3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.appearance;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,24 +28,23 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.appearance.ExPutShapeShiftingExtractionItemResult;
import org.l2jmobius.gameserver.network.serverpackets.appearance.ExPutShapeShiftingTargetItemResult;
/**
* @author UnAfraid
*/
-public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClientIncomingPacket
+public class RequestExTryToPutShapeShiftingEnchantSupportItem implements ClientPacket
{
private int _targetItemObjId;
private int _extracItemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- _extracItemObjId = packet.readD();
- return true;
+ _targetItemObjId = packet.readInt();
+ _extracItemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index 0099a38cbb..94f3ed8319 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.appearance;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,21 +26,20 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.appearance.ExPutShapeShiftingTargetItemResult;
/**
* @author UnAfraid
*/
-public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncomingPacket
+public class RequestExTryToPutShapeShiftingTargetItem implements ClientPacket
{
private int _targetItemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- return true;
+ _targetItemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index b0a305c58d..20651eb32a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.appearance;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.enums.InventorySlot;
import org.l2jmobius.gameserver.enums.ItemLocation;
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.model.variables.ItemVariables;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount;
import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@@ -40,15 +40,14 @@ import org.l2jmobius.gameserver.network.serverpackets.appearance.ExShapeShifting
/**
* @author UnAfraid
*/
-public class RequestShapeShiftingItem implements IClientIncomingPacket
+public class RequestShapeShiftingItem implements ClientPacket
{
private int _targetItemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- return true;
+ _targetItemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java
index 4a41856d2e..f3cd9affa8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets.attendance;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AttendanceRewardData;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,21 +25,15 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.attendance.ExConfirmVipAttendanceCheck;
/**
* @author Mobius
*/
-public class RequestVipAttendanceCheck implements IClientIncomingPacket
+public class RequestVipAttendanceCheck implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceItemList.java
index 6432582397..36123c259b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceItemList.java
@@ -17,24 +17,17 @@
package org.l2jmobius.gameserver.network.clientpackets.attendance;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendanceItemList;
/**
* @author Mobius
*/
-public class RequestVipAttendanceItemList implements IClientIncomingPacket
+public class RequestVipAttendanceItemList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeCancel.java
index 807f6f9ce1..eb2fd52407 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeCancel.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.attributechange;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeFail;
/**
* @author Mobius
*/
-public class RequestChangeAttributeCancel implements IClientIncomingPacket
+public class RequestChangeAttributeCancel implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index 7def665ec6..8da8b3474c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.attributechange;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeFail;
@@ -35,19 +35,18 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Mobius
*/
-public class RequestChangeAttributeItem implements IClientIncomingPacket
+public class RequestChangeAttributeItem implements ClientPacket
{
private int _consumeItemId;
private int _itemObjId;
private int _newElementId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _consumeItemId = packet.readD();
- _itemObjId = packet.readD();
- _newElementId = packet.readD();
- return true;
+ _consumeItemId = packet.readInt();
+ _itemObjId = packet.readInt();
+ _newElementId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java
index bb167218a7..e93ff626b3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java
@@ -16,28 +16,27 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.attributechange;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeInfo;
/**
* @author Mobius
*/
-public class SendChangeAttributeTargetItem implements IClientIncomingPacket
+public class SendChangeAttributeTargetItem implements ClientPacket
{
private int _crystalItemId;
private int _itemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _crystalItemId = packet.readD();
- _itemObjId = packet.readD();
- return true;
+ _crystalItemId = packet.readInt();
+ _itemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
index 25af7732ea..9981566daf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
@@ -20,18 +20,18 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlaySettingSend;
import org.l2jmobius.gameserver.taskmanager.AutoPlayTaskManager;
/**
* @author Mobius
*/
-public class ExAutoPlaySetting implements IClientIncomingPacket
+public class ExAutoPlaySetting implements ClientPacket
{
private int _options;
private boolean _active;
@@ -43,17 +43,16 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
private boolean _respectfulHunting;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _options = packet.readH();
- _active = packet.readC() == 1;
- _pickUp = packet.readC() == 1;
- _nextTargetMode = packet.readH();
- _shortRange = packet.readC() == 1;
- _potionPercent = packet.readD();
- _petPotionPercent = packet.readD(); // 272
- _respectfulHunting = packet.readC() == 1;
- return true;
+ _options = packet.readShort();
+ _active = packet.readByte() == 1;
+ _pickUp = packet.readByte() == 1;
+ _nextTargetMode = packet.readShort();
+ _shortRange = packet.readByte() == 1;
+ _potionPercent = packet.readInt();
+ _petPotionPercent = packet.readInt(); // 272
+ _respectfulHunting = packet.readByte() == 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 1be125ca2b..f116f62a62 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.autoplay;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.ShortCuts;
import org.l2jmobius.gameserver.model.Shortcut;
@@ -26,26 +26,25 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
/**
* @author Mobius
*/
-public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
+public class ExRequestActivateAutoShortcut implements ClientPacket
{
private int _slot;
private int _page;
private boolean _active;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int position = packet.readH();
+ final int position = packet.readShort();
_slot = position % ShortCuts.MAX_SHORTCUTS_PER_BAR;
_page = position / ShortCuts.MAX_SHORTCUTS_PER_BAR;
- _active = packet.readC() == 1;
- return true;
+ _active = packet.readByte() == 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionCancel.java
index d2f403d1ab..64da52289e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionCancel.java
@@ -16,24 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.blessing;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.BlessingItemRequest;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.blessing.ExBlessOptionCancel;
/**
- * Written by Horus, on 17.04.2021
+ * @author Horus
*/
-public class RequestBlessOptionCancel implements IClientIncomingPacket
+public class RequestBlessOptionCancel implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java
index d7c1531977..654b64f6eb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.blessing;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.ItemSkillType;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.EnchantResult;
import org.l2jmobius.gameserver.network.serverpackets.ExItemAnnounce;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
@@ -39,17 +39,16 @@ import org.l2jmobius.gameserver.util.Broadcast;
import org.l2jmobius.gameserver.util.Util;
/**
- * Written by Horus, on 17.04.2021
+ * @author Horus
*/
-public class RequestBlessOptionEnchant implements IClientIncomingPacket
+public class RequestBlessOptionEnchant implements ClientPacket
{
private int _itemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemObjId = packet.readD();
- return true;
+ _itemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java
index 249a869c81..dd7fa4f7e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.blessing;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.blessing.ExBlessOptionPutItem;
/**
- * Written by Horus, on 17.04.2021
+ * @author Horus
*/
-public class RequestBlessOptionPutItem implements IClientIncomingPacket
+public class RequestBlessOptionPutItem implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
index 2741ea8ca5..920ff25a9e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.classchange;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.ClassId;
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.classchange.ExClassChangeSetAlarm;
@@ -35,15 +35,14 @@ import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.Elemental
/**
* @author Mobius
*/
-public class ExRequestClassChange implements IClientIncomingPacket
+public class ExRequestClassChange implements ClientPacket
{
private int _classId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _classId = packet.readD();
- return true;
+ _classId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index b4c586e54f..8e13bf9d52 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -17,26 +17,25 @@
package org.l2jmobius.gameserver.network.clientpackets.classchange;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.classchange.ExClassChangeSetAlarm;
/**
* @author Mobius
*/
-public class ExRequestClassChangeVerifying implements IClientIncomingPacket
+public class ExRequestClassChangeVerifying implements ClientPacket
{
private int _classId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _classId = packet.readD();
- return true;
+ _classId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionCloseUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionCloseUI.java
index 3520c86f08..a4372b571b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionCloseUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionCloseUI.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.collection;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.collection.ExCollectionCloseUI;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestCollectionCloseUI implements IClientIncomingPacket
+public class RequestCollectionCloseUI implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionFavoriteList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionFavoriteList.java
index 685a085872..ecd0d4ee1f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionFavoriteList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionFavoriteList.java
@@ -16,22 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.collection;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.collection.ExCollectionFavoriteList;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestCollectionFavoriteList implements IClientIncomingPacket
+public class RequestCollectionFavoriteList implements ClientPacket
{
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readC(); // ?
- return true;
+ packet.readByte(); // ?
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionReceiveReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionReceiveReward.java
index 82ebe4b022..ad5f9e59a3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionReceiveReward.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionReceiveReward.java
@@ -16,23 +16,11 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.collection;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
- * Written by Berezkin Nikolay, on 13.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestCollectionReceiveReward implements IClientIncomingPacket
+public class RequestCollectionReceiveReward implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
index 1548c6fed6..d32667bdc7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.collection;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.CollectionData;
import org.l2jmobius.gameserver.data.xml.OptionData;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -26,26 +26,25 @@ import org.l2jmobius.gameserver.model.holders.PlayerCollectionData;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.options.Options;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.collection.ExCollectionComplete;
import org.l2jmobius.gameserver.network.serverpackets.collection.ExCollectionRegister;
/**
* @author Berezkin Nikolay, Mobius
*/
-public class RequestCollectionRegister implements IClientIncomingPacket
+public class RequestCollectionRegister implements ClientPacket
{
private int _collectionId;
private int _index;
private int _itemObjId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _collectionId = packet.readH();
- _index = packet.readD();
- _itemObjId = packet.readD();
- return true;
+ _collectionId = packet.readShort();
+ _index = packet.readInt();
+ _itemObjId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionUpdateFavorite.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionUpdateFavorite.java
index 8d4578fcf3..bc4620c3ab 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionUpdateFavorite.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionUpdateFavorite.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.collection;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.collection.ExCollectionUpdateFavorite;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestCollectionUpdateFavorite implements IClientIncomingPacket
+public class RequestCollectionUpdateFavorite implements ClientPacket
{
private int _isAdd;
private int _collectionId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _isAdd = packet.readC();
- _collectionId = packet.readH();
- return true;
+ _isAdd = packet.readByte();
+ _collectionId = packet.readShort();
}
@Override
@@ -46,6 +45,7 @@ public class RequestCollectionUpdateFavorite implements IClientIncomingPacket
{
return;
}
+
if (_isAdd == 1)
{
player.addCollectionFavorite(_collectionId);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionList.java
index b25fd71f1f..6d28dfa9ee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionList.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.collection;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.collection.ExCollectionList;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExCollectionList implements IClientIncomingPacket
+public class RequestExCollectionList implements ClientPacket
{
private int _category;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _category = packet.readC();
- return true;
+ _category = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionOpenUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionOpenUI.java
index 8d9283ab87..8de962becd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionOpenUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestExCollectionOpenUI.java
@@ -16,22 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.collection;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.collection.ExCollectionOpenUI;
/**
* Written by Berezkin Nikolay, on 12.04.2021
*/
-public class RequestExCollectionOpenUI implements IClientIncomingPacket
+public class RequestExCollectionOpenUI implements ClientPacket
{
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readC(); // 1 = isClosed
- return true;
+ packet.readByte(); // 1 = isClosed
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index e79211ec85..010eec1205 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -16,29 +16,28 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.commission.CommissionItem;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyInfo;
/**
* @author NosBit
*/
-public class RequestCommissionBuyInfo implements IClientIncomingPacket
+public class RequestCommissionBuyInfo implements ClientPacket
{
private long _commissionId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _commissionId = packet.readQ();
- // packet.readD(); // CommissionItemType
- return true;
+ _commissionId = packet.readLong();
+ // packet.readInt(); // CommissionItemType
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index 16dec35e6f..3eb5b028aa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
/**
* @author NosBit
*/
-public class RequestCommissionBuyItem implements IClientIncomingPacket
+public class RequestCommissionBuyItem implements ClientPacket
{
private long _commissionId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _commissionId = packet.readQ();
- // packet.readD(); // CommissionItemType
- return true;
+ _commissionId = packet.readLong();
+ // packet.readInt(); // CommissionItemType
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java
index 9a153863ab..2af9ba8846 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java
@@ -16,24 +16,12 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* This Packet doesn't seem to be doing anything.
* @author NosBit
*/
-public class RequestCommissionCancel implements IClientIncomingPacket
+public class RequestCommissionCancel implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return false;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 8a3ff5c955..795b88f723 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -16,27 +16,26 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
/**
* @author NosBit
*/
-public class RequestCommissionDelete implements IClientIncomingPacket
+public class RequestCommissionDelete implements ClientPacket
{
private long _commissionId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _commissionId = packet.readQ();
- // packet.readD(); // CommissionItemType
- // packet.readD(); // CommissionDurationType
- return true;
+ _commissionId = packet.readLong();
+ // packet.readInt(); // CommissionItemType
+ // packet.readInt(); // CommissionDurationType
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 01005d24c1..bdb833a986 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -16,27 +16,26 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionInfo;
/**
* @author NosBit
*/
-public class RequestCommissionInfo implements IClientIncomingPacket
+public class RequestCommissionInfo implements ClientPacket
{
private int _itemObjectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemObjectId = packet.readD();
- return true;
+ _itemObjectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 57fd69ec8d..ceb9d2dd41 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission;
import java.util.function.Predicate;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.commission.CommissionItemType;
@@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.model.commission.CommissionTreeType;
import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.type.CrystalType;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
/**
* @author NosBit
*/
-public class RequestCommissionList implements IClientIncomingPacket
+public class RequestCommissionList implements ClientPacket
{
private int _treeViewDepth;
private int _itemType;
@@ -41,14 +41,13 @@ public class RequestCommissionList implements IClientIncomingPacket
private String _query;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _treeViewDepth = packet.readD();
- _itemType = packet.readD();
- _type = packet.readD();
- _grade = packet.readD();
- _query = packet.readS();
- return true;
+ _treeViewDepth = packet.readInt();
+ _itemType = packet.readInt();
+ _type = packet.readInt();
+ _grade = packet.readInt();
+ _query = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 7842f646cd..ed3beaaef4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -16,18 +16,18 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
/**
* @author NosBit, Ren
*/
-public class RequestCommissionRegister implements IClientIncomingPacket
+public class RequestCommissionRegister implements ClientPacket
{
private int _itemObjectId;
private long _pricePerUnit;
@@ -36,18 +36,17 @@ public class RequestCommissionRegister implements IClientIncomingPacket
private int _feeDiscountType; // 0 = none, 1 = 30% discount, 2 = 100% discount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemObjectId = packet.readD();
- packet.readS(); // Item Name they use it for search we will use server side available names.
- _pricePerUnit = packet.readQ();
- _itemCount = packet.readQ();
- _durationType = packet.readD();
- _feeDiscountType = packet.readH();
- // packet.readH(); // Unknown IDS;
- // packet.readD(); // Unknown
- // packet.readD(); // Unknown
- return true;
+ _itemObjectId = packet.readInt();
+ packet.readString(); // Item Name they use it for search we will use server side available names.
+ _pricePerUnit = packet.readLong();
+ _itemCount = packet.readLong();
+ _durationType = packet.readInt();
+ _feeDiscountType = packet.readShort();
+ // packet.readShort(); // Unknown IDS;
+ // packet.readInt(); // Unknown
+ // packet.readInt(); // Unknown
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index b19aefac8d..d0daaccef8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -16,24 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
/**
* @author NosBit
*/
-public class RequestCommissionRegisteredItem implements IClientIncomingPacket
+public class RequestCommissionRegisteredItem implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 75a5a816f0..e353b170bf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -16,25 +16,18 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.commission;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionItemList;
/**
* @author NosBit
*/
-public class RequestCommissionRegistrableItemList implements IClientIncomingPacket
+public class RequestCommissionRegistrableItemList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java
index f067c49d3c..cb379f1685 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.compound;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.CompoundRequest;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author UnAfraid
*/
-public class RequestNewEnchantClose implements IClientIncomingPacket
+public class RequestNewEnchantClose implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index f72f1b6cef..ab0b2bb58d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.CombinationItemsData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.CompoundRequest;
@@ -26,22 +26,21 @@ import org.l2jmobius.gameserver.model.item.combination.CombinationItem;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneOK;
/**
* @author UnAfraid
*/
-public class RequestNewEnchantPushOne implements IClientIncomingPacket
+public class RequestNewEnchantPushOne implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 7446649384..6bf8ea0508 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.compound;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.CombinationItemsData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.CompoundRequest;
@@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.item.combination.CombinationItem;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoOK;
@@ -32,15 +32,14 @@ import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoOK;
/**
* @author UnAfraid
*/
-public class RequestNewEnchantPushTwo implements IClientIncomingPacket
+public class RequestNewEnchantPushTwo implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 72a0b34bfc..07e3121e2b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -16,13 +16,13 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.compound;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.CompoundRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneRemoveFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneRemoveOK;
@@ -30,15 +30,14 @@ import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneRemov
/**
* @author UnAfraid
*/
-public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
+public class RequestNewEnchantRemoveOne implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 4a05f6c92b..6294161e37 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -16,13 +16,13 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.compound;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.CompoundRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoRemoveFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoRemoveOK;
@@ -30,15 +30,14 @@ import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoRemov
/**
* @author UnAfraid
*/
-public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
+public class RequestNewEnchantRemoveTwo implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java
index f926d90210..7af29dff05 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java
@@ -18,7 +18,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.compound;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.CombinationItemsData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.CompoundRequest;
@@ -26,24 +26,23 @@ import org.l2jmobius.gameserver.model.item.combination.CombinationItem;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ExEnchantRetryToPutItemFail;
import org.l2jmobius.gameserver.network.serverpackets.ExEnchantRetryToPutItemOk;
/**
* @author Sdw
*/
-public class RequestNewEnchantRetryToPutItems implements IClientIncomingPacket
+public class RequestNewEnchantRetryToPutItems implements ClientPacket
{
private int _firstItemObjectId;
private int _secondItemObjectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _firstItemObjectId = packet.readD();
- _secondItemObjectId = packet.readD();
- return true;
+ _firstItemObjectId = packet.readInt();
+ _secondItemObjectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index b0f684b59f..9ec1e045ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.compound;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.CombinationItemsData;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -27,7 +26,7 @@ import org.l2jmobius.gameserver.model.item.combination.CombinationItemType;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
@@ -36,14 +35,8 @@ import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantSucess;
/**
* @author UnAfraid
*/
-public class RequestNewEnchantTry implements IClientIncomingPacket
+public class RequestNewEnchantTry implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 05c5412acb..6c73c94bac 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.crystalization;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.crystalization.ExGetCrystalizingEstimation;
import org.l2jmobius.gameserver.util.Util;
@@ -38,17 +38,16 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class RequestCrystallizeEstimate implements IClientIncomingPacket
+public class RequestCrystallizeEstimate implements ClientPacket
{
private int _objectId;
private long _count;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _count = packet.readQ();
- return true;
+ _objectId = packet.readInt();
+ _count = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java
index fc0cbcc409..f49d9ba043 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java
@@ -16,22 +16,15 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.crystalization;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author UnAfraid
*/
-public class RequestCrystallizeItemCancel implements IClientIncomingPacket
+public class RequestCrystallizeItemCancel implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
index e838f6e827..1e0d49ba87 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
@@ -18,27 +18,26 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
/**
* @author Sdw
*/
-public class RequestOneDayRewardReceive implements IClientIncomingPacket
+public class RequestOneDayRewardReceive implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readH();
- return true;
+ _id = packet.readShort();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
index 8ea90eefa1..c1f60d71e2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
@@ -16,27 +16,26 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.dailymission;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
/**
* @author UnAfraid
*/
-public class RequestTodoList implements IClientIncomingPacket
+public class RequestTodoList implements ClientPacket
{
private int _tab;
@SuppressWarnings("unused")
private boolean _showAllLevels;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _tab = packet.readC(); // Daily Reward = 9, Event = 1, Instance Zone = 2
- _showAllLevels = packet.readC() == 1; // Disabled = 0, Enabled = 1
- return true;
+ _tab = packet.readByte(); // Daily Reward = 9, Event = 1, Instance Zone = 2
+ _showAllLevels = packet.readByte() == 1; // Disabled = 0, Enabled = 1
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
index d42954b0cc..2703cfa548 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
@@ -16,14 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.dailymission;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mobius
*/
-public class RequestTodoListHTML implements IClientIncomingPacket
+public class RequestTodoListHTML implements ClientPacket
{
@SuppressWarnings("unused")
private int _tab;
@@ -31,11 +31,10 @@ public class RequestTodoListHTML implements IClientIncomingPacket
private String _linkName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _tab = packet.readC();
- _linkName = packet.readS();
- return true;
+ _tab = packet.readByte();
+ _linkName = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalInitTalent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalInitTalent.java
index aa0180ba65..0872de431a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalInitTalent.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalInitTalent.java
@@ -16,29 +16,28 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.ElementalSpiritData;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritSetTalent;
/**
* @author JoeAlisson
*/
-public class ExElementalInitTalent implements IClientIncomingPacket
+public class ExElementalInitTalent implements ClientPacket
{
private byte _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- return true;
+ _type = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorb.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorb.java
index 782708490a..9d3d4efdb7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorb.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorb.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.enums.UserInfoType;
@@ -25,27 +25,26 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ElementalSpiritAbsorbItemHolder;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritAbsorb;
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritAbsorb implements IClientIncomingPacket
+public class ExElementalSpiritAbsorb implements ClientPacket
{
private byte _type;
private int _itemId;
private int _amount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- packet.readD(); // items for now is always 1
- _itemId = packet.readD();
- _amount = packet.readD();
- return true;
+ _type = (byte) packet.readByte();
+ packet.readInt(); // items for now is always 1
+ _itemId = packet.readInt();
+ _amount = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorbInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorbInfo.java
index 4f9c5c2a75..c431a892c4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorbInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorbInfo.java
@@ -16,25 +16,24 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritAbsorbInfo;
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritAbsorbInfo implements IClientIncomingPacket
+public class ExElementalSpiritAbsorbInfo implements ClientPacket
{
private byte _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readC(); // unk
- _type = (byte) packet.readC();
- return true;
+ packet.readByte(); // unk
+ _type = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritChangeType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritChangeType.java
index 1fe4206062..dea78c3424 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritChangeType.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritChangeType.java
@@ -16,30 +16,29 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritInfo;
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritChangeType implements IClientIncomingPacket
+public class ExElementalSpiritChangeType implements ClientPacket
{
private byte _type;
private byte _element;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- _element = (byte) packet.readC(); // 1 - Fire, 2 - Water, 3 - Wind, 4 Earth
- return true;
+ _type = (byte) packet.readByte();
+ _element = (byte) packet.readByte(); // 1 - Fire, 2 - Water, 3 - Wind, 4 Earth
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolution.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolution.java
index 0591a5145d..f70f5d991c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolution.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolution.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
import java.util.stream.Collectors;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.enums.InventoryBlockType;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritEvolution;
@@ -37,15 +37,14 @@ import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.Elemental
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritEvolution implements IClientIncomingPacket
+public class ExElementalSpiritEvolution implements ClientPacket
{
private byte _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- return true;
+ _type = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolutionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolutionInfo.java
index ea447d6fbf..e72be8ab44 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolutionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritEvolutionInfo.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritEvolutionInfo;
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritEvolutionInfo implements IClientIncomingPacket
+public class ExElementalSpiritEvolutionInfo implements ClientPacket
{
private byte _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = (byte) packet.readC();
- return true;
+ _id = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtract.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtract.java
index c1618b81a3..656380210f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtract.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtract.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.ElementalSpiritData;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritExtract;
@@ -33,15 +33,14 @@ import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.Elemental
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritExtract implements IClientIncomingPacket
+public class ExElementalSpiritExtract implements ClientPacket
{
private byte _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- return true;
+ _type = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtractInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtractInfo.java
index 99df0031ea..d172c2dd4a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtractInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritExtractInfo.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritExtractInfo;
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritExtractInfo implements IClientIncomingPacket
+public class ExElementalSpiritExtractInfo implements ClientPacket
{
private byte _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- return true;
+ _type = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritInfo.java
index 525cab01c1..1f8adfe3cc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritInfo.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritInfo;
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritInfo implements IClientIncomingPacket
+public class ExElementalSpiritInfo implements ClientPacket
{
private byte _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- return true;
+ _type = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritSetTalent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritSetTalent.java
index d367f4628e..c4c8ecfff2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritSetTalent.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritSetTalent.java
@@ -16,14 +16,14 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritSetTalent;
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.Elemental
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritSetTalent implements IClientIncomingPacket
+public class ExElementalSpiritSetTalent implements ClientPacket
{
private byte _type;
private byte _attackPoints;
@@ -40,20 +40,19 @@ public class ExElementalSpiritSetTalent implements IClientIncomingPacket
private byte _critDamage;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = (byte) packet.readC();
- packet.readC(); // Characteristics for now always 4
+ _type = (byte) packet.readByte();
+ packet.readByte(); // Characteristics for now always 4
- packet.readC(); // attack id
- _attackPoints = (byte) packet.readC();
- packet.readC(); // defense id
- _defensePoints = (byte) packet.readC();
- packet.readC(); // crit rate id
- _critRate = (byte) packet.readC();
- packet.readC(); // crit damage id
- _critDamage = (byte) packet.readC();
- return true;
+ packet.readByte(); // attack id
+ _attackPoints = (byte) packet.readByte();
+ packet.readByte(); // defense id
+ _defensePoints = (byte) packet.readByte();
+ packet.readByte(); // crit rate id
+ _critRate = (byte) packet.readByte();
+ packet.readByte(); // crit damage id
+ _critDamage = (byte) packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
index 8d0677d082..7a43c1b54c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ensoul;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.EnsoulData;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ensoul.ExEnsoulResult;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@@ -36,33 +36,32 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
/**
* @author UnAfraid
*/
-public class RequestItemEnsoul implements IClientIncomingPacket
+public class RequestItemEnsoul implements ClientPacket
{
private int _itemObjectId;
private EnsoulItemOption[] _options;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemObjectId = packet.readD();
- final int options = packet.readC();
+ _itemObjectId = packet.readInt();
+ final int options = packet.readByte();
if ((options > 0) && (options <= 3))
{
_options = new EnsoulItemOption[options];
for (int i = 0; i < options; i++)
{
- final int type = packet.readC(); // 1 = normal ; 2 = mystic
- final int position = packet.readC();
- final int soulCrystalObjectId = packet.readD();
- final int soulCrystalOption = packet.readD();
+ final int type = packet.readByte(); // 1 = normal ; 2 = mystic
+ final int position = packet.readByte();
+ final int soulCrystalObjectId = packet.readInt();
+ final int soulCrystalOption = packet.readInt();
if ((position > 0) && (position < 3) && ((type == 1) || (type == 2)))
{
_options[i] = new EnsoulItemOption(type, position, soulCrystalObjectId, soulCrystalOption);
}
}
- return true;
+ return;
}
- return false;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index e2576dd23d..6bd70bd8f9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.ensoul;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.EnsoulData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -26,26 +26,25 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ensoul.ExEnSoulExtractionResult;
/**
* @author Mobius
*/
-public class RequestTryEnSoulExtraction implements IClientIncomingPacket
+public class RequestTryEnSoulExtraction implements ClientPacket
{
private int _itemObjectId;
private int _type;
private int _position;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemObjectId = packet.readD();
- _type = packet.readC();
- _position = packet.readC() - 1;
- return true;
+ _itemObjectId = packet.readInt();
+ _type = packet.readByte();
+ _position = packet.readByte() - 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
index a33544c3cc..f7e8dc4e25 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.equipmentupgrade;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.EquipmentUpgradeData;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.model.ItemInfo;
@@ -28,23 +28,22 @@ import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.ItemVariables;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.equipmentupgrade.ExUpgradeSystemResult;
/**
* @author Mobius
*/
-public class RequestUpgradeSystemResult implements IClientIncomingPacket
+public class RequestUpgradeSystemResult implements ClientPacket
{
private int _objectId;
private int _upgradeId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _upgradeId = packet.readD();
- return true;
+ _objectId = packet.readInt();
+ _upgradeId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgradenormal/ExUpgradeSystemNormalRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgradenormal/ExUpgradeSystemNormalRequest.java
index 0a7115efe0..1064027310 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgradenormal/ExUpgradeSystemNormalRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgradenormal/ExUpgradeSystemNormalRequest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.EquipmentUpgradeNormalData;
import org.l2jmobius.gameserver.enums.UpgradeDataType;
@@ -34,13 +34,13 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.equipmentupgradenormal.ExUpgradeSystemNormalResult;
/**
* @author Index
*/
-public class ExUpgradeSystemNormalRequest implements IClientIncomingPacket
+public class ExUpgradeSystemNormalRequest implements ClientPacket
{
private int _objectId;
private int _typeId;
@@ -52,12 +52,11 @@ public class ExUpgradeSystemNormalRequest implements IClientIncomingPacket
private boolean isNeedToSendUpdate = false;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _typeId = packet.readD();
- _upgradeId = packet.readD();
- return true;
+ _objectId = packet.readInt();
+ _typeId = packet.readInt();
+ _upgradeId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
index 635799d26b..fc448541b8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
@@ -20,25 +20,24 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.friend.FriendAddRequestResult;
-public class RequestAnswerFriendInvite implements IClientIncomingPacket
+public class RequestAnswerFriendInvite implements ClientPacket
{
private int _response;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readC();
- _response = packet.readD();
- return true;
+ packet.readByte();
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java
index 73cd9a6a4b..ccf4464e49 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java
@@ -20,29 +20,28 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.friend.FriendRemove;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestFriendDel implements IClientIncomingPacket
+public class RequestFriendDel implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index a0b7c23c20..f99b05555c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.friend;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.friend.ExFriendDetailInfo;
/**
* @author Sdw
*/
-public class RequestFriendDetailInfo implements IClientIncomingPacket
+public class RequestFriendDetailInfo implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java
index a58f1d9cc6..b6c8ce77b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.friend;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.model.BlockList;
@@ -25,19 +25,18 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.friend.FriendAddRequest;
-public class RequestFriendInvite implements IClientIncomingPacket
+public class RequestFriendInvite implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
private void scheduleDeny(Player player)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
index 9f68172f81..aa05cc81cf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
@@ -16,26 +16,19 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.friend;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1.3.4.3 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestFriendList implements IClientIncomingPacket
+public class RequestFriendList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java
index 4606922f4e..277ae3ad16 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.clientpackets.friend;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.L2FriendSay;
/**
* Recieve Private (Friend) Message - 0xCC Format: c SS S: Message S: Receiving Player
* @author Tempy
*/
-public class RequestSendFriendMsg implements IClientIncomingPacket
+public class RequestSendFriendMsg implements ClientPacket
{
private static Logger LOGGER_CHAT = Logger.getLogger("chat");
@@ -39,11 +39,10 @@ public class RequestSendFriendMsg implements IClientIncomingPacket
private String _reciever;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _message = packet.readS();
- _reciever = packet.readS();
- return true;
+ _message = packet.readString();
+ _reciever = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
index 0b1edf5712..21cd4997cd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.huntingzones;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -28,21 +28,20 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter;
/**
* @author Mobius
*/
-public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
+public class ExTimedHuntingZoneEnter implements ClientPacket
{
private int _zoneId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _zoneId = packet.readD();
- return true;
+ _zoneId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneList.java
index 344ef0c689..00a6ff9976 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneList.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.huntingzones;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList;
/**
* @author Mobius
*/
-public class ExTimedHuntingZoneList implements IClientIncomingPacket
+public class ExTimedHuntingZoneList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
index 59244befcb..e9895b7527 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.LimitShopClanData;
import org.l2jmobius.gameserver.data.xml.LimitShopCraftData;
@@ -37,14 +37,14 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.variables.AccountVariables;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExPurchaseLimitShopItemResult;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRBuyProduct;
/**
* @author Mobius
*/
-public class RequestPurchaseLimitShopItemBuy implements IClientIncomingPacket
+public class RequestPurchaseLimitShopItemBuy implements ClientPacket
{
private int _productId;
private int _amount;
@@ -52,11 +52,11 @@ public class RequestPurchaseLimitShopItemBuy implements IClientIncomingPacket
private int _shopIndex;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _shopIndex = packet.readC(); // 3 Lcoin Store, 4 Special Craft, 100 Clan Shop
- _productId = packet.readD();
- _amount = packet.readD();
+ _shopIndex = packet.readByte(); // 3 Lcoin Store, 4 Special Craft, 100 Clan Shop
+ _productId = packet.readInt();
+ _amount = packet.readInt();
switch (_shopIndex)
{
@@ -80,8 +80,6 @@ public class RequestPurchaseLimitShopItemBuy implements IClientIncomingPacket
_product = null;
}
}
-
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemList.java
index 3d6ac0733e..2dc8ab6f8e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemList.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.limitshop;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExPurchaseLimitShopItemListNew;
/**
* @author Mobius
*/
-public class RequestPurchaseLimitShopItemList implements IClientIncomingPacket
+public class RequestPurchaseLimitShopItemList implements ClientPacket
{
private int _category;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _category = packet.readC();
- return true;
+ _category = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
index d1978aa5d8..bd06b96c16 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
@@ -21,7 +21,7 @@ import java.util.EnumMap;
import java.util.List;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.ItemTable;
@@ -37,14 +37,14 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.luckygame.ExBettingLuckyGameResult;
/**
* @author Sdw
*/
-public class RequestLuckyGamePlay implements IClientIncomingPacket
+public class RequestLuckyGamePlay implements ClientPacket
{
private static final int FORTUNE_READING_TICKET = 23767;
private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
@@ -52,12 +52,11 @@ public class RequestLuckyGamePlay implements IClientIncomingPacket
private int _reading;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int type = CommonUtil.constrain(packet.readD(), 0, LuckyGameType.values().length);
+ final int type = CommonUtil.constrain(packet.readInt(), 0, LuckyGameType.values().length);
_type = LuckyGameType.values()[type];
- _reading = CommonUtil.constrain(packet.readD(), 0, 50); // max play is 50
- return true;
+ _reading = CommonUtil.constrain(packet.readInt(), 0, 50); // max play is 50
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGameStartInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGameStartInfo.java
index 7f4d588517..b86c244300 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGameStartInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGameStartInfo.java
@@ -16,23 +16,11 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.luckygame;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Sdw
*/
-public class RequestLuckyGameStartInfo implements IClientIncomingPacket
+public class RequestLuckyGameStartInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameInfo.java
index 6b30fab254..538807ceb3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameInfo.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.magiclamp;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.magiclamp.ExMagicLampGameInfoUI;
/**
* @author L2CCCP
*/
-public class ExMagicLampGameInfo implements IClientIncomingPacket
+public class ExMagicLampGameInfo implements ClientPacket
{
private byte _mode;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _mode = (byte) packet.readC(); // cGameMode
- return true;
+ _mode = (byte) packet.readByte(); // cGameMode
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameStart.java
index 615c49d4b9..04c5ff792f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/magiclamp/ExMagicLampGameStart.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.MagicLampData;
import org.l2jmobius.gameserver.enums.LampMode;
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.MagicLampDataHolder;
import org.l2jmobius.gameserver.model.holders.MagicLampHolder;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.magiclamp.ExMagicLampExpInfoUI;
import org.l2jmobius.gameserver.network.serverpackets.magiclamp.ExMagicLampGameInfoUI;
import org.l2jmobius.gameserver.network.serverpackets.magiclamp.ExMagicLampGameResult;
@@ -39,17 +39,16 @@ import org.l2jmobius.gameserver.network.serverpackets.magiclamp.ExMagicLampGameR
/**
* @author L2CCCP
*/
-public class ExMagicLampGameStart implements IClientIncomingPacket
+public class ExMagicLampGameStart implements ClientPacket
{
private int _count;
private byte _mode;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _count = packet.readD(); // MagicLampGameCCount
- _mode = (byte) packet.readC(); // GameMode
- return true;
+ _count = packet.readInt(); // MagicLampGameCCount
+ _mode = (byte) packet.readByte(); // GameMode
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
index d6039e7a43..65140726f1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -20,7 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.MentorManager;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,14 +30,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.mentoring.ExMentorList;
/**
* @author Gnacik, UnAfraid
*/
-public class ConfirmMenteeAdd implements IClientIncomingPacket
+public class ConfirmMenteeAdd implements ClientPacket
{
// public static int MENTEE_CERT = 33800;
@@ -45,11 +45,10 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
private String _mentor;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _confirmed = packet.readD();
- _mentor = packet.readS();
- return true;
+ _confirmed = packet.readInt();
+ _mentor = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java
index 59e09d021c..b16acfba66 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java
@@ -16,27 +16,26 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.mentoring;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.mentoring.ExMentorAdd;
/**
* @author Gnacik, UnAfraid
*/
-public class RequestMenteeAdd implements IClientIncomingPacket
+public class RequestMenteeAdd implements ClientPacket
{
private String _target;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _target = packet.readS();
- return true;
+ _target = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index e9e5d90e84..260ff0beb2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -16,28 +16,27 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.mentoring;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.mentoring.ListMenteeWaiting;
/**
* @author UnAfraid
*/
-public class RequestMenteeWaitingList implements IClientIncomingPacket
+public class RequestMenteeWaitingList implements ClientPacket
{
private int _page;
private int _minLevel;
private int _maxLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _page = packet.readD();
- _minLevel = packet.readD();
- _maxLevel = packet.readD();
- return true;
+ _page = packet.readInt();
+ _minLevel = packet.readInt();
+ _maxLevel = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java
index 6fa04d1a05..63b15680cf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.mentoring;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.instancemanager.MentorManager;
import org.l2jmobius.gameserver.model.Mentee;
@@ -28,23 +28,22 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeRemove;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author UnAfraid
*/
-public class RequestMentorCancel implements IClientIncomingPacket
+public class RequestMentorCancel implements ClientPacket
{
private int _confirmed;
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _confirmed = packet.readD();
- _name = packet.readS();
- return true;
+ _confirmed = packet.readInt();
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 20ec347a77..47a464ff96 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.mentoring;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.mentoring.ExMentorList;
/**
* @author UnAfraid
*/
-public class RequestMentorList implements IClientIncomingPacket
+public class RequestMentorList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java
index 815737b35e..d2d6d47aee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java
@@ -3,7 +3,6 @@ package org.l2jmobius.gameserver.network.clientpackets.pet;
import java.util.List;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.NpcData;
import org.l2jmobius.gameserver.data.xml.PetDataTable;
@@ -16,19 +15,13 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Berezkin Nikolay, Mobius
*/
-public class ExEvolvePet implements IClientIncomingPacket
+public class ExEvolvePet implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index dc344e2be8..6925a28496 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -2,7 +2,7 @@ package org.l2jmobius.gameserver.network.clientpackets.pet;
import java.util.concurrent.TimeUnit;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -15,25 +15,24 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
/**
- * Written by Berezkin Nikolay, on 25.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExPetEquipItem implements IClientIncomingPacket
+public class ExPetEquipItem implements ClientPacket
{
private int _objectId;
private int _itemId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index c71658e07d..bc7fb714fd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -1,6 +1,6 @@
package org.l2jmobius.gameserver.network.clientpackets.pet;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.ai.NextAction;
@@ -12,25 +12,24 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
/**
- * Written by Berezkin Nikolay, on 25.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExPetUnequipItem implements IClientIncomingPacket
+public class ExPetUnequipItem implements ClientPacket
{
private int _objectId;
private int _itemId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestChangePetName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestChangePetName.java
index e6fe4d64ab..2e69672977 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestChangePetName.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestChangePetName.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pet;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.PetNameTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @version $Revision: 1.3.4.4 $ $Date: 2005/04/06 16:13:48 $
*/
-public class RequestChangePetName implements IClientIncomingPacket
+public class RequestChangePetName implements ClientPacket
{
private String _name;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _name = packet.readS();
- return true;
+ _name = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestExAcquirePetSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestExAcquirePetSkill.java
index b718366acf..0e31e0b99b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestExAcquirePetSkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestExAcquirePetSkill.java
@@ -2,7 +2,7 @@ package org.l2jmobius.gameserver.network.clientpackets.pet;
import java.util.Optional;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.PetAcquireList;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -10,22 +10,21 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.holders.PetSkillAcquireHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
/**
- * Written by Berezkin Nikolay, on 26.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExAcquirePetSkill implements IClientIncomingPacket
+public class RequestExAcquirePetSkill implements ClientPacket
{
private int skillId, skillLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- skillId = packet.readD();
- skillLevel = packet.readD();
- return true;
+ skillId = packet.readInt();
+ skillLevel = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java
index e230a05384..039b92538c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java
@@ -17,20 +17,20 @@
package org.l2jmobius.gameserver.network.clientpackets.pet;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList;
import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.3.4.4 $ $Date: 2005/03/29 23:15:33 $
*/
-public class RequestGetItemFromPet implements IClientIncomingPacket
+public class RequestGetItemFromPet implements ClientPacket
{
private int _objectId;
private long _amount;
@@ -38,12 +38,11 @@ public class RequestGetItemFromPet implements IClientIncomingPacket
private int _unknown;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _amount = packet.readQ();
- _unknown = packet.readD(); // = 0 for most trades
- return true;
+ _objectId = packet.readInt();
+ _amount = packet.readLong();
+ _unknown = packet.readInt(); // = 0 for most trades
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java
index 6f8d5bb3ea..95297ff8d6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.pet;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
@@ -25,24 +25,23 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList;
import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.3.2.1.2.5 $ $Date: 2005/03/29 23:15:33 $
*/
-public class RequestGiveItemToPet implements IClientIncomingPacket
+public class RequestGiveItemToPet implements ClientPacket
{
private int _objectId;
private long _amount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _amount = packet.readQ();
- return true;
+ _objectId = packet.readInt();
+ _amount = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java
index 081a29e9cd..bbdf506e6d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pet;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -27,18 +27,17 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-public class RequestPetGetItem implements IClientIncomingPacket
+public class RequestPetGetItem implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java
index 228aff16bb..431a795c8e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pet;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.handler.ItemHandler;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,22 +25,21 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList;
-public class RequestPetUseItem implements IClientIncomingPacket
+public class RequestPetUseItem implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
+ _objectId = packet.readInt();
// TODO: implement me properly
- // packet.readQ();
- // packet.readD();
- return true;
+ // packet.readLong();
+ // packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
index 59096b87ee..4f91a80b38 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -24,19 +24,18 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-public class RequestExPledgeEnemyDelete implements IClientIncomingPacket
+public class RequestExPledgeEnemyDelete implements ClientPacket
{
private String _pledgeName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _pledgeName = packet.readS();
- return true;
+ _pledgeName = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyInfoList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyInfoList.java
index 892c8f8113..ecd984df89 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyInfoList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyInfoList.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeEnemyInfoList;
/**
- * Written by Berezkin Nikolay, on 04.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExPledgeEnemyInfoList implements IClientIncomingPacket
+public class RequestExPledgeEnemyInfoList implements ClientPacket
{
private int _playerClan;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _playerClan = packet.readD();
- return true;
+ _playerClan = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java
index 5bd8eb9386..b376637cc2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.ClanWarState;
import org.l2jmobius.gameserver.enums.UserInfoType;
@@ -27,19 +27,18 @@ import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.model.clan.ClanWar;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-public class RequestExPledgeEnemyRegister implements IClientIncomingPacket
+public class RequestExPledgeEnemyRegister implements ClientPacket
{
private String _pledgeName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _pledgeName = packet.readString();
- return true;
+ _pledgeName = packet.readSizedString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3Info.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3Info.java
index fcd70739a6..2e49cf076a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3Info.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3Info.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.PledgeReceiveWarList;
import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeClassicRaidInfo;
import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeV3Info;
/**
- * Written by Berezkin Nikolay, on 04.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExPledgeV3Info implements IClientIncomingPacket
+public class RequestExPledgeV3Info implements ClientPacket
{
private int _page;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _page = packet.readC();
- return true;
+ _page = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3SetAnnounce.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3SetAnnounce.java
index af60e1d6c7..f7375ad9a7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3SetAnnounce.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeV3SetAnnounce.java
@@ -16,27 +16,26 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeV3Info;
/**
- * Written by Berezkin Nikolay, on 04.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExPledgeV3SetAnnounce implements IClientIncomingPacket
+public class RequestExPledgeV3SetAnnounce implements ClientPacket
{
private String _announce;
private boolean _enterWorldShow;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _announce = packet.readString();
- _enterWorldShow = packet.readC() == 1;
- return true;
+ _announce = packet.readSizedString();
+ _enterWorldShow = packet.readByte() == 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
index 87ab7a19c3..9c494ea9f1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
@@ -17,24 +17,17 @@
package org.l2jmobius.gameserver.network.clientpackets.pledgebonus;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pledgebonus.ExPledgeBonusOpen;
import org.l2jmobius.gameserver.network.serverpackets.pledgedonation.ExPledgeDonationInfo;
/**
* @author UnAfraid
*/
-public class RequestPledgeBonusOpen implements IClientIncomingPacket
+public class RequestPledgeBonusOpen implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java
index 793a3a0387..2bd5dc13f6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgebonus;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.ClanRewardType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -25,20 +25,19 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author UnAfraid
*/
-public class RequestPledgeBonusReward implements IClientIncomingPacket
+public class RequestPledgeBonusReward implements ClientPacket
{
private int _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readC();
- return true;
+ _type = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java
index f7040c8c0a..2ecf56113e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgebonus;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pledgebonus.ExPledgeBonusList;
/**
* @author UnAfraid
*/
-public class RequestPledgeBonusRewardList implements IClientIncomingPacket
+public class RequestPledgeBonusRewardList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeContributionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeContributionList.java
index 5918f19919..e7ba175615 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeContributionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeContributionList.java
@@ -16,24 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgedonation;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pledgedonation.ExPledgeContributionList;
/**
- * Written by Berezkin Nikolay, on 09.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExPledgeContributionList implements IClientIncomingPacket
+public class RequestExPledgeContributionList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java
index 1aa48d30b1..7cde959fb1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java
@@ -16,24 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgedonation;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.pledgedonation.ExPledgeDonationInfo;
/**
- * Written by Berezkin Nikolay, on 08.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExPledgeDonationInfo implements IClientIncomingPacket
+public class RequestExPledgeDonationInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
index 1122ca4fc3..c96ad52f44 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.pledgedonation;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.MailType;
import org.l2jmobius.gameserver.instancemanager.MailManager;
@@ -27,23 +27,22 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.itemcontainer.Mail;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount;
import org.l2jmobius.gameserver.network.serverpackets.pledgedonation.ExPledgeDonationInfo;
import org.l2jmobius.gameserver.network.serverpackets.pledgedonation.ExPledgeDonationRequest;
/**
- * Written by Berezkin Nikolay, on 08.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestExPledgeDonationRequest implements IClientIncomingPacket
+public class RequestExPledgeDonationRequest implements ClientPacket
{
private int _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readC();
- return true;
+ _type = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java
index 6436140bb8..2ad69dc3a5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.primeshop;
import java.util.Calendar;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.enums.ExBrProductReplyType;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem;
import org.l2jmobius.gameserver.model.variables.AccountVariables;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRBuyProduct;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRGamePoint;
import org.l2jmobius.gameserver.util.Util;
@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Gnacik, UnAfraid
*/
-public class RequestBRBuyProduct implements IClientIncomingPacket
+public class RequestBRBuyProduct implements ClientPacket
{
private static final int HERO_COINS = 23805;
@@ -45,11 +45,10 @@ public class RequestBRBuyProduct implements IClientIncomingPacket
private int _count;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _brId = packet.readD();
- _count = packet.readD();
- return true;
+ _brId = packet.readInt();
+ _count = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 618f6dc7ed..002bf57fc7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.primeshop;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRGamePoint;
/**
* @author Gnacik, UnAfraid
*/
-public class RequestBRGamePoint implements IClientIncomingPacket
+public class RequestBRGamePoint implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java
index 8905a5a01d..44d4c07560 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.primeshop;
import java.util.Calendar;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.enums.ExBrProductReplyType;
@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Mail;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRBuyProduct;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRGamePoint;
import org.l2jmobius.gameserver.util.Util;
@@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author Gnacik, UnAfraid
*/
-public class RequestBRPresentBuyProduct implements IClientIncomingPacket
+public class RequestBRPresentBuyProduct implements ClientPacket
{
private static final int HERO_COINS = 23805;
@@ -52,14 +52,13 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket
private String _mailBody;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _brId = packet.readD();
- _count = packet.readD();
- _charName = packet.readS();
- _mailTitle = packet.readS();
- _mailBody = packet.readS();
- return true;
+ _brId = packet.readInt();
+ _count = packet.readInt();
+ _charName = packet.readString();
+ _mailTitle = packet.readString();
+ _mailBody = packet.readString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java
index dad669e0ac..67d50ac643 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.primeshop;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Gnacik, UnAfraid
*/
-public class RequestBRProductInfo implements IClientIncomingPacket
+public class RequestBRProductInfo implements ClientPacket
{
private int _brId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _brId = packet.readD();
- return true;
+ _brId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java
index a53878b794..6b684e35b8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.primeshop;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList;
/**
* @author Gnacik, UnAfraid
*/
-public class RequestBRProductList implements IClientIncomingPacket
+public class RequestBRProductList implements ClientPacket
{
private int _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readD();
- return true;
+ _type = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..4cf770efc9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -16,25 +16,11 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.primeshop;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Gnacik, UnAfraid
*/
-public class RequestBRRecentProductList implements IClientIncomingPacket
+public class RequestBRRecentProductList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
- @Override
- public void run(GameClient client)
- {
- // Player player = client.getPlayer();
- // TODO: Implement it.
- }
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index ec8e5d5ac8..8b80c30994 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -19,32 +19,32 @@ package org.l2jmobius.gameserver.network.clientpackets.raidbossinfo;
import java.util.HashMap;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.GrandBoss;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpawnInfo;
/**
* @author Mobius
*/
-public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
+public class RequestRaidBossSpawnInfo implements ClientPacket
{
private static final int BAIUM = 29020;
private final Map _statuses = new HashMap<>();
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
+ final int count = packet.readInt();
for (int i = 0; i < count; i++)
{
- final int bossId = packet.readD();
+ final int bossId = packet.readInt();
final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
if (boss == null)
{
@@ -90,7 +90,6 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
}
}
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidServerInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidServerInfo.java
index e294be7ed1..6bace17f4e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidServerInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidServerInfo.java
@@ -16,24 +16,11 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.raidbossinfo;
-import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mobius
*/
-public class RequestRaidServerInfo implements IClientIncomingPacket
+public class RequestRaidServerInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- // System.out.println("RequestRaidServerInfo");
- return true;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
index 5c84ee4004..f8ba1ae4a5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
@@ -21,34 +21,33 @@ import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.RandomCraftData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.RandomCraftRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftExtract;
import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftInfo;
/**
* @author Mode
*/
-public class ExRequestRandomCraftExtract implements IClientIncomingPacket
+public class ExRequestRandomCraftExtract implements ClientPacket
{
private final Map _items = new HashMap<>();
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int size = packet.readD();
+ final int size = packet.readInt();
for (int i = 0; i < size; i++)
{
- final int objId = packet.readD();
- final long count = packet.readQ();
+ final int objId = packet.readInt();
+ final long count = packet.readLong();
_items.put(objId, count);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftInfo.java
index 0bd264a4a9..54fb388a9a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftInfo.java
@@ -17,23 +17,16 @@
package org.l2jmobius.gameserver.network.clientpackets.randomcraft;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftRandomInfo;
/**
* @author Mode
*/
-public class ExRequestRandomCraftInfo implements IClientIncomingPacket
+public class ExRequestRandomCraftInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java
index 7a3aad8282..b216105001 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java
@@ -17,20 +17,20 @@
package org.l2jmobius.gameserver.network.clientpackets.randomcraft;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftRandomInfo;
import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftRandomLockSlot;
/**
* @author Mode
*/
-public class ExRequestRandomCraftLockSlot implements IClientIncomingPacket
+public class ExRequestRandomCraftLockSlot implements ClientPacket
{
private static final int[] LOCK_PRICE =
{
@@ -42,10 +42,9 @@ public class ExRequestRandomCraftLockSlot implements IClientIncomingPacket
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = packet.readD();
- return true;
+ _id = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftMake.java
index a48e1366e9..2e2b1e730d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftMake.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftMake.java
@@ -17,23 +17,16 @@
package org.l2jmobius.gameserver.network.clientpackets.randomcraft;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mode
*/
-public class ExRequestRandomCraftMake implements IClientIncomingPacket
+public class ExRequestRandomCraftMake implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftRefresh.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftRefresh.java
index 5bf3537003..f413c20975 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftRefresh.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftRefresh.java
@@ -17,23 +17,16 @@
package org.l2jmobius.gameserver.network.clientpackets.randomcraft;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mode
*/
-public class ExRequestRandomCraftRefresh implements IClientIncomingPacket
+public class ExRequestRandomCraftRefresh implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharBuffzoneNpcPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharBuffzoneNpcPosition.java
index 72cc95be26..e98e8d89a9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharBuffzoneNpcPosition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharBuffzoneNpcPosition.java
@@ -16,25 +16,18 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.RankManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExRankingBuffZoneNpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExRankingBuffZoneNpcPosition;
/**
* @author Serenitty
*/
-public class RequestExRankingCharBuffzoneNpcPosition implements IClientIncomingPacket
+public class RequestExRankingCharBuffzoneNpcPosition implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharSpawnBuffzoneNpc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharSpawnBuffzoneNpc.java
index 8736aafb13..1c79d54588 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharSpawnBuffzoneNpc.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestExRankingCharSpawnBuffzoneNpc.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.RankingPowerManager;
import org.l2jmobius.gameserver.model.World;
@@ -25,23 +24,17 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExRankingBuffZoneNpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExRankingBuffZoneNpcPosition;
/**
* @author Serenitty
*/
-public class RequestExRankingCharSpawnBuffzoneNpc implements IClientIncomingPacket
+public class RequestExRankingCharSpawnBuffzoneNpc implements ClientPacket
{
private static final int COST = 20000000;
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadHeroAndLegendInfo.java
index 4ff002189f..2a31d81485 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadHeroAndLegendInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadHeroAndLegendInfo.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExOlympiadHeroAndLegendInfo;
/**
* @author NviX
*/
-public class RequestOlympiadHeroAndLegendInfo implements IClientIncomingPacket
+public class RequestOlympiadHeroAndLegendInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadMyRankingInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadMyRankingInfo.java
index 2010bde00f..b2e8d148f3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadMyRankingInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadMyRankingInfo.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExOlympiadMyRankingInfo;
/**
* @author NviX
*/
-public class RequestOlympiadMyRankingInfo implements IClientIncomingPacket
+public class RequestOlympiadMyRankingInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadRankingInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadRankingInfo.java
index 0dafd65e66..28d508a873 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadRankingInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestOlympiadRankingInfo.java
@@ -16,16 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExOlympiadRankingInfo;
/**
* @author NviX
*/
-public class RequestOlympiadRankingInfo implements IClientIncomingPacket
+public class RequestOlympiadRankingInfo implements ClientPacket
{
private int _tabId;
private int _rankingType;
@@ -34,14 +34,13 @@ public class RequestOlympiadRankingInfo implements IClientIncomingPacket
private int _serverId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _tabId = packet.readC();
- _rankingType = packet.readC();
- _unk = packet.readC();
- _classId = packet.readD();
- _serverId = packet.readD();
- return true;
+ _tabId = packet.readByte();
+ _rankingType = packet.readByte();
+ _unk = packet.readByte();
+ _classId = packet.readInt();
+ _serverId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingList.java
index b512a75dae..1537321c4e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingList.java
@@ -16,16 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExPetRankingList;
/**
* @author Mobius
*/
-public class RequestPetRankingList implements IClientIncomingPacket
+public class RequestPetRankingList implements ClientPacket
{
private int _season;
private int _tabId;
@@ -33,13 +33,12 @@ public class RequestPetRankingList implements IClientIncomingPacket
private int _petItemObjectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _season = packet.readC();
- _tabId = packet.readC();
- _type = packet.readC();
- _petItemObjectId = packet.readD();
- return true;
+ _season = packet.readByte();
+ _tabId = packet.readByte();
+ _type = packet.readByte();
+ _petItemObjectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingMyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingMyInfo.java
index 799a8c4fdf..85da4e4aa4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingMyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPetRankingMyInfo.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExPetRankingMyInfo;
/**
- * Written by Berezkin Nikolay, on 10.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestPetRankingMyInfo implements IClientIncomingPacket
+public class RequestPetRankingMyInfo implements ClientPacket
{
private int _petId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _petId = packet.readD();
- return true;
+ _petId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingList.java
index e2c513b581..f724a71d1f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingList.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExPledgeRankingList;
/**
- * Written by Berezkin Nikolay, on 16.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestPledgeRankingList implements IClientIncomingPacket
+public class RequestPledgeRankingList implements ClientPacket
{
private int _category;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _category = packet.readC();
- return true;
+ _category = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingMyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingMyInfo.java
index db7db056e8..593198b8c9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingMyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPledgeRankingMyInfo.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExPledgeRankingMyInfo;
/**
- * Written by Berezkin Nikolay, on 16.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestPledgeRankingMyInfo implements IClientIncomingPacket
+public class RequestPledgeRankingMyInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingList.java
index 4469196427..700627d45e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingList.java
@@ -16,16 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExPvpRankingList;
/**
- * Written by Berezkin Nikolay, on 10.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestPvpRankingList implements IClientIncomingPacket
+public class RequestPvpRankingList implements ClientPacket
{
private int _season;
private int _tabId;
@@ -33,13 +33,12 @@ public class RequestPvpRankingList implements IClientIncomingPacket
private int _race;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _season = packet.readC(); // CurrentSeason
- _tabId = packet.readC(); // RankingGroup
- _type = packet.readC(); // RankingScope
- _race = packet.readD(); // Race
- return true;
+ _season = packet.readByte(); // CurrentSeason
+ _tabId = packet.readByte(); // RankingGroup
+ _type = packet.readByte(); // RankingScope
+ _race = packet.readInt(); // Race
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingMyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingMyInfo.java
index 7dbf3682ab..834059f862 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingMyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestPvpRankingMyInfo.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExPvpRankingMyInfo;
/**
- * Written by Berezkin Nikolay, on 10.05.2021
+ * @author Berezkin Nikolay
*/
-public class RequestPvpRankingMyInfo implements IClientIncomingPacket
+public class RequestPvpRankingMyInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharInfo.java
index 52b92774d5..1ee0b6058f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharInfo.java
@@ -16,24 +16,21 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExRankingCharInfo;
/**
* @author JoeAlisson
*/
-public class RequestRankingCharInfo implements IClientIncomingPacket
+public class RequestRankingCharInfo implements ClientPacket
{
- private short _unk;
-
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unk = packet.readC();
- return true;
+ packet.readByte(); // Unknown.
}
@Override
@@ -45,6 +42,6 @@ public class RequestRankingCharInfo implements IClientIncomingPacket
return;
}
- player.sendPacket(new ExRankingCharInfo(player, _unk));
+ player.sendPacket(new ExRankingCharInfo(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharRankers.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharRankers.java
index 3e02f9470f..871763aae0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharRankers.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ranking/RequestRankingCharRankers.java
@@ -16,16 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ranking;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ranking.ExRankingCharRankers;
/**
* @author JoeAlisson
*/
-public class RequestRankingCharRankers implements IClientIncomingPacket
+public class RequestRankingCharRankers implements ClientPacket
{
private int _group;
private int _scope;
@@ -33,13 +33,12 @@ public class RequestRankingCharRankers implements IClientIncomingPacket
private int _baseclass;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _group = packet.readC(); // Tab Id
- _scope = packet.readC(); // All or personal
- _ordinal = packet.readD();
- _baseclass = packet.readD();
- return true;
+ _group = packet.readByte(); // Tab Id
+ _scope = packet.readByte(); // All or personal
+ _ordinal = packet.readInt();
+ _baseclass = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeKillerLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeKillerLocation.java
index ac5cd36b13..8c1edb5cd4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeKillerLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeKillerLocation.java
@@ -16,25 +16,24 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.revenge;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.RevengeHistoryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mobius
*/
-public class RequestExPvpBookShareRevengeKillerLocation implements IClientIncomingPacket
+public class RequestExPvpBookShareRevengeKillerLocation implements ClientPacket
{
private String _killerName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readString(); // Victim name.
- _killerName = packet.readString();
- return true;
+ packet.readSizedString(); // Victim name.
+ _killerName = packet.readSizedString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeList.java
index 257e28d67c..a82a69beae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeList.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.revenge;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.revenge.ExPvpBookShareRevengeList;
/**
* @author Mobius
*/
-public class RequestExPvpBookShareRevengeList implements IClientIncomingPacket
+public class RequestExPvpBookShareRevengeList implements ClientPacket
{
private int _objectId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- return true;
+ _objectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeReqShareRevengeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeReqShareRevengeInfo.java
index 21105f159c..edb30a48f5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeReqShareRevengeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeReqShareRevengeInfo.java
@@ -16,31 +16,30 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.revenge;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.RevengeHistoryManager;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Mobius
*/
-public class RequestExPvpBookShareRevengeReqShareRevengeInfo implements IClientIncomingPacket
+public class RequestExPvpBookShareRevengeReqShareRevengeInfo implements ClientPacket
{
private String _victimName;
private String _killerName;
private int _type;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _victimName = packet.readString();
- _killerName = packet.readString();
- _type = packet.readD();
- return true;
+ _victimName = packet.readSizedString();
+ _killerName = packet.readSizedString();
+ _type = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeSharedTeleportToKiller.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeSharedTeleportToKiller.java
index ad1c3ce25f..5913687d6d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeSharedTeleportToKiller.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeSharedTeleportToKiller.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.revenge;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.RevengeHistoryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mobius
*/
-public class RequestExPvpBookShareRevengeSharedTeleportToKiller implements IClientIncomingPacket
+public class RequestExPvpBookShareRevengeSharedTeleportToKiller implements ClientPacket
{
private String _victimName;
private String _killerName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _victimName = packet.readString();
- _killerName = packet.readString();
- return true;
+ _victimName = packet.readSizedString();
+ _killerName = packet.readSizedString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeTeleportToKiller.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeTeleportToKiller.java
index 3dc8ba3a86..d12b7ea9e5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeTeleportToKiller.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/revenge/RequestExPvpBookShareRevengeTeleportToKiller.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.revenge;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.RevengeHistoryManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mobius
*/
-public class RequestExPvpBookShareRevengeTeleportToKiller implements IClientIncomingPacket
+public class RequestExPvpBookShareRevengeTeleportToKiller implements ClientPacket
{
private String _victimName;
private String _killerName;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _victimName = packet.readString();
- _killerName = packet.readString();
- return true;
+ _victimName = packet.readSizedString();
+ _killerName = packet.readSizedString();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java
index 51b0df6738..2de62514ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.sayune;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.SayuneRequest;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author UnAfraid
*/
-public class RequestFlyMove implements IClientIncomingPacket
+public class RequestFlyMove implements ClientPacket
{
private int _locationId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _locationId = packet.readD();
- return true;
+ _locationId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
index 21aa8f4169..29d8f9606b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets.sayune;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.SayuneData;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.SayuneEntry;
@@ -28,19 +27,13 @@ import org.l2jmobius.gameserver.model.zone.type.SayuneZone;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author UnAfraid
*/
-public class RequestFlyMoveStart implements IClientIncomingPacket
+public class RequestFlyMoveStart implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExInteractModify.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExInteractModify.java
index 220e8ccc3e..22ddcd3521 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExInteractModify.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExInteractModify.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.settings;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.ClientSettings;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Index
*/
-public class ExInteractModify implements IClientIncomingPacket
+public class ExInteractModify implements ClientPacket
{
private int _type;
private int _settings;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readC();
- _settings = packet.readC();
- return true;
+ _type = packet.readByte();
+ _settings = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExSaveItemAnnounceSetting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExSaveItemAnnounceSetting.java
index b9fcb5bd20..f31e5eb746 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExSaveItemAnnounceSetting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/ExSaveItemAnnounceSetting.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.settings;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.settings.ExItemAnnounceSetting;
/**
* @author Index
*/
-public class ExSaveItemAnnounceSetting implements IClientIncomingPacket
+public class ExSaveItemAnnounceSetting implements ClientPacket
{
private boolean _announceType;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _announceType = packet.readC() == 1;
- return true;
+ _announceType = packet.readByte() == 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestKeyMapping.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestKeyMapping.java
index 01a2ec7415..0e0622e457 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestKeyMapping.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestKeyMapping.java
@@ -17,23 +17,16 @@
package org.l2jmobius.gameserver.network.clientpackets.settings;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.settings.ExUISetting;
/**
* @author KenM / mrTJO
*/
-public class RequestKeyMapping implements IClientIncomingPacket
+public class RequestKeyMapping implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestSaveKeyMapping.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestSaveKeyMapping.java
index a0f45591b8..8a4ce215a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestSaveKeyMapping.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/settings/RequestSaveKeyMapping.java
@@ -17,32 +17,31 @@
package org.l2jmobius.gameserver.network.clientpackets.settings;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* Request Save Key Mapping client packet.
* @author Mobius
*/
-public class RequestSaveKeyMapping implements IClientIncomingPacket
+public class RequestSaveKeyMapping implements ClientPacket
{
public static final String SPLIT_VAR = " ";
private byte[] _uiKeyMapping;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int dataSize = packet.readD();
+ final int dataSize = packet.readInt();
if (dataSize > 0)
{
- _uiKeyMapping = packet.readB(dataSize);
+ _uiKeyMapping = packet.readBytes(dataSize);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java
index 71f576097a..db8d6e300c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java
@@ -16,17 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.shuttle;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.shuttle.ExStopMoveInShuttle;
/**
* @author UnAfraid
*/
-public class CannotMoveAnymoreInShuttle implements IClientIncomingPacket
+public class CannotMoveAnymoreInShuttle implements ClientPacket
{
private int _x;
private int _y;
@@ -35,14 +35,13 @@ public class CannotMoveAnymoreInShuttle implements IClientIncomingPacket
private int _boatId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _boatId = packet.readD();
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- _heading = packet.readD();
- return true;
+ _boatId = packet.readInt();
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
+ _heading = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java
index 4426754057..c73a1f837e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java
@@ -16,12 +16,12 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.shuttle;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.shuttle.ExMoveToLocationInShuttle;
import org.l2jmobius.gameserver.network.serverpackets.shuttle.ExStopMoveInShuttle;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.shuttle.ExStopMoveInShuttl
/**
* @author UnAfraid
*/
-public class MoveToLocationInShuttle implements IClientIncomingPacket
+public class MoveToLocationInShuttle implements ClientPacket
{
private int _boatId;
private int _targetX;
@@ -40,16 +40,15 @@ public class MoveToLocationInShuttle implements IClientIncomingPacket
private int _originZ;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _boatId = packet.readD(); // objectId of boat
- _targetX = packet.readD();
- _targetY = packet.readD();
- _targetZ = packet.readD();
- _originX = packet.readD();
- _originY = packet.readD();
- _originZ = packet.readD();
- return true;
+ _boatId = packet.readInt(); // objectId of boat
+ _targetX = packet.readInt();
+ _targetY = packet.readInt();
+ _targetZ = packet.readInt();
+ _originX = packet.readInt();
+ _originY = packet.readInt();
+ _originZ = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java
index e8ab6e442e..b484908050 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java
@@ -16,28 +16,27 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.shuttle;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author UnAfraid
*/
-public class RequestShuttleGetOff implements IClientIncomingPacket
+public class RequestShuttleGetOff implements ClientPacket
{
private int _x;
private int _y;
private int _z;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readD(); // charId
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- return true;
+ packet.readInt(); // charId
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java
index 41648f184f..830dd8d01e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java
@@ -16,31 +16,30 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.shuttle;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Shuttle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author UnAfraid
*/
-public class RequestShuttleGetOn implements IClientIncomingPacket
+public class RequestShuttleGetOn implements ClientPacket
{
private int _x;
private int _y;
private int _z;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readD(); // charId
- _x = packet.readD();
- _y = packet.readD();
- _z = packet.readD();
- return true;
+ packet.readInt(); // charId
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExResetStatusBonus.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExResetStatusBonus.java
index 550fd6e761..58fdf3b308 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExResetStatusBonus.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExResetStatusBonus.java
@@ -18,25 +18,18 @@ package org.l2jmobius.gameserver.network.clientpackets.stats;
import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.LCOIN_ID;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount;
/**
* @author Mobius
*/
-public class ExResetStatusBonus implements IClientIncomingPacket
+public class ExResetStatusBonus implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExSetStatusBonus.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExSetStatusBonus.java
index fa984e808b..01b01bfb93 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExSetStatusBonus.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/stats/ExSetStatusBonus.java
@@ -16,17 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.stats;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
* @author Mobius
*/
-public class ExSetStatusBonus implements IClientIncomingPacket
+public class ExSetStatusBonus implements ClientPacket
{
private int _str;
private int _dex;
@@ -36,17 +36,16 @@ public class ExSetStatusBonus implements IClientIncomingPacket
private int _men;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- packet.readH(); // unk
- packet.readH(); // totalBonus
- _str = packet.readH();
- _dex = packet.readH();
- _con = packet.readH();
- _int = packet.readH();
- _wit = packet.readH();
- _men = packet.readH();
- return true;
+ packet.readShort(); // unk
+ packet.readShort(); // totalBonus
+ _str = packet.readShort();
+ _dex = packet.readShort();
+ _con = packet.readShort();
+ _int = packet.readShort();
+ _wit = packet.readShort();
+ _men = packet.readShort();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
index 13178519c7..39ee21e7dd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
@@ -20,30 +20,29 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.SubjugationGacha;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.PurgePlayerHolder;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.subjugation.ExSubjugationGacha;
import org.l2jmobius.gameserver.network.serverpackets.subjugation.ExSubjugationGachaUI;
/**
- * Written by Berezkin Nikolay, on 15.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestSubjugationGacha implements IClientIncomingPacket
+public class RequestSubjugationGacha implements ClientPacket
{
private int _category;
private int _amount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _category = packet.readD();
- _amount = packet.readD();
- return true;
+ _category = packet.readInt();
+ _amount = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGachaUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGachaUI.java
index 802c3ec7d9..d42f01f04c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGachaUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGachaUI.java
@@ -16,25 +16,24 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.subjugation;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.PurgePlayerHolder;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.subjugation.ExSubjugationGachaUI;
/**
- * Written by Berezkin Nikolay, on 15.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestSubjugationGachaUI implements IClientIncomingPacket
+public class RequestSubjugationGachaUI implements ClientPacket
{
private int _category;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _category = packet.readC();
- return true;
+ _category = packet.readByte();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationList.java
index eb16f26400..d39a7c945d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationList.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.subjugation;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.subjugation.ExSubjugationList;
/**
- * Written by Berezkin Nikolay, on 13.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestSubjugationList implements IClientIncomingPacket
+public class RequestSubjugationList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationRanking.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationRanking.java
index d431f2d19b..2bb16901c8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationRanking.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationRanking.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.subjugation;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.subjugation.ExSubjugationRanking;
/**
- * Written by Berezkin Nikolay, on 13.04.2021
+ * @author Berezkin Nikolay
*/
-public class RequestSubjugationRanking implements IClientIncomingPacket
+public class RequestSubjugationRanking implements ClientPacket
{
private int _rankingCategory;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _rankingCategory = packet.readD();
- return true;
+ _rankingCategory = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleport.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleport.java
index 03fe76a356..f8357ade7a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleport.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleport.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.teleports;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.SharedTeleportManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SharedTeleportHolder;
@@ -25,20 +25,19 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author NasSeKa
*/
-public class ExRequestSharedLocationTeleport implements IClientIncomingPacket
+public class ExRequestSharedLocationTeleport implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = (packet.readD() - 1) / 256;
- return true;
+ _id = (packet.readInt() - 1) / 256;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleportUi.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleportUi.java
index 0dafb1d17c..7e39cf47a1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleportUi.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharedLocationTeleportUi.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.teleports;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.SharedTeleportManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SharedTeleportHolder;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.teleports.ExShowSharedLocationTeleportUi;
/**
* @author NasSeKa
*/
-public class ExRequestSharedLocationTeleportUi implements IClientIncomingPacket
+public class ExRequestSharedLocationTeleportUi implements ClientPacket
{
private int _id;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _id = (packet.readD() - 1) / 256;
- return true;
+ _id = (packet.readInt() - 1) / 256;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharingLocationUi.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharingLocationUi.java
index b5d87570c9..d145c4aa23 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharingLocationUi.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestSharingLocationUi.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.teleports;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.teleports.ExShowSharingLocationUi;
/**
* @author GustavoFonseca
*/
-public class ExRequestSharingLocationUi implements IClientIncomingPacket
+public class ExRequestSharingLocationUi implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java
index 008bae692d..353d8b0d83 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.teleports;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.TeleportListData;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.Location;
@@ -31,20 +31,19 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author NviX, Mobius
*/
-public class ExRequestTeleport implements IClientIncomingPacket
+public class ExRequestTeleport implements ClientPacket
{
private int _teleportId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _teleportId = packet.readD();
- return true;
+ _teleportId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoriteList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoriteList.java
index 7e68a0907f..333b133d2e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoriteList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoriteList.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.teleports;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.teleports.ExTeleportFavoritesList;
/**
* @author Mobius
*/
-public class ExRequestTeleportFavoriteList implements IClientIncomingPacket
+public class ExRequestTeleportFavoriteList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java
index 50f4b4d87d..aef9e0afe8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java
@@ -19,28 +19,27 @@ package org.l2jmobius.gameserver.network.clientpackets.teleports;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.TeleportListData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
/**
* @author Mobius
*/
-public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket
+public class ExRequestTeleportFavoritesAddDel implements ClientPacket
{
private boolean _enable;
private int _teleportId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _enable = packet.readC() == 1;
- _teleportId = packet.readD();
- return true;
+ _enable = packet.readByte() == 1;
+ _teleportId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesUIToggle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesUIToggle.java
index a2b811c6e1..b0aac8eaf3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesUIToggle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesUIToggle.java
@@ -16,24 +16,23 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.teleports;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.teleports.ExTeleportFavoritesList;
/**
* @author Mobius
*/
-public class ExRequestTeleportFavoritesUIToggle implements IClientIncomingPacket
+public class ExRequestTeleportFavoritesUIToggle implements ClientPacket
{
private boolean _enable;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _enable = packet.readC() == 1;
- return true;
+ _enable = packet.readByte() == 1;
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index b57395d18d..bedc8fef71 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.teleports;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.data.xml.NpcData;
import org.l2jmobius.gameserver.data.xml.RaidTeleportListData;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
@@ -36,21 +36,20 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.teleports.ExRaidTeleportInfo;
/**
* @author Gustavo Fonseca
*/
-public class ExTeleportToRaidPosition implements IClientIncomingPacket
+public class ExTeleportToRaidPosition implements ClientPacket
{
private int _raidId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _raidId = packet.readD();
- return true;
+ _raidId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
index bbd52aa6c0..f2b8b9bc3e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
@@ -16,23 +16,16 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.teleports;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.teleports.ExRaidTeleportInfo;
/**
* @author Gustavo Fonseca
*/
-public class RequestRaidTeleportInfo implements IClientIncomingPacket
+public class RequestRaidTeleportInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
index a79feced31..984e26be6e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
@@ -16,25 +16,17 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.training;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.TrainingHolder;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.training.ExTrainingZone_Leaving;
/**
* @author Sdw
*/
-public class NotifyTrainingRoomEnd implements IClientIncomingPacket
+public class NotifyTrainingRoomEnd implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- // Nothing to read
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/ExRequestVipInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/ExRequestVipInfo.java
index 2fb7f915e8..3543eb4721 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/ExRequestVipInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/ExRequestVipInfo.java
@@ -16,19 +16,12 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.vip;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipInfo;
-public class ExRequestVipInfo implements IClientIncomingPacket
+public class ExRequestVipInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index 8cb6a581bc..50234dd64c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -16,20 +16,13 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.vip;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
-public class RequestVipLuckGameInfo implements IClientIncomingPacket
+public class RequestVipLuckGameInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index e4dda29d67..b6b7f2d834 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
@@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game;
import java.util.List;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
-public class AuthRequest extends BaseSendablePacket
+public class AuthRequest extends WritablePacket
{
/**
* Format: cccSddb c desired ID c accept alternative ID c reserve Host s ExternalHostName s InetranlHostName d max players d hexid size b hexid
@@ -35,25 +35,19 @@ public class AuthRequest extends BaseSendablePacket
*/
public AuthRequest(int id, boolean acceptAlternate, byte[] hexid, int port, boolean reserveHost, int maxplayer, List subnets, List hosts)
{
- writeC(0x01);
- writeC(id);
- writeC(acceptAlternate ? 0x01 : 0x00);
- writeC(reserveHost ? 0x01 : 0x00);
- writeH(port);
- writeD(maxplayer);
- writeD(hexid.length);
- writeB(hexid);
- writeD(subnets.size());
+ writeByte(0x01);
+ writeByte(id);
+ writeByte(acceptAlternate ? 0x01 : 0x00);
+ writeByte(reserveHost ? 0x01 : 0x00);
+ writeShort(port);
+ writeInt(maxplayer);
+ writeInt(hexid.length);
+ writeBytes(hexid);
+ writeInt(subnets.size());
for (int i = 0; i < subnets.size(); i++)
{
- writeS(subnets.get(i));
- writeS(hosts.get(i));
+ writeString(subnets.get(i));
+ writeString(hosts.get(i));
}
}
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
- }
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index f90adbc231..91de33ca1e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
@@ -22,12 +22,12 @@ import java.util.logging.Logger;
import javax.crypto.Cipher;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class BlowFishKey extends BaseSendablePacket
+public class BlowFishKey extends WritablePacket
{
private static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName());
@@ -37,24 +37,18 @@ public class BlowFishKey extends BaseSendablePacket
*/
public BlowFishKey(byte[] blowfishKey, RSAPublicKey publicKey)
{
- writeC(0x00);
+ writeByte(0x00);
try
{
final Cipher rsaCipher = Cipher.getInstance("RSA/ECB/nopadding");
rsaCipher.init(Cipher.ENCRYPT_MODE, publicKey);
final byte[] encrypted = rsaCipher.doFinal(blowfishKey);
- writeD(encrypted.length);
- writeB(encrypted);
+ writeInt(encrypted.length);
+ writeBytes(encrypted);
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e);
}
}
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 2831581ca8..184aca2cf2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
@@ -16,23 +16,17 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.game;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class ChangeAccessLevel extends BaseSendablePacket
+public class ChangeAccessLevel extends WritablePacket
{
public ChangeAccessLevel(String player, int access)
{
- writeC(0x04);
- writeD(access);
- writeS(player);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x04);
+ writeInt(access);
+ writeString(player);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 39726f3209..96785816a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
@@ -16,25 +16,19 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.game;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author UnAfraid
*/
-public class ChangePassword extends BaseSendablePacket
+public class ChangePassword extends WritablePacket
{
public ChangePassword(String accountName, String characterName, String oldPass, String newPass)
{
- writeC(0x0B);
- writeS(accountName);
- writeS(characterName);
- writeS(oldPass);
- writeS(newPass);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x0B);
+ writeString(accountName);
+ writeString(characterName);
+ writeString(oldPass);
+ writeString(newPass);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index eabe8e4cc8..4503a57d81 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
@@ -16,27 +16,21 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.game;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
/**
* @author -Wooden-
*/
-public class PlayerAuthRequest extends BaseSendablePacket
+public class PlayerAuthRequest extends WritablePacket
{
public PlayerAuthRequest(String account, SessionKey key)
{
- writeC(0x05);
- writeS(account);
- writeD(key.playOkID1);
- writeD(key.playOkID2);
- writeD(key.loginOkID1);
- writeD(key.loginOkID2);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x05);
+ writeString(account);
+ writeInt(key.playOkID1);
+ writeInt(key.playOkID2);
+ writeInt(key.loginOkID1);
+ writeInt(key.loginOkID2);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 43ac28c2fd..2489ee6cd0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
@@ -18,33 +18,27 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game;
import java.util.List;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class PlayerInGame extends BaseSendablePacket
+public class PlayerInGame extends WritablePacket
{
public PlayerInGame(String player)
{
- writeC(0x02);
- writeH(1);
- writeS(player);
+ writeByte(0x02);
+ writeShort(1);
+ writeString(player);
}
public PlayerInGame(List players)
{
- writeC(0x02);
- writeH(players.size());
- for (String pc : players)
+ writeByte(0x02);
+ writeShort(players.size());
+ for (String player : players)
{
- writeS(pc);
+ writeString(player);
}
}
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
- }
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index aabd12fa73..2cbdf7ab9d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
@@ -16,22 +16,16 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.game;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class PlayerLogout extends BaseSendablePacket
+public class PlayerLogout extends WritablePacket
{
public PlayerLogout(String player)
{
- writeC(0x03);
- writeS(player);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x03);
+ writeString(player);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index 90385d6714..9e3d781aea 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
@@ -16,27 +16,21 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.game;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author mrTJO
*/
-public class PlayerTracert extends BaseSendablePacket
+public class PlayerTracert extends WritablePacket
{
public PlayerTracert(String account, String pcIp, String hop1, String hop2, String hop3, String hop4)
{
- writeC(0x07);
- writeS(account);
- writeS(pcIp);
- writeS(hop1);
- writeS(hop2);
- writeS(hop3);
- writeS(hop4);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x07);
+ writeString(account);
+ writeString(pcIp);
+ writeString(hop1);
+ writeString(hop2);
+ writeString(hop3);
+ writeString(hop4);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 187b69692d..d83b8ced5e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
@@ -18,28 +18,22 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game;
import java.util.List;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author mrTJO Thanks to mochitto
*/
-public class ReplyCharacters extends BaseSendablePacket
+public class ReplyCharacters extends WritablePacket
{
public ReplyCharacters(String account, int chars, List timeToDel)
{
- writeC(0x08);
- writeS(account);
- writeC(chars);
- writeC(timeToDel.size());
+ writeByte(0x08);
+ writeString(account);
+ writeByte(chars);
+ writeByte(timeToDel.size());
for (long time : timeToDel)
{
- writeQ(time);
+ writeLong(time);
}
}
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index fcec3c1d57..1d097f6864 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
@@ -16,28 +16,22 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.game;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author mrTJO
*/
-public class SendMail extends BaseSendablePacket
+public class SendMail extends WritablePacket
{
public SendMail(String accountName, String mailId, String... args)
{
- writeC(0x09);
- writeS(accountName);
- writeS(mailId);
- writeC(args.length);
+ writeByte(0x09);
+ writeString(accountName);
+ writeString(mailId);
+ writeByte(args.length);
for (String arg : args)
{
- writeS(arg);
+ writeString(arg);
}
}
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index b836d3f9d1..19095b07ec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
@@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class ServerStatus extends BaseSendablePacket
+public class ServerStatus extends WritablePacket
{
private final List _attributes;
@@ -92,15 +92,14 @@ public class ServerStatus extends BaseSendablePacket
}
@Override
- public byte[] getContent()
+ public void write()
{
- writeC(0x06);
- writeD(_attributes.size());
+ writeByte(0x06);
+ writeInt(_attributes.size());
for (Attribute temp : _attributes)
{
- writeD(temp.id);
- writeD(temp.value);
+ writeInt(temp.id);
+ writeInt(temp.value);
}
- return getBytes();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index ee1c787150..1ecda57e91 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
@@ -16,33 +16,27 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.game;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author mrTJO
*/
-public class TempBan extends BaseSendablePacket
+public class TempBan extends WritablePacket
{
public TempBan(String accountName, String ip, long time)
{
- writeC(0x0A);
- writeS(accountName);
- writeS(ip);
- writeQ(System.currentTimeMillis() + (time * 60000));
+ writeByte(0x0A);
+ writeString(accountName);
+ writeString(ip);
+ writeLong(System.currentTimeMillis() + (time * 60000));
// if (reason != null)
// {
- // writeC(0x01);
- // writeS(reason);
+ // writeByte(0x01);
+ // writeString(reason);
// }
// else
// {
- writeC(0x00);
+ writeByte(0x00);
// }
}
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index 63ff77197d..c8c7da8488 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
@@ -16,12 +16,12 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.login;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
/**
* @author -Wooden-
*/
-public class AuthResponse extends BaseRecievePacket
+public class AuthResponse extends ReadablePacket
{
private final int _serverId;
private final String _serverName;
@@ -32,8 +32,10 @@ public class AuthResponse extends BaseRecievePacket
public AuthResponse(byte[] decrypt)
{
super(decrypt);
- _serverId = readC();
- _serverName = readS();
+ readByte(); // id (already processed)
+
+ _serverId = readByte();
+ _serverName = readString();
}
/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 0921f6fa49..5ef05a94e4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
@@ -16,18 +16,20 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.login;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
-public class ChangePasswordResponse extends BaseRecievePacket
+public class ChangePasswordResponse extends ReadablePacket
{
public ChangePasswordResponse(byte[] decrypt)
{
super(decrypt);
- // boolean isSuccessful = readC() > 0;
- final String character = readS();
- final String msgToSend = readS();
+ readByte(); // id (already processed)
+
+ // boolean isSuccessful = readByte() > 0;
+ final String character = readString();
+ final String msgToSend = readString();
final Player player = World.getInstance().getPlayer(character);
if (player != null)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index dfe5405046..9256c2f4c5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
@@ -16,9 +16,9 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.login;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
-public class InitLS extends BaseRecievePacket
+public class InitLS extends ReadablePacket
{
private final int _rev;
private final byte[] _key;
@@ -39,8 +39,10 @@ public class InitLS extends BaseRecievePacket
public InitLS(byte[] decrypt)
{
super(decrypt);
- _rev = readD();
- final int size = readD();
- _key = readB(size);
+ readByte(); // id (already processed)
+
+ _rev = readInt();
+ final int size = readInt();
+ _key = readBytes(size);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 0143bbe1ca..3656ace43d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
@@ -16,9 +16,9 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.login;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
-public class KickPlayer extends BaseRecievePacket
+public class KickPlayer extends ReadablePacket
{
private final String _account;
@@ -28,7 +28,9 @@ public class KickPlayer extends BaseRecievePacket
public KickPlayer(byte[] decrypt)
{
super(decrypt);
- _account = readS();
+ readByte(); // id (already processed)
+
+ _account = readString();
}
/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 0ab730e66c..54753910c5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
@@ -16,9 +16,9 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.login;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
-public class LoginServerFail extends BaseRecievePacket
+public class LoginServerFail extends ReadablePacket
{
private static final String[] REASONS =
{
@@ -39,7 +39,9 @@ public class LoginServerFail extends BaseRecievePacket
public LoginServerFail(byte[] decrypt)
{
super(decrypt);
- _reason = readC();
+ readByte(); // id (already processed)
+
+ _reason = readByte();
}
public String getReasonString()
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 08d979c746..ef9d9d8b4f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
@@ -16,12 +16,12 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.login;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
/**
* @author -Wooden-
*/
-public class PlayerAuthResponse extends BaseRecievePacket
+public class PlayerAuthResponse extends ReadablePacket
{
private final String _account;
private final boolean _authed;
@@ -32,9 +32,10 @@ public class PlayerAuthResponse extends BaseRecievePacket
public PlayerAuthResponse(byte[] decrypt)
{
super(decrypt);
+ readByte(); // id (already processed)
- _account = readS();
- _authed = readC() != 0;
+ _account = readString();
+ _authed = readByte() != 0;
}
/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index c096edd6dd..b752a712ce 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
@@ -16,19 +16,21 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets.login;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
/**
* @author mrTJO Thanks to mochitto
*/
-public class RequestCharacters extends BaseRecievePacket
+public class RequestCharacters extends ReadablePacket
{
private final String _account;
public RequestCharacters(byte[] decrypt)
{
super(decrypt);
- _account = readS();
+ readByte(); // id (already processed)
+
+ _account = readString();
}
/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
index 033095e74d..54cf95f05f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
@@ -19,11 +19,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class AbnormalStatusUpdate implements IClientOutgoingPacket
+public class AbnormalStatusUpdate extends ServerPacket
{
private final List _effects = new ArrayList<>();
@@ -36,21 +35,20 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet);
- packet.writeH(_effects.size());
+ ServerPackets.ABNORMAL_STATUS_UPDATE.writeId(this);
+ writeShort(_effects.size());
for (BuffInfo info : _effects)
{
if ((info != null) && info.isInUse())
{
- packet.writeD(info.getSkill().getDisplayId());
- packet.writeH(info.getSkill().getDisplayLevel());
- // packet.writeH(info.getSkill().getSubLevel());
- packet.writeD(info.getSkill().getAbnormalType().getClientId());
- writeOptionalD(packet, info.getSkill().isAura() || info.getSkill().isToggle() ? -1 : info.getTime());
+ writeInt(info.getSkill().getDisplayId());
+ writeShort(info.getSkill().getDisplayLevel());
+ // writeShort(info.getSkill().getSubLevel());
+ writeInt(info.getSkill().getAbnormalType().getClientId());
+ writeOptionalInt(info.getSkill().isAura() || info.getSkill().isToggle() ? -1 : info.getTime());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index bec794bef3..21e379f20e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @author HorridoJoho
*/
-public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
+public abstract class AbstractHtmlPacket extends ServerPacket
{
public static final char VAR_PARAM_START_CHAR = '$';
@@ -35,11 +35,13 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
protected AbstractHtmlPacket()
{
+ super(1024);
_npcObjId = 0;
}
protected AbstractHtmlPacket(int npcObjId)
{
+ super(1024);
if (npcObjId < 0)
{
throw new IllegalArgumentException();
@@ -49,12 +51,14 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
protected AbstractHtmlPacket(String html)
{
+ super(1024);
_npcObjId = 0;
setHtml(html);
}
protected AbstractHtmlPacket(int npcObjId, String html)
{
+ super(1024);
if (npcObjId < 0)
{
throw new IllegalArgumentException();
@@ -127,7 +131,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
}
@Override
- public void runImpl(Player player)
+ public void run(Player player)
{
if (player != null)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java
index af8b12547e..be2ec8b163 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -82,15 +81,15 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket
return _items.values();
}
- protected final void writeItems(PacketWriter packet)
+ protected void writeItems()
{
- packet.writeC(0); // 140
- packet.writeD(0); // 140
- packet.writeD(_items.size()); // 140
+ writeByte(0); // 140
+ writeInt(0); // 140
+ writeInt(_items.size()); // 140
for (ItemInfo item : _items.values())
{
- packet.writeH(item.getChange()); // Update type : 01-add, 02-modify, 03-remove
- writeItem(packet, item);
+ writeShort(item.getChange()); // Update type : 01-add, 02-modify, 03-remove
+ writeItem(item);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index e70fd93427..bcac36a7ca 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.PetDataTable;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.enums.ItemListType;
@@ -44,136 +43,136 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket
*/
-public abstract class AbstractMaskPacket implements IClientOutgoingPacket
+public abstract class AbstractMaskPacketextends ServerPacket
{
protected static final byte[] DEFAULT_FLAG_ARRAY =
{
@@ -36,6 +36,11 @@ public abstract class AbstractMaskPacket impleme
0x01
};
+ protected AbstractMaskPacket()
+ {
+ super(256);
+ }
+
protected abstract byte[] getMasks();
protected void onNewMaskAdded(T component)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
index 58b98d224c..7a584ee05a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Kerberos
*/
-public class AcquireSkillDone implements IClientOutgoingPacket
+public class AcquireSkillDone extends ServerPacket
{
public AcquireSkillDone()
{
@@ -30,9 +29,8 @@ public class AcquireSkillDone implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ACQUIRE_SKILL_DONE.writeId(packet);
- return true;
+ ServerPackets.ACQUIRE_SKILL_DONE.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
index 4c11aa3c7b..692a390b1c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
@@ -20,18 +20,17 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.AcquireSkillType;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.skill.CommonSkill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Acquire Skill Info server packet implementation.
* @author Zoey76
*/
-public class AcquireSkillInfo implements IClientOutgoingPacket
+public class AcquireSkillInfo extends ServerPacket
{
private final AcquireSkillType _type;
private final int _id;
@@ -110,21 +109,20 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ACQUIRE_SKILL_INFO.writeId(packet);
- packet.writeD(_id);
- packet.writeD(_level);
- packet.writeQ(_spCost);
- packet.writeD(_type.getId());
- packet.writeD(_reqs.size());
+ ServerPackets.ACQUIRE_SKILL_INFO.writeId(this);
+ writeInt(_id);
+ writeInt(_level);
+ writeLong(_spCost);
+ writeInt(_type.getId());
+ writeInt(_reqs.size());
for (Req temp : _reqs)
{
- packet.writeD(temp.type);
- packet.writeD(temp.itemId);
- packet.writeQ(temp.count);
- packet.writeD(temp.unk);
+ writeInt(temp.type);
+ writeInt(temp.itemId);
+ writeLong(temp.count);
+ writeInt(temp.unk);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
index 45dabbde1a..e926af84c7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
@@ -21,24 +21,25 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw, Mobius
*/
-public class AcquireSkillList implements IClientOutgoingPacket
+public class AcquireSkillList extends ServerPacket
{
private Player _player;
private Collection _learnable;
public AcquireSkillList(Player player)
{
+ super(512);
+
if (!player.isSubclassLocked()) // Changing class.
{
_player = player;
@@ -48,39 +49,38 @@ public class AcquireSkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_player == null)
{
- return false;
+ return;
}
- OutgoingPackets.ACQUIRE_SKILL_LIST.writeId(packet);
- packet.writeH(_learnable.size());
+ ServerPackets.ACQUIRE_SKILL_LIST.writeId(this);
+ writeShort(_learnable.size());
for (SkillLearn skill : _learnable)
{
- packet.writeD(skill.getSkillId());
- packet.writeH(skill.getSkillLevel()); // Main writeD, Essence writeH.
- packet.writeQ(skill.getLevelUpSp());
- packet.writeC(skill.getGetLevel());
- packet.writeC(0); // Skill dual class level.
- packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0 : 1);
+ writeInt(skill.getSkillId());
+ writeShort(skill.getSkillLevel()); // Main writeD, Essence writeH.
+ writeLong(skill.getLevelUpSp());
+ writeByte(skill.getGetLevel());
+ writeByte(0); // Skill dual class level.
+ writeByte(_player.getKnownSkill(skill.getSkillId()) == null);
- packet.writeC(skill.getRequiredItems().size());
+ writeByte(skill.getRequiredItems().size());
for (List item : skill.getRequiredItems())
{
- packet.writeD(item.get(0).getId());
- packet.writeQ(item.get(0).getCount());
+ writeInt(item.get(0).getId());
+ writeLong(item.get(0).getCount());
}
final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList());
- packet.writeC(removeSkills.size());
+ writeByte(removeSkills.size());
for (Skill removed : removeSkills)
{
- packet.writeD(removed.getId());
- packet.writeH(removed.getLevel()); // Main writeD, Essence writeH.
+ writeInt(removed.getId());
+ writeShort(removed.getLevel()); // Main writeD, Essence writeH.
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
index 6451dffd02..b0493eb641 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
@@ -19,11 +19,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.EnumMap;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.skill.SkillCastingType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ActionFailed implements IClientOutgoingPacket
+public class ActionFailed extends ServerPacket
{
public static final ActionFailed STATIC_PACKET = new ActionFailed();
@@ -54,10 +53,9 @@ public class ActionFailed implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ACTION_FAIL.writeId(packet);
- packet.writeD(_castingType); // MagicSkillUse castingType
- return true;
+ ServerPackets.ACTION_FAIL.writeId(this);
+ writeInt(_castingType); // MagicSkillUse castingType
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AdminForgePacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AdminForgePacket.java
index f36db6500b..b5a2af56a0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AdminForgePacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AdminForgePacket.java
@@ -20,13 +20,11 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
-
/**
* This class is made to create packets with any format
* @author Maktakien
*/
-public class AdminForgePacket implements IClientOutgoingPacket
+public class AdminForgePacket extends ServerPacket
{
private final List _parts = new ArrayList<>();
@@ -43,56 +41,54 @@ public class AdminForgePacket implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
for (Part p : _parts)
{
- generate(packet, p.b, p.str);
+ generate(p.b, p.str);
}
- return true;
}
/**
- * @param packet
* @param type
* @param value
* @return
*/
- public boolean generate(PacketWriter packet, byte type, String value)
+ public boolean generate(byte type, String value)
{
if ((type == 'C') || (type == 'c'))
{
- packet.writeC(Integer.decode(value));
+ writeByte(Integer.decode(value));
return true;
}
else if ((type == 'D') || (type == 'd'))
{
- packet.writeD(Integer.decode(value));
+ writeInt(Integer.decode(value));
return true;
}
else if ((type == 'H') || (type == 'h'))
{
- packet.writeH(Integer.decode(value));
+ writeShort(Integer.decode(value));
return true;
}
else if ((type == 'F') || (type == 'f'))
{
- packet.writeF(Double.parseDouble(value));
+ writeDouble(Double.parseDouble(value));
return true;
}
else if ((type == 'S') || (type == 's'))
{
- packet.writeS(value);
+ writeString(value);
return true;
}
else if ((type == 'B') || (type == 'b') || (type == 'X') || (type == 'x'))
{
- packet.writeB(new BigInteger(value).toByteArray());
+ writeBytes(new BigInteger(value).toByteArray());
return true;
}
else if ((type == 'Q') || (type == 'q'))
{
- packet.writeQ(Long.decode(value));
+ writeLong(Long.decode(value));
return true;
}
return false;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
index 6919f6913e..8b69beca91 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ClanHallGrade;
import org.l2jmobius.gameserver.model.residences.AbstractResidence;
import org.l2jmobius.gameserver.model.residences.ResidenceFunction;
import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Steuf
*/
-public class AgitDecoInfo implements IClientOutgoingPacket
+public class AgitDecoInfo extends ServerPacket
{
private final AbstractResidence _residense;
@@ -36,155 +35,154 @@ public class AgitDecoInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.AGIT_DECO_INFO.writeId(packet);
- packet.writeD(_residense.getResidenceId());
+ ServerPackets.AGIT_DECO_INFO.writeId(this);
+ writeInt(_residense.getResidenceId());
// Fireplace
ResidenceFunction function = _residense.getFunction(ResidenceFunctionType.HP_REGEN);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_residense.getGrade() == ClanHallGrade.GRADE_NONE) && (function.getLevel() < 2)) || ((_residense.getGrade() == ClanHallGrade.GRADE_D) && (function.getLevel() < 3)) || ((_residense.getGrade() == ClanHallGrade.GRADE_C) && (function.getLevel() < 4)) || ((_residense.getGrade() == ClanHallGrade.GRADE_B) && (function.getLevel() < 5)))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Carpet - Statue
function = _residense.getFunction(ResidenceFunctionType.MP_REGEN);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
- packet.writeC(0);
+ writeByte(0);
+ writeByte(0);
}
else if ((((_residense.getGrade() == ClanHallGrade.GRADE_NONE) || (_residense.getGrade() == ClanHallGrade.GRADE_D)) && (function.getLevel() < 2)) || ((_residense.getGrade() == ClanHallGrade.GRADE_C) && (function.getLevel() < 3)) || ((_residense.getGrade() == ClanHallGrade.GRADE_B) && (function.getLevel() < 4)))
{
- packet.writeC(1);
- packet.writeC(1);
+ writeByte(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
- packet.writeC(2);
+ writeByte(2);
+ writeByte(2);
}
// Chandelier
function = _residense.getFunction(ResidenceFunctionType.EXP_RESTORE);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (function.getLevel() < 2)
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Mirror
function = _residense.getFunction(ResidenceFunctionType.TELEPORT);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (function.getLevel() < 2)
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Crystal
- packet.writeC(0);
+ writeByte(0);
// Curtain
function = _residense.getFunction(ResidenceFunctionType.CURTAIN);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (function.getLevel() < 2)
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Magic Curtain
function = _residense.getFunction(ResidenceFunctionType.ITEM);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_residense.getGrade() == ClanHallGrade.GRADE_NONE) && (function.getLevel() < 2)) || (function.getLevel() < 3))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Support
function = _residense.getFunction(ResidenceFunctionType.BUFF);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_residense.getGrade() == ClanHallGrade.GRADE_NONE) && (function.getLevel() < 2)) || ((_residense.getGrade() == ClanHallGrade.GRADE_D) && (function.getLevel() < 4)) || ((_residense.getGrade() == ClanHallGrade.GRADE_C) && (function.getLevel() < 5)) || ((_residense.getGrade() == ClanHallGrade.GRADE_B) && (function.getLevel() < 8)))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Flag
function = _residense.getFunction(ResidenceFunctionType.OUTERFLAG);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (function.getLevel() < 2)
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Front platform
function = _residense.getFunction(ResidenceFunctionType.PLATFORM);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (function.getLevel() < 2)
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Item create?
function = _residense.getFunction(ResidenceFunctionType.ITEM);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_residense.getGrade() == ClanHallGrade.GRADE_NONE) && (function.getLevel() < 2)) || (function.getLevel() < 3))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
index 4683fb30f0..5331ed5dfe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
@@ -18,18 +18,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.clientpackets.RequestAllyInfo;
/**
* Sent in response to {@link RequestAllyInfo}, if applicable.
* @author afk5min
*/
-public class AllianceInfo implements IClientOutgoingPacket
+public class AllianceInfo extends ServerPacket
{
private final String _name;
private final int _total;
@@ -61,25 +60,24 @@ public class AllianceInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ALLIANCE_INFO.writeId(packet);
- packet.writeS(_name);
- packet.writeD(_total);
- packet.writeD(_online);
- packet.writeS(_leaderC);
- packet.writeS(_leaderP);
- packet.writeD(_allies.length);
+ ServerPackets.ALLIANCE_INFO.writeId(this);
+ writeString(_name);
+ writeInt(_total);
+ writeInt(_online);
+ writeString(_leaderC);
+ writeString(_leaderP);
+ writeInt(_allies.length);
for (ClanInfo aci : _allies)
{
- packet.writeS(aci.getClan().getName());
- packet.writeD(0);
- packet.writeD(aci.getClan().getLevel());
- packet.writeS(aci.getClan().getLeaderName());
- packet.writeD(aci.getTotal());
- packet.writeD(aci.getOnline());
+ writeString(aci.getClan().getName());
+ writeInt(0);
+ writeInt(aci.getClan().getLevel());
+ writeString(aci.getClan().getLeaderName());
+ writeInt(aci.getTotal());
+ writeInt(aci.getOnline());
}
- return true;
}
public String getName()
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
index 186fd12e81..79cbf71e81 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
@@ -17,12 +17,11 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.model.Crest;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class AllyCrest implements IClientOutgoingPacket
+public class AllyCrest extends ServerPacket
{
private final int _crestId;
private final byte[] _data;
@@ -41,20 +40,19 @@ public class AllyCrest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ALLIANCE_CREST.writeId(packet);
- packet.writeD(Config.SERVER_ID);
- packet.writeD(_crestId);
+ ServerPackets.ALLIANCE_CREST.writeId(this);
+ writeInt(Config.SERVER_ID);
+ writeInt(_crestId);
if (_data != null)
{
- packet.writeD(_data.length);
- packet.writeB(_data);
+ writeInt(_data.length);
+ writeBytes(_data);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
index 1ae4653f91..27df7c79a5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class AskJoinAlly implements IClientOutgoingPacket
+public class AskJoinAlly extends ServerPacket
{
private final String _requestorName;
private final int _requestorObjId;
@@ -35,13 +34,12 @@ public class AskJoinAlly implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet);
- packet.writeD(_requestorObjId);
- packet.writeS(null); // Ally Name ?
- packet.writeS(null); // TODO: Find me!
- packet.writeS(_requestorName);
- return true;
+ ServerPackets.ASK_JOIN_ALLIANCE.writeId(this);
+ writeInt(_requestorObjId);
+ writeString(null); // Ally Name ?
+ writeString(null); // TODO: Find me!
+ writeString(_requestorName);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
index b9cfbe81b9..7f4589edbb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.PartyDistributionType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class AskJoinParty implements IClientOutgoingPacket
+public class AskJoinParty extends ServerPacket
{
private final String _requestorName;
private final PartyDistributionType _partyDistributionType;
@@ -36,11 +35,10 @@ public class AskJoinParty implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ASK_JOIN_PARTY.writeId(packet);
- packet.writeS(_requestorName);
- packet.writeD(_partyDistributionType.getId());
- return true;
+ ServerPackets.ASK_JOIN_PARTY.writeId(this);
+ writeString(_requestorName);
+ writeInt(_partyDistributionType.getId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
index c5f848f92d..4d0445db34 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class AskJoinPledge implements IClientOutgoingPacket
+public class AskJoinPledge extends ServerPacket
{
private final Player _requestor;
private final int _pledgeType;
@@ -34,16 +33,15 @@ public class AskJoinPledge implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ASK_JOIN_PLEDGE.writeId(packet);
- packet.writeD(_requestor.getObjectId());
- packet.writeS(_requestor.getName());
- packet.writeS(_pledgeName);
+ ServerPackets.ASK_JOIN_PLEDGE.writeId(this);
+ writeInt(_requestor.getObjectId());
+ writeString(_requestor.getName());
+ writeString(_pledgeName);
if (_pledgeType != 0)
{
- packet.writeD(_pledgeType);
+ writeInt(_pledgeType);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java
index 227ab571be..cea7ac16c8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java
@@ -20,15 +20,14 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.BroochJewel;
import org.l2jmobius.gameserver.model.Hit;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class Attack implements IClientOutgoingPacket
+public class Attack extends ServerPacket
{
private final int _attackerObjId;
private final Location _attackerLoc;
@@ -93,40 +92,38 @@ public class Attack implements IClientOutgoingPacket
/**
* Writes current hit
- * @param packet
* @param hit
*/
- private void writeHit(PacketWriter packet, Hit hit)
+ private void writeHit(Hit hit)
{
- packet.writeD(hit.getTargetId());
- packet.writeD(hit.getDamage());
- packet.writeD(hit.getFlags());
- packet.writeD(hit.getGrade()); // GOD
+ writeInt(hit.getTargetId());
+ writeInt(hit.getDamage());
+ writeInt(hit.getFlags());
+ writeInt(hit.getGrade()); // GOD
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final Iterator it = _hits.iterator();
final Hit firstHit = it.next();
- OutgoingPackets.ATTACK.writeId(packet);
- packet.writeD(_attackerObjId);
- packet.writeD(firstHit.getTargetId());
- packet.writeD(_soulshotVisualSubstitute); // Ertheia
- packet.writeD(firstHit.getDamage());
- packet.writeD(firstHit.getFlags());
- packet.writeD(firstHit.getGrade()); // GOD
- packet.writeD(_attackerLoc.getX());
- packet.writeD(_attackerLoc.getY());
- packet.writeD(_attackerLoc.getZ());
- packet.writeH(_hits.size() - 1);
+ ServerPackets.ATTACK.writeId(this);
+ writeInt(_attackerObjId);
+ writeInt(firstHit.getTargetId());
+ writeInt(_soulshotVisualSubstitute); // Ertheia
+ writeInt(firstHit.getDamage());
+ writeInt(firstHit.getFlags());
+ writeInt(firstHit.getGrade()); // GOD
+ writeInt(_attackerLoc.getX());
+ writeInt(_attackerLoc.getY());
+ writeInt(_attackerLoc.getZ());
+ writeShort(_hits.size() - 1);
while (it.hasNext())
{
- writeHit(packet, it.next());
+ writeHit(it.next());
}
- packet.writeD(_targetLoc.getX());
- packet.writeD(_targetLoc.getY());
- packet.writeD(_targetLoc.getZ());
- return true;
+ writeInt(_targetLoc.getX());
+ writeInt(_targetLoc.getY());
+ writeInt(_targetLoc.getZ());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
index 8b85fe85e3..10442988c0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class AutoAttackStart implements IClientOutgoingPacket
+public class AutoAttackStart extends ServerPacket
{
private final int _targetObjId;
@@ -32,10 +31,9 @@ public class AutoAttackStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.AUTO_ATTACK_START.writeId(packet);
- packet.writeD(_targetObjId);
- return true;
+ ServerPackets.AUTO_ATTACK_START.writeId(this);
+ writeInt(_targetObjId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
index a294b1e212..0f958f99ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class AutoAttackStop implements IClientOutgoingPacket
+public class AutoAttackStop extends ServerPacket
{
private final int _targetObjId;
@@ -32,10 +31,9 @@ public class AutoAttackStop implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet);
- packet.writeD(_targetObjId);
- return true;
+ ServerPackets.AUTO_ATTACK_STOP.writeId(this);
+ writeInt(_targetObjId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java
index 4ebf954ee5..69214582b5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class BlockListPacket implements IClientOutgoingPacket
+public class BlockListPacket extends ServerPacket
{
private final Set _playerIds;
@@ -35,15 +34,14 @@ public class BlockListPacket implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.BLOCK_LIST.writeId(packet);
- packet.writeD(_playerIds.size());
+ ServerPackets.BLOCK_LIST.writeId(this);
+ writeInt(_playerIds.size());
for (int playerId : _playerIds)
{
- packet.writeS(CharNameTable.getInstance().getNameById(playerId));
- packet.writeS(""); // memo ?
+ writeString(CharNameTable.getInstance().getNameById(playerId));
+ writeString(""); // memo ?
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
index d95f0543b9..be982f77bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.buylist.Product;
import org.l2jmobius.gameserver.model.buylist.ProductList;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class BuyList extends AbstractItemPacket
{
@@ -42,22 +41,21 @@ public class BuyList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet);
- packet.writeD(0); // Type BUY
- packet.writeQ(_money); // current money
- packet.writeD(_listId);
- packet.writeD(_inventorySlots);
- packet.writeH(_list.size());
+ ServerPackets.EX_BUY_SELL_LIST.writeId(this);
+ writeInt(0); // Type BUY
+ writeLong(_money); // current money
+ writeInt(_listId);
+ writeInt(_inventorySlots);
+ writeShort(_list.size());
for (Product product : _list)
{
if ((product.getCount() > 0) || !product.hasLimitedStock())
{
- writeItem(packet, product);
- packet.writeQ((long) (product.getPrice() * (1.0 + _castleTaxRate + product.getBaseTaxRate())));
+ writeItem(product);
+ writeLong((long) (product.getPrice() * (1.0 + _castleTaxRate + product.getBaseTaxRate())));
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
index 2b7a5afbeb..63e3d1d329 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.SeedProduction;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class BuyListSeed implements IClientOutgoingPacket
+public class BuyListSeed extends ServerPacket
{
private final int _manorId;
private final long _money;
@@ -47,38 +46,37 @@ public class BuyListSeed implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.BUY_LIST_SEED.writeId(packet);
- packet.writeQ(_money); // current money
- packet.writeD(0); // TODO: Find me!
- packet.writeD(_manorId); // manor id
+ ServerPackets.BUY_LIST_SEED.writeId(this);
+ writeLong(_money); // current money
+ writeInt(0); // TODO: Find me!
+ writeInt(_manorId); // manor id
if (!_list.isEmpty())
{
- packet.writeH(_list.size()); // list length
+ writeShort(_list.size()); // list length
for (SeedProduction s : _list)
{
- packet.writeC(0); // mask item 0 to print minimum item information
- packet.writeD(s.getId()); // ObjectId
- packet.writeD(s.getId()); // ItemId
- packet.writeC(0xFF); // T1
- packet.writeQ(s.getAmount()); // Quantity
- packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
- packet.writeC(0); // Filler (always 0)
- packet.writeH(0); // Equipped : 00-No, 01-yes
- packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
- packet.writeH(0); // Enchant level (pet level shown in control item)
- packet.writeD(-1);
- packet.writeD(-9999);
- packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0
- packet.writeQ(s.getPrice()); // price
+ writeByte(0); // mask item 0 to print minimum item information
+ writeInt(s.getId()); // ObjectId
+ writeInt(s.getId()); // ItemId
+ writeByte(0xFF); // T1
+ writeLong(s.getAmount()); // Quantity
+ writeByte(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
+ writeByte(0); // Filler (always 0)
+ writeShort(0); // Equipped : 00-No, 01-yes
+ writeLong(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
+ writeShort(0); // Enchant level (pet level shown in control item)
+ writeInt(-1);
+ writeInt(-9999);
+ writeByte(1); // GOD Item enabled = 1 disabled (red) = 0
+ writeLong(s.getPrice()); // price
}
_list.clear();
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
index f3dc872dca..9eb6a694a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CSShowComBoard implements IClientOutgoingPacket
+public class CSShowComBoard extends ServerPacket
{
private final byte[] _html;
@@ -29,11 +28,10 @@ public class CSShowComBoard implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_BOARD.writeId(packet);
- packet.writeC(1); // c4 1 to show community 00 to hide
- packet.writeB(_html);
- return true;
+ ServerPackets.SHOW_BOARD.writeId(this);
+ writeByte(1); // c4 1 to show community 00 to hide
+ writeBytes(_html);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java
index b18dac4cc3..f72b2dfe4c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CameraMode implements IClientOutgoingPacket
+public class CameraMode extends ServerPacket
{
private final int _mode;
@@ -33,10 +32,9 @@ public class CameraMode implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CAMERA_MODE.writeId(packet);
- packet.writeD(_mode);
- return true;
+ ServerPackets.CAMERA_MODE.writeId(this);
+ writeInt(_mode);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java
index adea754676..b5a9c14b69 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ChairSit implements IClientOutgoingPacket
+public class ChairSit extends ServerPacket
{
private final Player _player;
private final int _staticObjectId;
@@ -36,11 +35,10 @@ public class ChairSit implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHAIR_SIT.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_staticObjectId);
- return true;
+ ServerPackets.CHAIR_SIT.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_staticObjectId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
index de141fa067..d0b7a329db 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ChangeMoveType implements IClientOutgoingPacket
+public class ChangeMoveType extends ServerPacket
{
public static final int WALK = 0;
public static final int RUN = 1;
@@ -35,12 +34,11 @@ public class ChangeMoveType implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_running ? RUN : WALK);
- packet.writeD(0); // c2
- return true;
+ ServerPackets.CHANGE_MOVE_TYPE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_running ? RUN : WALK);
+ writeInt(0); // c2
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
index fbe5e39e2e..dfe0c69e1b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ChangeWaitType implements IClientOutgoingPacket
+public class ChangeWaitType extends ServerPacket
{
public static final int WT_SITTING = 0;
public static final int WT_STANDING = 1;
@@ -43,14 +42,13 @@ public class ChangeWaitType implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_moveType);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.CHANGE_WAIT_TYPE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_moveType);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
index aa2e7b2eaa..45a6e7915d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CharCreateFail implements IClientOutgoingPacket
+public class CharCreateFail extends ServerPacket
{
// TODO: Enum
public static final int REASON_CREATION_FAILED = 0x00; // "Your character creation has failed."
@@ -38,10 +37,9 @@ public class CharCreateFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet);
- packet.writeD(_error);
- return true;
+ ServerPackets.CHARACTER_CREATE_FAIL.writeId(this);
+ writeInt(_error);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
index 768617e558..3da4ce994e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CharCreateOk implements IClientOutgoingPacket
+public class CharCreateOk extends ServerPacket
{
public static final CharCreateOk STATIC_PACKET = new CharCreateOk();
@@ -28,10 +27,9 @@ public class CharCreateOk implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet);
- packet.writeD(1);
- return true;
+ ServerPackets.CHARACTER_CREATE_SUCCESS.writeId(this);
+ writeInt(1);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
index 1674eef343..8266ae556c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CharDeleteFail implements IClientOutgoingPacket
+public class CharDeleteFail extends ServerPacket
{
private final int _error;
@@ -30,10 +29,9 @@ public class CharDeleteFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet);
- packet.writeD(_error);
- return true;
+ ServerPackets.CHARACTER_DELETE_FAIL.writeId(this);
+ writeInt(_error);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
index 24702fd723..4e3cb291ff 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
@@ -16,15 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CharDeleteSuccess implements IClientOutgoingPacket
+public class CharDeleteSuccess extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHARACTER_DELETE_SUCCESS.writeId(packet);
- return true;
+ ServerPackets.CHARACTER_DELETE_SUCCESS.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
index f635495c17..4d61b593a4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.instancemanager.RankManager;
@@ -31,9 +30,9 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CharInfo implements IClientOutgoingPacket
+public class CharInfo extends ServerPacket
{
private static final int[] PAPERDOLL_ORDER = new int[]
{
@@ -75,6 +74,8 @@ public class CharInfo implements IClientOutgoingPacket
public CharInfo(Player player, boolean gmSeeInvis)
{
+ super(256);
+
_player = player;
_objId = player.getObjectId();
_clan = player.getClan();
@@ -118,151 +119,150 @@ public class CharInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHAR_INFO.writeId(packet);
- packet.writeC(0); // Grand Crusade
- packet.writeD(_x); // Confirmed
- packet.writeD(_y); // Confirmed
- packet.writeD(_z); // Confirmed
- packet.writeD(_vehicleId); // Confirmed
- packet.writeD(_objId); // Confirmed
- packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
- packet.writeH(_player.getRace().ordinal()); // Confirmed
- packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed
- packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId());
+ ServerPackets.CHAR_INFO.writeId(this);
+ writeByte(0); // Grand Crusade
+ writeInt(_x); // Confirmed
+ writeInt(_y); // Confirmed
+ writeInt(_z); // Confirmed
+ writeInt(_vehicleId); // Confirmed
+ writeInt(_objId); // Confirmed
+ writeString(_player.getAppearance().getVisibleName()); // Confirmed
+ writeShort(_player.getRace().ordinal()); // Confirmed
+ writeByte(_player.getAppearance().isFemale()); // Confirmed
+ writeInt(_player.getBaseTemplate().getClassId().getRootClassId().getId());
for (int slot : getPaperdollOrder())
{
- packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); // Confirmed
+ writeInt(_player.getInventory().getPaperdollItemDisplayId(slot)); // Confirmed
}
for (int slot : getPaperdollOrderAugument())
{
final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot);
- packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed
- packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed
+ writeInt(augment != null ? augment.getOption1Id() : 0); // Confirmed
+ writeInt(augment != null ? augment.getOption2Id() : 0); // Confirmed
}
- packet.writeC(_armorEnchant);
+ writeByte(_armorEnchant);
for (int slot : getPaperdollOrderVisualId())
{
- packet.writeD(_player.getInventory().getPaperdollItemVisualId(slot));
+ writeInt(_player.getInventory().getPaperdollItemVisualId(slot));
}
- packet.writeC(_player.getPvpFlag());
- packet.writeD(_player.getReputation());
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- packet.writeH(_runSpd);
- packet.writeH(_walkSpd);
- packet.writeH(_swimRunSpd);
- packet.writeH(_swimWalkSpd);
- packet.writeH(_flyRunSpd);
- packet.writeH(_flyWalkSpd);
- packet.writeH(_flyRunSpd);
- packet.writeH(_flyWalkSpd);
- packet.writeF(_moveMultiplier);
- packet.writeF(_attackSpeedMultiplier);
- packet.writeF(_player.getCollisionRadius());
- packet.writeF(_player.getCollisionHeight());
- packet.writeD(_player.getVisualHair());
- packet.writeD(_player.getVisualHairColor());
- packet.writeD(_player.getVisualFace());
- packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle());
- packet.writeD(_player.getAppearance().getVisibleClanId());
- packet.writeD(_player.getAppearance().getVisibleClanCrestId());
- packet.writeD(_player.getAppearance().getVisibleAllyId());
- packet.writeD(_player.getAppearance().getVisibleAllyCrestId());
- packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed
- packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed
- packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed
- packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed
- packet.writeC(_player.isInvisible() ? 1 : 0);
- packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
- packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed
+ writeByte(_player.getPvpFlag());
+ writeInt(_player.getReputation());
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeShort(_runSpd);
+ writeShort(_walkSpd);
+ writeShort(_swimRunSpd);
+ writeShort(_swimWalkSpd);
+ writeShort(_flyRunSpd);
+ writeShort(_flyWalkSpd);
+ writeShort(_flyRunSpd);
+ writeShort(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_attackSpeedMultiplier);
+ writeDouble(_player.getCollisionRadius());
+ writeDouble(_player.getCollisionHeight());
+ writeInt(_player.getVisualHair());
+ writeInt(_player.getVisualHairColor());
+ writeInt(_player.getVisualFace());
+ writeString(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle());
+ writeInt(_player.getAppearance().getVisibleClanId());
+ writeInt(_player.getAppearance().getVisibleClanCrestId());
+ writeInt(_player.getAppearance().getVisibleAllyId());
+ writeInt(_player.getAppearance().getVisibleAllyCrestId());
+ writeByte(!_player.isSitting()); // Confirmed
+ writeByte(_player.isRunning()); // Confirmed
+ writeByte(_player.isInCombat()); // Confirmed
+ writeByte(!_player.isInOlympiadMode() && _player.isAlikeDead()); // Confirmed
+ writeByte(_player.isInvisible());
+ writeByte(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
+ writeByte(_player.getPrivateStoreType().getId()); // Confirmed
- packet.writeH(_player.getCubics().size()); // Confirmed
- _player.getCubics().keySet().forEach(packet::writeH);
+ writeShort(_player.getCubics().size()); // Confirmed
+ _player.getCubics().keySet().forEach(this::writeShort);
- packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed
- packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
- packet.writeH(_player.getRecomHave()); // Confirmed
- packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000);
- packet.writeD(_player.getClassId().getId()); // Confirmed
- packet.writeD(0); // TODO: Find me!
- packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed
- packet.writeC(_player.getTeam().getId()); // Confirmed
- packet.writeD(_player.getClanCrestLargeId());
- packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed
- packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2?
+ writeByte(_player.isInMatchingRoom()); // Confirmed
+ writeByte(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
+ writeShort(_player.getRecomHave()); // Confirmed
+ writeInt(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000);
+ writeInt(_player.getClassId().getId()); // Confirmed
+ writeInt(0); // TODO: Find me!
+ writeByte(_player.isMounted() ? 0 : _enchantLevel); // Confirmed
+ writeByte(_player.getTeam().getId()); // Confirmed
+ writeInt(_player.getClanCrestLargeId());
+ writeByte(_player.isNoble()); // Confirmed
+ writeByte(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2?
- packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
+ writeByte(_player.isFishing()); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation();
if (baitLocation != null)
{
- packet.writeD(baitLocation.getX()); // Confirmed
- packet.writeD(baitLocation.getY()); // Confirmed
- packet.writeD(baitLocation.getZ()); // Confirmed
+ writeInt(baitLocation.getX()); // Confirmed
+ writeInt(baitLocation.getY()); // Confirmed
+ writeInt(baitLocation.getZ()); // Confirmed
}
else
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
- packet.writeD(_player.getAppearance().getNameColor()); // Confirmed
- packet.writeD(_heading); // Confirmed
- packet.writeC(_player.getPledgeClass());
- packet.writeH(_player.getPledgeType());
- packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed
- packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
- packet.writeD(_clan != null ? _clan.getReputationScore() : 0);
- packet.writeD(_player.getTransformationDisplayId()); // Confirmed
- packet.writeD(_player.getAgathionId()); // Confirmed
- packet.writeC(0); // nPvPRestrainStatus
- packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed
- packet.writeD(_player.getMaxHp()); // Confirmed
- packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed
- packet.writeD(_player.getMaxMp()); // Confirmed
- packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed
- packet.writeC(0); // cBRLectureMark
+ writeInt(_player.getAppearance().getNameColor()); // Confirmed
+ writeInt(_heading); // Confirmed
+ writeByte(_player.getPledgeClass());
+ writeShort(_player.getPledgeType());
+ writeInt(_player.getAppearance().getTitleColor()); // Confirmed
+ writeByte(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
+ writeInt(_clan != null ? _clan.getReputationScore() : 0);
+ writeInt(_player.getTransformationDisplayId()); // Confirmed
+ writeInt(_player.getAgathionId()); // Confirmed
+ writeByte(0); // nPvPRestrainStatus
+ writeInt((int) Math.round(_player.getCurrentCp())); // Confirmed
+ writeInt(_player.getMaxHp()); // Confirmed
+ writeInt((int) Math.round(_player.getCurrentHp())); // Confirmed
+ writeInt(_player.getMaxMp()); // Confirmed
+ writeInt((int) Math.round(_player.getCurrentMp())); // Confirmed
+ writeByte(0); // cBRLectureMark
final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects();
- packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed
+ writeInt(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed
for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects)
{
- packet.writeH(abnormalVisualEffect.getClientId()); // Confirmed
+ writeShort(abnormalVisualEffect.getClientId()); // Confirmed
}
if (_gmSeeInvis)
{
- packet.writeH(AbnormalVisualEffect.STEALTH.getClientId());
+ writeShort(AbnormalVisualEffect.STEALTH.getClientId());
}
- packet.writeC(_player.isTrueHero() ? 100 : 0);
- packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory
- packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points
- packet.writeD(0); // nCursedWeaponClassId
+ writeByte(_player.isTrueHero() ? 100 : 0);
+ writeByte(_player.isHairAccessoryEnabled()); // Hair accessory
+ writeByte(_player.getAbilityPointsUsed()); // Used Ability Points
+ writeInt(0); // nCursedWeaponClassId
// AFK animation.
if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null))
{
- packet.writeD(_player.isClanLeader() ? 100 : 101);
+ writeInt(_player.isClanLeader() ? 100 : 101);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
// Rank.
- packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0);
- packet.writeH(0);
- packet.writeC(0);
- packet.writeD(_player.getClassId().getId());
- packet.writeC(0);
- return true;
+ writeInt(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0);
+ writeShort(0);
+ writeByte(0);
+ writeInt(_player.getClassId().getId());
+ writeByte(0);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
index 11f5f4df52..b32739f9e4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
-public class CharSelected implements IClientOutgoingPacket
+public class CharSelected extends ServerPacket
{
private final Player _player;
private final int _sessionId;
@@ -37,44 +36,43 @@ public class CharSelected implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHARACTER_SELECTED.writeId(packet);
- packet.writeS(_player.getName());
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getTitle());
- packet.writeD(_sessionId);
- packet.writeD(_player.getClanId());
- packet.writeD(0); // ??
- packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
- packet.writeD(_player.getRace().ordinal());
- packet.writeD(_player.getClassId().getId());
- packet.writeD(1); // active ??
- packet.writeD(_player.getX());
- packet.writeD(_player.getY());
- packet.writeD(_player.getZ());
- packet.writeF(_player.getCurrentHp());
- packet.writeF(_player.getCurrentMp());
- packet.writeQ(_player.getSp());
- packet.writeQ(_player.getExp());
- packet.writeD(_player.getLevel());
- packet.writeD(_player.getReputation());
- packet.writeD(_player.getPkKills());
- packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour
- packet.writeD(0);
- packet.writeD(_player.getClassId().getId());
- packet.writeB(new byte[16]);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeB(new byte[28]);
- packet.writeD(0);
- return true;
+ ServerPackets.CHARACTER_SELECTED.writeId(this);
+ writeString(_player.getName());
+ writeInt(_player.getObjectId());
+ writeString(_player.getTitle());
+ writeInt(_sessionId);
+ writeInt(_player.getClanId());
+ writeInt(0); // ??
+ writeInt(_player.getAppearance().isFemale());
+ writeInt(_player.getRace().ordinal());
+ writeInt(_player.getClassId().getId());
+ writeInt(1); // active ??
+ writeInt(_player.getX());
+ writeInt(_player.getY());
+ writeInt(_player.getZ());
+ writeDouble(_player.getCurrentHp());
+ writeDouble(_player.getCurrentMp());
+ writeLong(_player.getSp());
+ writeLong(_player.getExp());
+ writeInt(_player.getLevel());
+ writeInt(_player.getReputation());
+ writeInt(_player.getPkKills());
+ writeInt(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour
+ writeInt(0);
+ writeInt(_player.getClassId().getId());
+ writeBytes(new byte[16]);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeBytes(new byte[28]);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
index e77545a86f..dbc2492264 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.xml.ExperienceData;
import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
@@ -38,9 +37,9 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.olympiad.Hero;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class CharSelectionInfo implements IClientOutgoingPacket
+public class CharSelectionInfo extends ServerPacket
{
private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName());
@@ -152,17 +151,17 @@ public class CharSelectionInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet);
+ ServerPackets.CHARACTER_SELECTION_INFO.writeId(this);
final int size = _characterPackages.size();
- packet.writeD(size); // Created character count
- packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) )
- packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char
- packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play
- packet.writeD(2); // if 1, Korean client
- packet.writeC(0); // Gift message for inactive accounts // 152
- packet.writeC(0); // Balthus Knights, if 1 suggests premium account
+ writeInt(size); // Created character count
+ writeInt(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) )
+ writeByte(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // if 1 can't create new char
+ writeByte(1); // 0=can't play, 1=can play free until level 85, 2=100% free play
+ writeInt(2); // if 1, Korean client
+ writeByte(0); // Gift message for inactive accounts // 152
+ writeByte(0); // Balthus Knights, if 1 suggests premium account
long lastAccess = 0;
if (_activeId == -1)
@@ -180,79 +179,78 @@ public class CharSelectionInfo implements IClientOutgoingPacket
for (int i = 0; i < size; i++)
{
final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i);
- packet.writeS(charInfoPackage.getName()); // Character name
- packet.writeD(charInfoPackage.getObjectId()); // Character ID
- packet.writeS(_loginName); // Account name
- packet.writeD(_sessionId); // Account ID
- packet.writeD(0); // Clan ID
- packet.writeD(0); // Builder level
- packet.writeD(charInfoPackage.getSex()); // Sex
- packet.writeD(charInfoPackage.getRace()); // Race
- packet.writeD(charInfoPackage.getBaseClassId());
- packet.writeD(Config.SERVER_ID);
- packet.writeD(charInfoPackage.getX());
- packet.writeD(charInfoPackage.getY());
- packet.writeD(charInfoPackage.getZ());
- packet.writeF(charInfoPackage.getCurrentHp());
- packet.writeF(charInfoPackage.getCurrentMp());
- packet.writeQ(charInfoPackage.getSp());
- packet.writeQ(charInfoPackage.getExp());
- packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())));
- packet.writeD(charInfoPackage.getLevel());
- packet.writeD(charInfoPackage.getReputation());
- packet.writeD(charInfoPackage.getPkKills());
- packet.writeD(charInfoPackage.getPvPKills());
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0); // Ertheia
- packet.writeD(0); // Ertheia
+ writeString(charInfoPackage.getName()); // Character name
+ writeInt(charInfoPackage.getObjectId()); // Character ID
+ writeString(_loginName); // Account name
+ writeInt(_sessionId); // Account ID
+ writeInt(0); // Clan ID
+ writeInt(0); // Builder level
+ writeInt(charInfoPackage.getSex()); // Sex
+ writeInt(charInfoPackage.getRace()); // Race
+ writeInt(charInfoPackage.getBaseClassId());
+ writeInt(Config.SERVER_ID);
+ writeInt(charInfoPackage.getX());
+ writeInt(charInfoPackage.getY());
+ writeInt(charInfoPackage.getZ());
+ writeDouble(charInfoPackage.getCurrentHp());
+ writeDouble(charInfoPackage.getCurrentMp());
+ writeLong(charInfoPackage.getSp());
+ writeLong(charInfoPackage.getExp());
+ writeDouble((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())));
+ writeInt(charInfoPackage.getLevel());
+ writeInt(charInfoPackage.getReputation());
+ writeInt(charInfoPackage.getPkKills());
+ writeInt(charInfoPackage.getPvPKills());
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0); // Ertheia
+ writeInt(0); // Ertheia
for (int slot : getPaperdollOrder())
{
- packet.writeD(charInfoPackage.getPaperdollItemId(slot));
+ writeInt(charInfoPackage.getPaperdollItemId(slot));
}
for (int slot : getPaperdollOrderVisualId())
{
- packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot));
+ writeInt(charInfoPackage.getPaperdollItemVisualId(slot));
}
- packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level
- packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level
- packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level
- packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level
- packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level
- packet.writeD(charInfoPackage.getHairStyle());
- packet.writeD(charInfoPackage.getHairColor());
- packet.writeD(charInfoPackage.getFace());
- packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP
- packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP
- packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0);
- packet.writeD(charInfoPackage.getClassId());
- packet.writeD(i == _activeId ? 1 : 0);
- packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND));
- packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0);
- packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0);
- packet.writeD(0); // Transformation: Currently on retail when you are on character select you don't see your transformation.
- packet.writeD(0); // Pet NpcId
- packet.writeD(0); // Pet level
- packet.writeD(0); // Pet Food
- packet.writeD(0); // Pet Food Level
- packet.writeF(0); // Current pet HP
- packet.writeF(0); // Current pet MP
- packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality
- packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent
- packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses
- packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not
- packet.writeC(charInfoPackage.isNoble() ? 1 : 0);
- packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow
- packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled
- packet.writeD(0); // 235 - ban time left
- packet.writeD((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time
+ writeShort(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level
+ writeShort(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level
+ writeShort(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level
+ writeShort(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level
+ writeShort(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level
+ writeInt(charInfoPackage.getHairStyle());
+ writeInt(charInfoPackage.getHairColor());
+ writeInt(charInfoPackage.getFace());
+ writeDouble(charInfoPackage.getMaxHp()); // Maximum HP
+ writeDouble(charInfoPackage.getMaxMp()); // Maximum MP
+ writeInt(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0);
+ writeInt(charInfoPackage.getClassId());
+ writeInt(i == _activeId);
+ writeByte(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND));
+ writeInt(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0);
+ writeInt(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0);
+ writeInt(0); // Transformation: Currently on retail when you are on character select you don't see your transformation.
+ writeInt(0); // Pet NpcId
+ writeInt(0); // Pet level
+ writeInt(0); // Pet Food
+ writeInt(0); // Pet Food Level
+ writeDouble(0); // Current pet HP
+ writeDouble(0); // Current pet MP
+ writeInt(charInfoPackage.getVitalityPoints()); // Vitality
+ writeInt((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent
+ writeInt(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses
+ writeInt(charInfoPackage.getAccessLevel() != -100); // Char is active or not
+ writeByte(charInfoPackage.isNoble());
+ writeByte(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow
+ writeByte(charInfoPackage.isHairAccessoryEnabled()); // Show hair accessory if enabled
+ writeInt(0); // 235 - ban time left
+ writeInt((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time
}
- return true;
}
private static List loadCharacterSelectInfo(String loginName)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
index d59df7911a..1ed46b6eed 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ChooseInventoryItem implements IClientOutgoingPacket
+public class ChooseInventoryItem extends ServerPacket
{
private final int _itemId;
@@ -29,10 +28,9 @@ public class ChooseInventoryItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet);
- packet.writeD(_itemId);
- return true;
+ ServerPackets.CHOOSE_INVENTORY_ITEM.writeId(this);
+ writeInt(_itemId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
index bb0c9a61f4..b8905886d3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
-public class ClientSetTime implements IClientOutgoingPacket
+public class ClientSetTime extends ServerPacket
{
public static final ClientSetTime STATIC_PACKET = new ClientSetTime();
@@ -29,11 +28,10 @@ public class ClientSetTime implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CLIENT_SET_TIME.writeId(packet);
- packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // Time in client minutes.
- packet.writeD(GameTimeTaskManager.IG_DAYS_PER_DAY); // Constant to match the server time. This determines the speed of the client clock.
- return true;
+ ServerPackets.CLIENT_SET_TIME.writeId(this);
+ writeInt(GameTimeTaskManager.getInstance().getGameTime()); // Time in client minutes.
+ writeInt(GameTimeTaskManager.IG_DAYS_PER_DAY); // Constant to match the server time. This determines the speed of the client clock.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
index 66a1f5e20d..f761cd77e8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
@@ -16,8 +16,7 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage.SMParam;
@@ -25,7 +24,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage.SMParam;
* ConfirmDlg server packet implementation.
* @author kombat
*/
-public class ConfirmDlg implements IClientOutgoingPacket
+public class ConfirmDlg extends ServerPacket
{
private int _time;
private int _requesterId;
@@ -65,15 +64,15 @@ public class ConfirmDlg implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CONFIRM_DLG.writeId(packet);
+ ServerPackets.CONFIRM_DLG.writeId(this);
final SMParam[] params = _systemMessage.getParams();
- packet.writeD(_systemMessage.getId());
- packet.writeD(params.length);
+ writeInt(_systemMessage.getId());
+ writeInt(params.length);
for (SMParam param : params)
{
- packet.writeD(param.getType());
+ writeInt(param.getType());
switch (param.getType())
{
case SystemMessage.TYPE_ELEMENT_NAME:
@@ -81,7 +80,7 @@ public class ConfirmDlg implements IClientOutgoingPacket
case SystemMessage.TYPE_FACTION_NAME:
case SystemMessage.TYPE_ELEMENTAL_SPIRIT:
{
- packet.writeC(param.getIntValue());
+ writeByte(param.getIntValue());
break;
}
case SystemMessage.TYPE_CASTLE_NAME:
@@ -89,7 +88,7 @@ public class ConfirmDlg implements IClientOutgoingPacket
case SystemMessage.TYPE_INSTANCE_NAME:
case SystemMessage.TYPE_CLASS_ID:
{
- packet.writeH(param.getIntValue());
+ writeShort(param.getIntValue());
break;
}
case SystemMessage.TYPE_ITEM_NAME:
@@ -97,41 +96,40 @@ public class ConfirmDlg implements IClientOutgoingPacket
case SystemMessage.TYPE_NPC_NAME:
case SystemMessage.TYPE_DOOR_NAME:
{
- packet.writeD(param.getIntValue());
+ writeInt(param.getIntValue());
break;
}
case SystemMessage.TYPE_LONG_NUMBER:
{
- packet.writeQ(param.getLongValue());
+ writeLong(param.getLongValue());
break;
}
case SystemMessage.TYPE_TEXT:
case SystemMessage.TYPE_PLAYER_NAME:
{
- packet.writeS(param.getStringValue());
+ writeString(param.getStringValue());
break;
}
case SystemMessage.TYPE_SKILL_NAME:
{
final int[] array = param.getIntArrayValue();
- packet.writeD(array[0]); // skill id
- packet.writeH(array[1]); // skill level
- packet.writeH(array[2]); // skill sub level
+ writeInt(array[0]); // skill id
+ writeShort(array[1]); // skill level
+ writeShort(array[2]); // skill sub level
break;
}
case SystemMessage.TYPE_POPUP_ID:
case SystemMessage.TYPE_ZONE_NAME:
{
final int[] array = param.getIntArrayValue();
- packet.writeD(array[0]); // x
- packet.writeD(array[1]); // y
- packet.writeD(array[2]); // z
+ writeInt(array[0]); // x
+ writeInt(array[1]); // y
+ writeInt(array[2]); // z
break;
}
}
}
- packet.writeD(_time);
- packet.writeD(_requesterId);
- return true;
+ writeInt(_time);
+ writeInt(_requesterId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
index 655d311405..106def7b05 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.MentorManager;
import org.l2jmobius.gameserver.instancemanager.RankManager;
@@ -28,10 +27,10 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.NpcStringId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class CreatureSay implements IClientOutgoingPacket
+public class CreatureSay extends ServerPacket
{
private final Creature _sender;
private final ChatType _chatType;
@@ -65,6 +64,8 @@ public class CreatureSay implements IClientOutgoingPacket
*/
public CreatureSay(Player sender, Player receiver, String name, ChatType chatType, String text, boolean shareLocation)
{
+ super(128);
+
_sender = sender;
_senderName = name;
_chatType = chatType;
@@ -103,6 +104,8 @@ public class CreatureSay implements IClientOutgoingPacket
public CreatureSay(Creature sender, ChatType chatType, String senderName, String text, boolean shareLocation)
{
+ super(128);
+
_sender = sender;
_chatType = chatType;
_senderName = senderName;
@@ -112,6 +115,8 @@ public class CreatureSay implements IClientOutgoingPacket
public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId)
{
+ super(128);
+
_sender = sender;
_chatType = chatType;
_messageId = npcStringId.getId();
@@ -123,6 +128,8 @@ public class CreatureSay implements IClientOutgoingPacket
public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId)
{
+ super(128);
+
_sender = null;
_chatType = chatType;
_charId = charId;
@@ -143,29 +150,29 @@ public class CreatureSay implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SAY2.writeId(packet);
- packet.writeD(_sender == null ? 0 : _sender.getObjectId());
- packet.writeD(_chatType.getClientId());
+ ServerPackets.SAY2.writeId(this);
+ writeInt(_sender == null ? 0 : _sender.getObjectId());
+ writeInt(_chatType.getClientId());
if (_senderName != null)
{
- packet.writeS(_senderName);
+ writeString(_senderName);
}
else
{
- packet.writeD(_charId);
+ writeInt(_charId);
}
- packet.writeD(_messageId); // High Five NPCString ID
+ writeInt(_messageId); // High Five NPCString ID
if (_text != null)
{
- packet.writeS(_text);
+ writeString(_text);
if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER))
{
- packet.writeC(_mask);
+ writeByte(_mask);
if ((_mask & 0x10) == 0)
{
- packet.writeC(_sender.getLevel());
+ writeByte(_sender.getLevel());
}
}
}
@@ -173,7 +180,7 @@ public class CreatureSay implements IClientOutgoingPacket
{
for (String s : _parameters)
{
- packet.writeS(s);
+ writeString(s);
}
}
// Rank
@@ -182,50 +189,49 @@ public class CreatureSay implements IClientOutgoingPacket
final Clan clan = _sender.getClan();
if ((clan != null) && ((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE)))
{
- packet.writeC(0); // unknown clan byte
+ writeByte(0); // unknown clan byte
}
final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer());
if ((rank == 0) || (rank > 100))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (rank <= 10)
{
- packet.writeC(1);
+ writeByte(1);
}
else if (rank <= 50)
{
- packet.writeC(2);
+ writeByte(2);
}
else if (rank <= 100)
{
- packet.writeC(3);
+ writeByte(3);
}
if (clan != null)
{
- packet.writeC(clan.getCastleId());
+ writeByte(clan.getCastleId());
}
else
{
- packet.writeC(0);
+ writeByte(0);
}
if (_shareLocation)
{
- packet.writeC(1);
- packet.writeH(SharedTeleportManager.getInstance().nextId(_sender));
+ writeByte(1);
+ writeShort(SharedTeleportManager.getInstance().nextId(_sender));
}
}
else
{
- packet.writeC(0);
+ writeByte(0);
}
- return true;
}
@Override
- public void runImpl(Player player)
+ public void run(Player player)
{
if (player != null)
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
index a307b06e4b..760aa6d364 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class DeleteObject implements IClientOutgoingPacket
+public class DeleteObject extends ServerPacket
{
private final int _objectId;
@@ -35,11 +34,10 @@ public class DeleteObject implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.DELETE_OBJECT.writeId(packet);
- packet.writeD(_objectId);
- packet.writeC(0); // c2
- return true;
+ ServerPackets.DELETE_OBJECT.writeId(this);
+ writeInt(_objectId);
+ writeByte(0); // c2
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java
index 3b5917e55b..67d37474fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class Dice implements IClientOutgoingPacket
+public class Dice extends ServerPacket
{
private final int _objectId;
private final int _itemId;
@@ -47,15 +46,14 @@ public class Dice implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.DICE.writeId(packet);
- packet.writeD(_objectId); // object id of player
- packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628
- packet.writeD(_number); // number rolled
- packet.writeD(_x); // x
- packet.writeD(_y); // y
- packet.writeD(_z); // z
- return true;
+ ServerPackets.DICE.writeId(this);
+ writeInt(_objectId); // object id of player
+ writeInt(_itemId); // item id of dice (spade) 4625,4626,4627,4628
+ writeInt(_number); // number rolled
+ writeInt(_x); // x
+ writeInt(_y); // y
+ writeInt(_z); // z
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
index 7daa6dd8de..6b037044be 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.SiegeClan;
@@ -33,12 +32,12 @@ import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class Die implements IClientOutgoingPacket
+public class Die extends ServerPacket
{
private final int _objectId;
private final boolean _isSweepable;
@@ -108,53 +107,52 @@ public class Die implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.DIE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeQ(_flags);
- packet.writeD(_isSweepable ? 1 : 0);
- packet.writeD(_delayFeather); // Feather item time.
- packet.writeC(0); // Hide die animation.
- packet.writeD(0);
+ ServerPackets.DIE.writeId(this);
+ writeInt(_objectId);
+ writeLong(_flags);
+ writeInt(_isSweepable);
+ writeInt(_delayFeather); // Feather item time.
+ writeByte(0); // Hide die animation.
+ writeInt(0);
if ((_player != null) && Config.RESURRECT_BY_PAYMENT_ENABLED)
{
int resurrectTimes = _player.getVariables().getInt(PlayerVariables.RESURRECT_BY_PAYMENT_COUNT, 0) + 1;
int originalValue = resurrectTimes - 1;
if (originalValue < Config.RESURRECT_BY_PAYMENT_MAX_FREE_TIMES)
{
- packet.writeD(Config.RESURRECT_BY_PAYMENT_MAX_FREE_TIMES - originalValue); // free round resurrection
- packet.writeD(0); // Adena resurrection
- packet.writeD(0); // Adena count%
- packet.writeD(0); // L-Coin resurrection
- packet.writeD(0); // L-Coin count%
+ writeInt(Config.RESURRECT_BY_PAYMENT_MAX_FREE_TIMES - originalValue); // free round resurrection
+ writeInt(0); // Adena resurrection
+ writeInt(0); // Adena count%
+ writeInt(0); // L-Coin resurrection
+ writeInt(0); // L-Coin count%
}
else
{
- packet.writeD(0);
- getValues(_player, packet, originalValue);
+ writeInt(0);
+ getValues(_player, originalValue);
}
}
else
{
- packet.writeD(1); // free round resurrection
- packet.writeD(0); // Adena resurrection
- packet.writeD(-1); // Adena count%
- packet.writeD(0); // L-Coin resurrection
- packet.writeD(-1); // L-Coin count%
+ writeInt(1); // free round resurrection
+ writeInt(0); // Adena resurrection
+ writeInt(-1); // Adena count%
+ writeInt(0); // L-Coin resurrection
+ writeInt(-1); // L-Coin count%
}
- packet.writeD(0);
- return true;
+ writeInt(0);
}
- private void getValues(Player player, PacketWriter packet, int originalValue)
+ private void getValues(Player player, int originalValue)
{
if ((Config.RESURRECT_BY_PAYMENT_FIRST_RESURRECT_VALUES == null) || (Config.RESURRECT_BY_PAYMENT_SECOND_RESURRECT_VALUES == null))
{
- packet.writeD(0); // Adena resurrection
- packet.writeD(-1); // Adena count%
- packet.writeD(0); // L-Coin resurrection
- packet.writeD(-1); // L-Coin count%
+ writeInt(0); // Adena resurrection
+ writeInt(-1); // Adena count%
+ writeInt(0); // L-Coin resurrection
+ writeInt(-1); // L-Coin count%
return;
}
@@ -164,8 +162,8 @@ public class Die implements IClientOutgoingPacket
{
if (Config.RESURRECT_BY_PAYMENT_SECOND_RESURRECT_VALUES.isEmpty())
{
- packet.writeD(0); // Adena resurrection
- packet.writeD(-1); // Adena count%
+ writeInt(0); // Adena resurrection
+ writeInt(-1); // Adena count%
break;
}
@@ -181,15 +179,15 @@ public class Die implements IClientOutgoingPacket
}
catch (Exception e)
{
- packet.writeD(0); // Adena resurrection
- packet.writeD(-1); // Adena count%
+ writeInt(0); // Adena resurrection
+ writeInt(-1); // Adena count%
return;
}
int getValue = maxResTime <= originalValue ? maxResTime : originalValue + 1;
ResurrectByPaymentHolder rbph = Config.RESURRECT_BY_PAYMENT_SECOND_RESURRECT_VALUES.get(level).get(getValue);
- packet.writeD(rbph.getAmount()); // Adena resurrection
- packet.writeD(Math.toIntExact(Math.round(rbph.getResurrectPercent()))); // Adena count%
+ writeInt(rbph.getAmount()); // Adena resurrection
+ writeInt(Math.toIntExact(Math.round(rbph.getResurrectPercent()))); // Adena count%
break;
}
@@ -197,8 +195,8 @@ public class Die implements IClientOutgoingPacket
{
if (Config.RESURRECT_BY_PAYMENT_FIRST_RESURRECT_VALUES.isEmpty())
{
- packet.writeD(0); // L-Coin resurrection
- packet.writeD(-1); // L-Coin count%
+ writeInt(0); // L-Coin resurrection
+ writeInt(-1); // L-Coin count%
break;
}
@@ -214,15 +212,15 @@ public class Die implements IClientOutgoingPacket
}
catch (Exception e)
{
- packet.writeD(0); // L-Coin resurrection
- packet.writeD(-1); // L-Coin count%
+ writeInt(0); // L-Coin resurrection
+ writeInt(-1); // L-Coin count%
return;
}
final int getValue = maxResTime <= originalValue ? maxResTime : originalValue + 1;
ResurrectByPaymentHolder rbph = Config.RESURRECT_BY_PAYMENT_FIRST_RESURRECT_VALUES.get(level).get(getValue);
- packet.writeD(rbph.getAmount()); // L-Coin resurrection
- packet.writeD(Math.toIntExact(Math.round(rbph.getResurrectPercent()))); // L-Coin count%
+ writeInt(rbph.getAmount()); // L-Coin resurrection
+ writeInt(Math.toIntExact(Math.round(rbph.getResurrectPercent()))); // L-Coin count%
break;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
index 5837faec19..e48921ca12 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.Door;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class DoorInfo implements IClientOutgoingPacket
+public class DoorInfo extends ServerPacket
{
private final Door _door;
@@ -30,11 +29,10 @@ public class DoorInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.DOOR_INFO.writeId(packet);
- packet.writeD(_door.getObjectId());
- packet.writeD(_door.getId());
- return true;
+ ServerPackets.DOOR_INFO.writeId(this);
+ writeInt(_door.getObjectId());
+ writeInt(_door.getId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
index 14d41afee7..8fa42f4029 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.Door;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class DoorStatusUpdate implements IClientOutgoingPacket
+public class DoorStatusUpdate extends ServerPacket
{
private final Door _door;
@@ -30,16 +29,15 @@ public class DoorStatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet);
- packet.writeD(_door.getObjectId());
- packet.writeD(_door.isOpen() ? 0 : 1);
- packet.writeD(_door.getDamage());
- packet.writeD(_door.isEnemy() ? 1 : 0);
- packet.writeD(_door.getId());
- packet.writeD((int) _door.getCurrentHp());
- packet.writeD(_door.getMaxHp());
- return true;
+ ServerPackets.DOOR_STATUS_UPDATE.writeId(this);
+ writeInt(_door.getObjectId());
+ writeInt(!_door.isOpen());
+ writeInt(_door.getDamage());
+ writeInt(_door.isEnemy());
+ writeInt(_door.getId());
+ writeInt((int) _door.getCurrentHp());
+ writeInt(_door.getMaxHp());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 3035890956..4bf644c60c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class DropItem implements IClientOutgoingPacket
+public class DropItem extends ServerPacket
{
private final Item _item;
private final int _objectId;
@@ -37,23 +36,22 @@ public class DropItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.DROP_ITEM.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_item.getObjectId());
- packet.writeD(_item.getDisplayId());
- packet.writeD(_item.getX());
- packet.writeD(_item.getY());
- packet.writeD(_item.getZ());
+ ServerPackets.DROP_ITEM.writeId(this);
+ writeInt(_objectId);
+ writeInt(_item.getObjectId());
+ writeInt(_item.getDisplayId());
+ writeInt(_item.getX());
+ writeInt(_item.getY());
+ writeInt(_item.getZ());
// only show item count if it is a stackable item
- packet.writeC(_item.isStackable() ? 1 : 0);
- packet.writeQ(_item.getCount());
- packet.writeC(0);
- // packet.writeD(1); if above C == true (1) then packet.readD()
- packet.writeC(_item.getEnchantLevel()); // Grand Crusade
- packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade
- packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade
- return true;
+ writeByte(_item.isStackable());
+ writeLong(_item.getCount());
+ writeByte(0);
+ // writeInt(1); if above C == true (1) then packet.readInt()
+ writeByte(_item.getEnchantLevel()); // Grand Crusade
+ writeByte(_item.getAugmentation() != null); // Grand Crusade
+ writeByte(_item.getSpecialAbilities().size()); // Grand Crusade
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java
index 99bd80d97e..5522755832 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.interfaces.ILocational;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class Earthquake implements IClientOutgoingPacket
+public class Earthquake extends ServerPacket
{
private final int _x;
private final int _y;
@@ -59,15 +58,14 @@ public class Earthquake implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EARTHQUAKE.writeId(packet);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_intensity);
- packet.writeD(_duration);
- packet.writeD(0); // Unknown
- return true;
+ ServerPackets.EARTHQUAKE.writeId(this);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_intensity);
+ writeInt(_duration);
+ writeInt(0); // Unknown
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
index 1a8b8ddfbb..10d9f751fb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class EnchantResult implements IClientOutgoingPacket
+public class EnchantResult extends ServerPacket
{
public static final int SUCCESS = 0;
public static final int FAIL = 1;
@@ -56,23 +55,22 @@ public class EnchantResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ENCHANT_RESULT.writeId(packet);
- packet.writeD(_result);
- packet.writeD(_crystal);
- packet.writeQ(_count);
+ ServerPackets.ENCHANT_RESULT.writeId(this);
+ writeInt(_result);
+ writeInt(_crystal);
+ writeLong(_count);
// Guessing.
// With 166 options became 3x write integers instead of shorts and enchant level moved bellow.
// Commenting until actually knowing.
// for (int option : _enchantOptions)
// {
- // packet.writeD(option);
+ // writeInt(option);
// }
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(_enchantLevel); // Confirmed.
- return true;
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(_enchantLevel); // Confirmed.
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
index ef78a83f25..e4c0d2c6cb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.SoulType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Luca Baldi
*/
-public class EtcStatusUpdate implements IClientOutgoingPacket
+public class EtcStatusUpdate extends ServerPacket
{
private final Player _player;
private int _mask;
@@ -39,18 +38,17 @@ public class EtcStatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet);
- packet.writeC(_player.getCharges()); // 1-7 increase force, level
- packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%)
- packet.writeC(0); // Weapon Grade Penalty [1-4]
- packet.writeC(0); // Armor Grade Penalty [1-4]
- packet.writeC(0); // Death Penalty [1-15, 0 = disabled)], not used anymore in Ertheia
- packet.writeC(0); // Old count for charged souls.
- packet.writeC(_mask);
- packet.writeC(_player.getChargedSouls(SoulType.SHADOW)); // Shadow souls
- packet.writeC(_player.getChargedSouls(SoulType.LIGHT)); // Light souls
- return true;
+ ServerPackets.ETC_STATUS_UPDATE.writeId(this);
+ writeByte(_player.getCharges()); // 1-7 increase force, level
+ writeInt(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%)
+ writeByte(0); // Weapon Grade Penalty [1-4]
+ writeByte(0); // Armor Grade Penalty [1-4]
+ writeByte(0); // Death Penalty [1-15, 0 = disabled)], not used anymore in Ertheia
+ writeByte(0); // Old count for charged souls.
+ writeByte(_mask);
+ writeByte(_player.getChargedSouls(SoulType.SHADOW)); // Shadow souls
+ writeByte(_player.getChargedSouls(SoulType.LIGHT)); // Light souls
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
index 9f8d576148..b8d026325d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class Ex2ndPasswordAck implements IClientOutgoingPacket
+public class Ex2ndPasswordAck extends ServerPacket
{
// TODO: Enum
public static final int SUCCESS = 0;
@@ -38,12 +37,11 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet);
- packet.writeC(_status);
- packet.writeD(_response == WRONG_PATTERN ? 1 : 0);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_2ND_PASSWORD_ACK.writeId(this);
+ writeByte(_status);
+ writeInt(_response == WRONG_PATTERN);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
index c86b5185d0..6df1995da3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class Ex2ndPasswordCheck implements IClientOutgoingPacket
+public class Ex2ndPasswordCheck extends ServerPacket
{
// TODO: Enum
public static final int PASSWORD_NEW = 0;
@@ -37,11 +36,10 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet);
- packet.writeD(_windowType);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_2ND_PASSWORD_CHECK.writeId(this);
+ writeInt(_windowType);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
index f6731bf18f..a29a5eb13b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class Ex2ndPasswordVerify implements IClientOutgoingPacket
+public class Ex2ndPasswordVerify extends ServerPacket
{
// TODO: Enum
public static final int PASSWORD_OK = 0;
@@ -39,11 +38,10 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet);
- packet.writeD(_mode);
- packet.writeD(_wrongTentatives);
- return true;
+ ServerPackets.EX_2ND_PASSWORD_VERIFY.writeId(this);
+ writeInt(_mode);
+ writeInt(_wrongTentatives);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java
index db551344ef..caeaaab6d7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java
@@ -19,12 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket
+public class ExAbnormalStatusUpdateFromTarget extends ServerPacket
{
private final Creature _creature;
private final List _effects = new ArrayList<>();
@@ -42,20 +41,19 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet);
- packet.writeD(_creature.getObjectId());
- packet.writeH(_effects.size());
+ ServerPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(this);
+ writeInt(_creature.getObjectId());
+ writeShort(_effects.size());
for (BuffInfo info : _effects)
{
- packet.writeD(info.getSkill().getDisplayId());
- packet.writeH(info.getSkill().getDisplayLevel());
- // packet.writeH(info.getSkill().getSubLevel());
- packet.writeH(info.getSkill().getAbnormalType().getClientId());
- writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime());
- packet.writeD(info.getEffectorObjectId());
+ writeInt(info.getSkill().getDisplayId());
+ writeShort(info.getSkill().getDisplayLevel());
+ // writeShort(info.getSkill().getSubLevel());
+ writeShort(info.getSkill().getAbnormalType().getClientId());
+ writeOptionalInt(info.getSkill().isAura() ? -1 : info.getTime());
+ writeInt(info.getEffectorObjectId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java
index f3abd6ec5c..0127b10459 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.AcquireSkillType;
import org.l2jmobius.gameserver.model.SkillLearn;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExAcquirableSkillListByClass implements IClientOutgoingPacket
+public class ExAcquirableSkillListByClass extends ServerPacket
{
private final Collection _learnable;
private final AcquireSkillType _type;
@@ -38,24 +37,23 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet);
- packet.writeH(_type.getId());
- packet.writeH(_learnable.size());
+ ServerPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(this);
+ writeShort(_type.getId());
+ writeShort(_learnable.size());
for (SkillLearn skill : _learnable)
{
- packet.writeD(skill.getSkillId());
- packet.writeH(skill.getSkillLevel());
- packet.writeH(skill.getSkillLevel());
- packet.writeC(skill.getGetLevel());
- packet.writeQ(skill.getLevelUpSp());
- packet.writeC(skill.getRequiredItems().size());
+ writeInt(skill.getSkillId());
+ writeShort(skill.getSkillLevel());
+ writeShort(skill.getSkillLevel());
+ writeByte(skill.getGetLevel());
+ writeLong(skill.getLevelUpSp());
+ writeByte(skill.getRequiredItems().size());
if (_type == AcquireSkillType.SUBPLEDGE)
{
- packet.writeH(0);
+ writeShort(0);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
index 0627a0c098..9df735739f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
@@ -20,17 +20,16 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExAcquireSkillInfo implements IClientOutgoingPacket
+public class ExAcquireSkillInfo extends ServerPacket
{
private final int _id;
private final int _level;
@@ -58,26 +57,25 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet);
- packet.writeD(_id);
- packet.writeD(_level);
- packet.writeQ(_spCost);
- packet.writeH(_minLevel);
- packet.writeH(_dualClassLevel);
- packet.writeD(_itemReq.size());
+ ServerPackets.EX_ACQUIRE_SKILL_INFO.writeId(this);
+ writeInt(_id);
+ writeInt(_level);
+ writeLong(_spCost);
+ writeShort(_minLevel);
+ writeShort(_dualClassLevel);
+ writeInt(_itemReq.size());
for (List holder : _itemReq)
{
- packet.writeD(holder.get(0).getId());
- packet.writeQ(holder.get(0).getCount());
+ writeInt(holder.get(0).getId());
+ writeLong(holder.get(0).getCount());
}
- packet.writeD(_skillRem.size());
+ writeInt(_skillRem.size());
for (Skill skill : _skillRem)
{
- packet.writeD(skill.getId());
- packet.writeD(skill.getLevel());
+ writeInt(skill.getId());
+ writeInt(skill.getLevel());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java
index ff8c526ec4..3e0f243076 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExAdenaInvenCount implements IClientOutgoingPacket
+public class ExAdenaInvenCount extends ServerPacket
{
private final Player _player;
@@ -33,11 +32,10 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet);
- packet.writeQ(_player.getAdena());
- packet.writeH(_player.getInventory().getSize());
- return true;
+ ServerPackets.EX_ADENA_INVEN_COUNT.writeId(this);
+ writeLong(_player.getAdena());
+ writeShort(_player.getInventory().getSize());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
index 5ef11e0f1e..0b5effd7d0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.AirShip;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExAirShipInfo implements IClientOutgoingPacket
+public class ExAirShipInfo extends ServerPacket
{
// store some parameters, because they can be changed during broadcast
private final AirShip _ship;
@@ -47,39 +46,38 @@ public class ExAirShipInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet);
- packet.writeD(_ship.getObjectId());
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- packet.writeD(_captain);
- packet.writeD(_moveSpeed);
- packet.writeD(_rotationSpeed);
- packet.writeD(_helm);
+ ServerPackets.EX_AIR_SHIP_INFO.writeId(this);
+ writeInt(_ship.getObjectId());
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
+ writeInt(_captain);
+ writeInt(_moveSpeed);
+ writeInt(_rotationSpeed);
+ writeInt(_helm);
if (_helm != 0)
{
// TODO: unhardcode these!
- packet.writeD(0x16e); // Controller X
- packet.writeD(0x00); // Controller Y
- packet.writeD(0x6b); // Controller Z
- packet.writeD(0x15c); // Captain X
- packet.writeD(0x00); // Captain Y
- packet.writeD(0x69); // Captain Z
+ writeInt(0x16e); // Controller X
+ writeInt(0x00); // Controller Y
+ writeInt(0x6b); // Controller Z
+ writeInt(0x15c); // Captain X
+ writeInt(0x00); // Captain Y
+ writeInt(0x69); // Captain Z
}
else
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
- packet.writeD(_ship.getFuel());
- packet.writeD(_ship.getMaxFuel());
- return true;
+ writeInt(_ship.getFuel());
+ writeInt(_ship.getMaxFuel());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
index 8b37f4fc0a..8c4dfc91d5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.AirShip;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExAirShipStopMove implements IClientOutgoingPacket
+public class ExAirShipStopMove extends ServerPacket
{
private final int _playerId;
private final int _airShipId;
@@ -39,14 +38,13 @@ public class ExAirShipStopMove implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet);
- packet.writeD(_airShipId);
- packet.writeD(_playerId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(this);
+ writeInt(_airShipId);
+ writeInt(_playerId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
index 52958f931b..893acc75f2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.VehiclePathPoint;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExAirShipTeleportList implements IClientOutgoingPacket
+public class ExAirShipTeleportList extends ServerPacket
{
private final int _dockId;
private final VehiclePathPoint[][] _teleports;
@@ -34,28 +33,27 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet);
- packet.writeD(_dockId);
+ ServerPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(this);
+ writeInt(_dockId);
if (_teleports != null)
{
- packet.writeD(_teleports.length);
+ writeInt(_teleports.length);
for (int i = 0; i < _teleports.length; i++)
{
- packet.writeD(i - 1);
- packet.writeD(_fuelConsumption[i]);
+ writeInt(i - 1);
+ writeInt(_fuelConsumption[i]);
final VehiclePathPoint[] path = _teleports[i];
final VehiclePathPoint dst = path[path.length - 1];
- packet.writeD(dst.getX());
- packet.writeD(dst.getY());
- packet.writeD(dst.getZ());
+ writeInt(dst.getX());
+ writeInt(dst.getY());
+ writeInt(dst.getZ());
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java
index 7918022c72..dcf2d236b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java
@@ -19,18 +19,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExAlchemySkillList implements IClientOutgoingPacket
+public class ExAlchemySkillList extends ServerPacket
{
private final List _skills = new ArrayList<>();
@@ -47,17 +46,16 @@ public class ExAlchemySkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet);
- packet.writeD(_skills.size());
+ ServerPackets.EX_ALCHEMY_SKILL_LIST.writeId(this);
+ writeInt(_skills.size());
for (Skill skill : _skills)
{
- packet.writeD(skill.getId());
- packet.writeD(skill.getLevel());
- packet.writeQ(0); // Always 0 on Naia, SP i guess?
- packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not
+ writeInt(skill.getId());
+ writeInt(skill.getLevel());
+ writeLong(0); // Always 0 on Naia, SP I guess?
+ writeByte(skill.getId() != CommonSkill.ALCHEMY_CUBE.getId()); // This is type in flash, visible or not
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java
index 83df2cdde5..b80d9d7990 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExAlterSkillRequest implements IClientOutgoingPacket
+public class ExAlterSkillRequest extends ServerPacket
{
private final int _currentSkillId;
private final int _nextSkillId;
@@ -36,12 +35,11 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet);
- packet.writeD(_nextSkillId);
- packet.writeD(_currentSkillId);
- packet.writeD(_alterTime);
- return true;
+ ServerPackets.EX_ALTER_SKILL_REQUEST.writeId(this);
+ writeInt(_nextSkillId);
+ writeInt(_currentSkillId);
+ writeInt(_alterTime);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
index 1990e1e701..2258ac5344 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExAskCoupleAction implements IClientOutgoingPacket
+public class ExAskCoupleAction extends ServerPacket
{
private final int _objectId;
private final int _actionId;
@@ -34,11 +33,10 @@ public class ExAskCoupleAction implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet);
- packet.writeD(_actionId);
- packet.writeD(_objectId);
- return true;
+ ServerPackets.EX_ASK_COUPLE_ACTION.writeId(this);
+ writeInt(_actionId);
+ writeInt(_objectId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
index 45615daf5a..4a46ab3f01 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Asks the player to join a CC
* @author chris_00
*/
-public class ExAskJoinMPCC implements IClientOutgoingPacket
+public class ExAskJoinMPCC extends ServerPacket
{
private final String _requestorName;
@@ -36,11 +35,10 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet);
- packet.writeS(_requestorName); // name of CCLeader
- packet.writeD(0); // TODO: Find me
- return true;
+ ServerPackets.EX_ASK_JOIN_MPCC.writeId(this);
+ writeString(_requestorName); // name of CCLeader
+ writeInt(0); // TODO: Find me
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
index 908022ff7e..7d1e4a1cc0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExAskJoinPartyRoom implements IClientOutgoingPacket
+public class ExAskJoinPartyRoom extends ServerPacket
{
private final String _charName;
private final String _roomName;
@@ -35,11 +34,10 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet);
- packet.writeS(_charName);
- packet.writeS(_roomName);
- return true;
+ ServerPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(this);
+ writeString(_charName);
+ writeString(_roomName);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
index 1551840013..751db2338d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.PartyDistributionType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExAskModifyPartyLooting implements IClientOutgoingPacket
+public class ExAskModifyPartyLooting extends ServerPacket
{
private final String _requestor;
private final PartyDistributionType _partyDistributionType;
@@ -35,11 +34,10 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet);
- packet.writeS(_requestor);
- packet.writeD(_partyDistributionType.getId());
- return true;
+ ServerPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(this);
+ writeString(_requestor);
+ writeInt(_partyDistributionType.getId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
index fa62c8a207..0525ae463e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.AttributeType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExAttributeEnchantResult implements IClientOutgoingPacket
+public class ExAttributeEnchantResult extends ServerPacket
{
private final int _result;
- private final int _isWeapon;
+ private final boolean _isWeapon;
private final int _type;
private final int _before;
private final int _after;
@@ -33,7 +32,7 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket
public ExAttributeEnchantResult(int result, boolean isWeapon, AttributeType type, int before, int after, int successCount, int failedCount)
{
_result = result;
- _isWeapon = isWeapon ? 1 : 0;
+ _isWeapon = isWeapon;
_type = type.getClientId();
_before = before;
_after = after;
@@ -42,16 +41,15 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet);
- packet.writeD(_result);
- packet.writeC(_isWeapon);
- packet.writeH(_type);
- packet.writeH(_before);
- packet.writeH(_after);
- packet.writeH(_successCount);
- packet.writeH(_failedCount);
- return true;
+ ServerPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(this);
+ writeInt(_result);
+ writeByte(_isWeapon);
+ writeShort(_type);
+ writeShort(_before);
+ writeShort(_after);
+ writeShort(_successCount);
+ writeShort(_failedCount);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
index 3d65055b3c..7d8135a836 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExAutoSoulShot implements IClientOutgoingPacket
+public class ExAutoSoulShot extends ServerPacket
{
private final int _itemId;
private final boolean _enable;
@@ -38,12 +37,11 @@ public class ExAutoSoulShot implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet);
- packet.writeD(_itemId);
- packet.writeD(_enable ? 1 : 0);
- packet.writeD(_type);
- return true;
+ ServerPackets.EX_AUTO_SOUL_SHOT.writeId(this);
+ writeInt(_itemId);
+ writeInt(_enable);
+ writeInt(_type);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBRNewIconCashBtnWnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBRNewIconCashBtnWnd.java
index 5046567b90..ddc5ccdeae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBRNewIconCashBtnWnd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBRNewIconCashBtnWnd.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gabriel Costa Souza
*/
-public class ExBRNewIconCashBtnWnd implements IClientOutgoingPacket
+public class ExBRNewIconCashBtnWnd extends ServerPacket
{
private final short _active;
@@ -32,10 +31,9 @@ public class ExBRNewIconCashBtnWnd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_NEW_ICON_CASH_BTN_WND.writeId(packet);
- packet.writeH(_active);
- return true;
+ ServerPackets.EX_BR_NEW_ICON_CASH_BTN_WND.writeId(this);
+ writeShort(_active);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
index a8137347ec..d79813ff77 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExBaseAttributeCancelResult implements IClientOutgoingPacket
+public class ExBaseAttributeCancelResult extends ServerPacket
{
private final int _objId;
private final byte _attribute;
@@ -34,12 +33,11 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet);
- packet.writeD(1); // result
- packet.writeD(_objId);
- packet.writeD(_attribute);
- return true;
+ ServerPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(this);
+ writeInt(1); // result
+ writeInt(_objId);
+ writeInt(_attribute);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index a9f2ca61a3..9540e799e2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExBasicActionList implements IClientOutgoingPacket
+public class ExBasicActionList extends ServerPacket
{
//@formatter:off
public static final int[] ACTIONS_ON_TRANSFORM =
@@ -156,14 +155,13 @@ public class ExBasicActionList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet);
- packet.writeD(_actionIds.length);
- for (int _actionId : _actionIds)
+ ServerPackets.EX_BASIC_ACTION_LIST.writeId(this);
+ writeInt(_actionIds.length);
+ for (int actionId : _actionIds)
{
- packet.writeD(_actionId);
+ writeInt(actionId);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java
index d32dca4d21..83295be1ee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java
@@ -22,17 +22,16 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.BeautyShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.beautyshop.BeautyData;
import org.l2jmobius.gameserver.model.beautyshop.BeautyItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExBeautyItemList implements IClientOutgoingPacket
+public class ExBeautyItemList extends ServerPacket
{
private static final int HAIR_TYPE = 0;
private static final int FACE_TYPE = 1;
@@ -58,45 +57,44 @@ public class ExBeautyItemList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet);
- packet.writeD(HAIR_TYPE);
- packet.writeD(_beautyData.getHairList().size());
+ ServerPackets.EX_BEAUTY_ITEM_LIST.writeId(this);
+ writeInt(HAIR_TYPE);
+ writeInt(_beautyData.getHairList().size());
for (BeautyItem hair : _beautyData.getHairList().values())
{
- packet.writeD(0); // ?
- packet.writeD(hair.getId());
- packet.writeD(hair.getAdena());
- packet.writeD(hair.getResetAdena());
- packet.writeD(hair.getBeautyShopTicket());
- packet.writeD(1); // Limit
+ writeInt(0); // ?
+ writeInt(hair.getId());
+ writeInt(hair.getAdena());
+ writeInt(hair.getResetAdena());
+ writeInt(hair.getBeautyShopTicket());
+ writeInt(1); // Limit
}
- packet.writeD(FACE_TYPE);
- packet.writeD(_beautyData.getFaceList().size());
+ writeInt(FACE_TYPE);
+ writeInt(_beautyData.getFaceList().size());
for (BeautyItem face : _beautyData.getFaceList().values())
{
- packet.writeD(0); // ?
- packet.writeD(face.getId());
- packet.writeD(face.getAdena());
- packet.writeD(face.getResetAdena());
- packet.writeD(face.getBeautyShopTicket());
- packet.writeD(1); // Limit
+ writeInt(0); // ?
+ writeInt(face.getId());
+ writeInt(face.getAdena());
+ writeInt(face.getResetAdena());
+ writeInt(face.getBeautyShopTicket());
+ writeInt(1); // Limit
}
- packet.writeD(COLOR_TYPE);
- packet.writeD(_colorCount);
+ writeInt(COLOR_TYPE);
+ writeInt(_colorCount);
for (Entry> entry : _colorData.entrySet())
{
for (BeautyItem color : entry.getValue())
{
- packet.writeD(entry.getKey());
- packet.writeD(color.getId());
- packet.writeD(color.getAdena());
- packet.writeD(color.getResetAdena());
- packet.writeD(color.getBeautyShopTicket());
- packet.writeD(1);
+ writeInt(entry.getKey());
+ writeInt(color.getId());
+ writeInt(color.getAdena());
+ writeInt(color.getResetAdena());
+ writeInt(color.getBeautyShopTicket());
+ writeInt(1);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
index 6d4c45cb2b..84a0d0178f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
**/
-public class ExBirthdayPopup implements IClientOutgoingPacket
+public class ExBirthdayPopup extends ServerPacket
{
public static final ExBirthdayPopup STATIC_PACKET = new ExBirthdayPopup();
@@ -31,9 +30,8 @@ public class ExBirthdayPopup implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet);
- return true;
+ ServerPackets.EX_NOTIFY_BIRTH_DAY.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
index 43e525f05f..5cc9fccc40 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Special event info packet.
* @author Kerberos
* @author mrTJO
*/
-public class ExBrBroadcastEventState implements IClientOutgoingPacket
+public class ExBrBroadcastEventState extends ServerPacket
{
public static final int APRIL_FOOLS = 20090401;
public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100)
@@ -62,18 +61,17 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet);
- packet.writeD(_eventId);
- packet.writeD(_eventState);
- packet.writeD(_param0);
- packet.writeD(_param1);
- packet.writeD(_param2);
- packet.writeD(_param3);
- packet.writeD(_param4);
- packet.writeS(_param5);
- packet.writeS(_param6);
- return true;
+ ServerPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(this);
+ writeInt(_eventId);
+ writeInt(_eventState);
+ writeInt(_param0);
+ writeInt(_param1);
+ writeInt(_param2);
+ writeInt(_param3);
+ writeInt(_param4);
+ writeString(_param5);
+ writeString(_param6);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
index c0683c8797..7312951925 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
@@ -16,8 +16,7 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Eva's Inferno event packet. info params:
@@ -25,7 +24,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
* value (depending on type: for type 1 - % value; for type 2 - 20573-20575),
* state (0-1), endtime (only when type 2)
*/
-public class ExBrBuffEventState implements IClientOutgoingPacket
+public class ExBrBuffEventState extends ServerPacket
{
private final int _type; // 1 - %, 2 - npcId
private final int _value; // depending on type: for type 1 - % value; for type 2 - 20573-20575
@@ -41,13 +40,12 @@ public class ExBrBuffEventState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet);
- packet.writeD(_type);
- packet.writeD(_value);
- packet.writeD(_state);
- packet.writeD(_endtime);
- return true;
+ ServerPackets.EX_BR_BUFF_EVENT_STATE.writeId(this);
+ writeInt(_type);
+ writeInt(_value);
+ writeInt(_state);
+ writeInt(_endtime);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
index 8e009d7b09..7d7e411170 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Halloween rank list server packet.
*/
-public class ExBrLoadEventTopRankers implements IClientOutgoingPacket
+public class ExBrLoadEventTopRankers extends ServerPacket
{
private final int _eventId;
private final int _day;
@@ -40,14 +39,13 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet);
- packet.writeD(_eventId);
- packet.writeD(_day);
- packet.writeD(_count);
- packet.writeD(_bestScore);
- packet.writeD(_myScore);
- return true;
+ ServerPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(this);
+ writeInt(_eventId);
+ writeInt(_day);
+ writeInt(_count);
+ writeInt(_bestScore);
+ writeInt(_myScore);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
index 291f7a6b55..8ca76b4a0f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author GodKratos
*/
-public class ExBrPremiumState implements IClientOutgoingPacket
+public class ExBrPremiumState extends ServerPacket
{
private final Player _player;
@@ -33,11 +32,10 @@ public class ExBrPremiumState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0);
- return true;
+ ServerPackets.EX_BR_PREMIUM_STATE.writeId(this);
+ writeInt(_player.getObjectId());
+ writeByte(_player.hasPremiumStatus() || (_player.getVipTier() > 0));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
index ed598e5198..21e66ecc86 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
@@ -21,11 +21,10 @@ import java.util.Collection;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author ShanSoft
@@ -56,40 +55,39 @@ public class ExBuySellList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet);
- packet.writeD(1); // Type SELL
- packet.writeD(_inventorySlots);
+ ServerPackets.EX_BUY_SELL_LIST.writeId(this);
+ writeInt(1); // Type SELL
+ writeInt(_inventorySlots);
if ((_sellList != null))
{
- packet.writeH(_sellList.size());
+ writeShort(_sellList.size());
for (Item item : _sellList)
{
- writeItem(packet, item);
- packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getTemplate().getReferencePrice() / 2);
+ writeItem(item);
+ writeLong(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getTemplate().getReferencePrice() / 2);
}
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
if ((_refundList != null) && !_refundList.isEmpty())
{
- packet.writeH(_refundList.size());
+ writeShort(_refundList.size());
int i = 0;
for (Item item : _refundList)
{
- writeItem(packet, item);
- packet.writeD(i++);
- packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : (item.getTemplate().getReferencePrice() / 2) * item.getCount());
+ writeItem(item);
+ writeInt(i++);
+ writeLong(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : (item.getTemplate().getReferencePrice() / 2) * item.getCount());
}
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
- packet.writeC(_done ? 1 : 0);
- return true;
+ writeByte(_done);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java
index e0ec81e0e7..643af19786 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.CastleSide;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExCastleState implements IClientOutgoingPacket
+public class ExCastleState extends ServerPacket
{
private final int _castleId;
private final CastleSide _castleSide;
@@ -36,11 +35,10 @@ public class ExCastleState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CASTLE_STATE.writeId(packet);
- packet.writeD(_castleId);
- packet.writeD(_castleSide.ordinal());
- return true;
+ ServerPackets.EX_CASTLE_STATE.writeId(this);
+ writeInt(_castleId);
+ writeInt(_castleSide.ordinal());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
index a8196c7a83..ebafcadf4d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExChangeClientEffectInfo implements IClientOutgoingPacket
+public class ExChangeClientEffectInfo extends ServerPacket
{
public static final ExChangeClientEffectInfo STATIC_FREYA_DEFAULT = new ExChangeClientEffectInfo(0, 0, 1);
public static final ExChangeClientEffectInfo STATIC_FREYA_DESTROYED = new ExChangeClientEffectInfo(0, 0, 2);
@@ -49,12 +48,11 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet);
- packet.writeD(_type);
- packet.writeD(_key);
- packet.writeD(_value);
- return true;
+ ServerPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(this);
+ writeInt(_type);
+ writeInt(_key);
+ writeInt(_value);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
index eea59162ee..064766b5a7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExChangeNpcState implements IClientOutgoingPacket
+public class ExChangeNpcState extends ServerPacket
{
private final int _objId;
private final int _state;
@@ -34,11 +33,10 @@ public class ExChangeNpcState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(_state);
- return true;
+ ServerPackets.EX_CHANGE_NPC_STATE.writeId(this);
+ writeInt(_objId);
+ writeInt(_state);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
index 45f2805517..fe4a8c502d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Migi
*/
-public class ExChangePostState implements IClientOutgoingPacket
+public class ExChangePostState extends ServerPacket
{
private final boolean _receivedBoard;
private final int[] _changedMsgIds;
@@ -46,16 +45,15 @@ public class ExChangePostState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet);
- packet.writeD(_receivedBoard ? 1 : 0);
- packet.writeD(_changedMsgIds.length);
+ ServerPackets.EX_CHANGE_POST_STATE.writeId(this);
+ writeInt(_receivedBoard);
+ writeInt(_changedMsgIds.length);
for (int postId : _changedMsgIds)
{
- packet.writeD(postId); // postId
- packet.writeD(_changeId); // state
+ writeInt(postId); // postId
+ writeInt(_changeId); // state
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java
index d765ab54e0..ee54e26f05 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExChangeToAwakenedClass implements IClientOutgoingPacket
+public class ExChangeToAwakenedClass extends ServerPacket
{
private final int _classId;
@@ -32,10 +31,9 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet);
- packet.writeD(_classId);
- return true;
+ ServerPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(this);
+ writeInt(_classId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index 1e9b8e9dc8..af4899959e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.HashSet;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.ElementalAttributeData;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Kerberos
*/
-public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
+public class ExChooseInventoryAttributeItem extends ServerPacket
{
private final int _itemId;
private final long _count;
@@ -58,20 +57,19 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet);
- packet.writeD(_itemId);
- packet.writeQ(_count);
- packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire
- packet.writeD(_atribute == AttributeType.WATER ? 1 : 0); // Water
- packet.writeD(_atribute == AttributeType.WIND ? 1 : 0); // Wind
- packet.writeD(_atribute == AttributeType.EARTH ? 1 : 0); // Earth
- packet.writeD(_atribute == AttributeType.HOLY ? 1 : 0); // Holy
- packet.writeD(_atribute == AttributeType.DARK ? 1 : 0); // Unholy
- packet.writeD(_level); // Item max attribute level
- packet.writeD(_items.size());
- _items.forEach(packet::writeD);
- return true;
+ ServerPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(this);
+ writeInt(_itemId);
+ writeLong(_count);
+ writeInt(_atribute == AttributeType.FIRE); // Fire
+ writeInt(_atribute == AttributeType.WATER); // Water
+ writeInt(_atribute == AttributeType.WIND); // Wind
+ writeInt(_atribute == AttributeType.EARTH); // Earth
+ writeInt(_atribute == AttributeType.HOLY); // Holy
+ writeInt(_atribute == AttributeType.DARK); // Unholy
+ writeInt(_level); // Item max attribute level
+ writeInt(_items.size());
+ _items.forEach(this::writeInt);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
index 238882cd11..96d1d742aa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Close the CommandChannel Information window
* @author chris_00
*/
-public class ExCloseMPCC implements IClientOutgoingPacket
+public class ExCloseMPCC extends ServerPacket
{
public static final ExCloseMPCC STATIC_PACKET = new ExCloseMPCC();
@@ -32,9 +31,8 @@ public class ExCloseMPCC implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CLOSE_MPCC.writeId(packet);
- return true;
+ ServerPackets.EX_CLOSE_MPCC.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
index 877bca760a..b2e5222212 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ExClosePartyRoom implements IClientOutgoingPacket
+public class ExClosePartyRoom extends ServerPacket
{
public static final ExClosePartyRoom STATIC_PACKET = new ExClosePartyRoom();
@@ -31,9 +30,8 @@ public class ExClosePartyRoom implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet);
- return true;
+ ServerPackets.EX_CLOSE_PARTY_ROOM.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java
index 1d02c972b5..1f8d477597 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.FenceState;
import org.l2jmobius.gameserver.model.actor.instance.Fence;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author HoridoJoho / FBIagent
*/
-public class ExColosseumFenceInfo implements IClientOutgoingPacket
+public class ExColosseumFenceInfo extends ServerPacket
{
private final int _objId;
private final int _x;
@@ -51,16 +50,15 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(_clientState);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_width);
- packet.writeD(_length);
- return true;
+ ServerPackets.EX_COLOSSEUM_FENCE_INFO.writeId(this);
+ writeInt(_objId);
+ writeInt(_clientState);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_width);
+ writeInt(_length);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
index b72bef93e8..b41a684b45 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO & UnAfraid
*/
-public class ExConfirmAddingContact implements IClientOutgoingPacket
+public class ExConfirmAddingContact extends ServerPacket
{
private final String _charName;
private final boolean _added;
@@ -34,11 +33,10 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet);
- packet.writeS(_charName);
- packet.writeD(_added ? 1 : 0);
- return true;
+ ServerPackets.EX_AGIT_AUCTION_CMD.writeId(this);
+ writeString(_charName);
+ writeInt(_added);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
index c832d507ed..87297fda4e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExCubeGameAddPlayer implements IClientOutgoingPacket
+public class ExCubeGameAddPlayer extends ServerPacket
{
- Player _player;
- boolean _isRedTeam;
+ private final Player _player;
+ private final boolean _isRedTeam;
/**
* Add Player To Minigame Waiting List
@@ -40,14 +39,13 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet);
- packet.writeD(1);
- packet.writeD(0xffffffff);
- packet.writeD(_isRedTeam ? 1 : 0);
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getName());
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_LIST.writeId(this);
+ writeInt(1);
+ writeInt(0xffffffff);
+ writeInt(_isRedTeam);
+ writeInt(_player.getObjectId());
+ writeString(_player.getName());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
index 847ea93e6a..a805332c12 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExCubeGameChangePoints implements IClientOutgoingPacket
+public class ExCubeGameChangePoints extends ServerPacket
{
- int _timeLeft;
- int _bluePoints;
- int _redPoints;
+ private final int _timeLeft;
+ private final int _bluePoints;
+ private final int _redPoints;
/**
* Change Client Point Counter
@@ -42,13 +41,12 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet);
- packet.writeD(2);
- packet.writeD(_timeLeft);
- packet.writeD(_bluePoints);
- packet.writeD(_redPoints);
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_STATE.writeId(this);
+ writeInt(2);
+ writeInt(_timeLeft);
+ writeInt(_bluePoints);
+ writeInt(_redPoints);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
index a2f2e61ded..3c81d2a02a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExCubeGameChangeTeam implements IClientOutgoingPacket
+public class ExCubeGameChangeTeam extends ServerPacket
{
- Player _player;
- boolean _fromRedTeam;
+ private final Player _player;
+ private final boolean _fromRedTeam;
/**
* Move Player from Team x to Team y
@@ -40,13 +39,12 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet);
- packet.writeD(5);
- packet.writeD(_player.getObjectId());
- packet.writeD(_fromRedTeam ? 1 : 0);
- packet.writeD(_fromRedTeam ? 0 : 1);
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_LIST.writeId(this);
+ writeInt(5);
+ writeInt(_player.getObjectId());
+ writeInt(_fromRedTeam);
+ writeInt(!_fromRedTeam);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
index 136b439283..957ad64210 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket
+public class ExCubeGameChangeTimeToStart extends ServerPacket
{
- int _seconds;
+ private final int _seconds;
/**
* Update Minigame Waiting List Time to Start
@@ -36,11 +35,10 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet);
- packet.writeD(3);
- packet.writeD(_seconds);
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_LIST.writeId(this);
+ writeInt(3);
+ writeInt(_seconds);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
index 9bdba49029..c42bc0b7eb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Close Minigame Waiting List
* @author mrTJO
*/
-public class ExCubeGameCloseUI implements IClientOutgoingPacket
+public class ExCubeGameCloseUI extends ServerPacket
{
public static final ExCubeGameCloseUI STATIC_PACKET = new ExCubeGameCloseUI();
@@ -32,10 +31,9 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet);
- packet.writeD(0xffffffff);
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_LIST.writeId(this);
+ writeInt(0xffffffff);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
index 3177e7a488..d69e23a070 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* *
* @author mrTJO
*/
-public class ExCubeGameEnd implements IClientOutgoingPacket
+public class ExCubeGameEnd extends ServerPacket
{
- boolean _isRedTeamWin;
+ private final boolean _isRedTeamWin;
/**
* Show Minigame Results
@@ -37,12 +36,11 @@ public class ExCubeGameEnd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet);
- packet.writeD(1);
- packet.writeD(_isRedTeamWin ? 1 : 0);
- packet.writeD(0); // TODO: Find me!
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_STATE.writeId(this);
+ writeInt(1);
+ writeInt(_isRedTeamWin);
+ writeInt(0); // TODO: Find me!
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
index 8b96bb545f..5a8157a0ff 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
@@ -16,21 +16,20 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket
+public class ExCubeGameExtendedChangePoints extends ServerPacket
{
- int _timeLeft;
- int _bluePoints;
- int _redPoints;
- boolean _isRedTeam;
- Player _player;
- int _playerPoints;
+ private final int _timeLeft;
+ private final int _bluePoints;
+ private final int _redPoints;
+ private final boolean _isRedTeam;
+ private final Player _player;
+ private final int _playerPoints;
/**
* Update a Secret Point Counter (used by client when receive ExCubeGameEnd)
@@ -52,16 +51,15 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet);
- packet.writeD(0);
- packet.writeD(_timeLeft);
- packet.writeD(_bluePoints);
- packet.writeD(_redPoints);
- packet.writeD(_isRedTeam ? 1 : 0);
- packet.writeD(_player.getObjectId());
- packet.writeD(_playerPoints);
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_STATE.writeId(this);
+ writeInt(0);
+ writeInt(_timeLeft);
+ writeInt(_bluePoints);
+ writeInt(_redPoints);
+ writeInt(_isRedTeam);
+ writeInt(_player.getObjectId());
+ writeInt(_playerPoints);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
index c084789f13..c94a8f85a0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExCubeGameRemovePlayer implements IClientOutgoingPacket
+public class ExCubeGameRemovePlayer extends ServerPacket
{
- Player _player;
- boolean _isRedTeam;
+ private final Player _player;
+ private final boolean _isRedTeam;
/**
* Remove Player from Minigame Waiting List
@@ -40,13 +39,12 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet);
- packet.writeD(2);
- packet.writeD(0xffffffff);
- packet.writeD(_isRedTeam ? 1 : 0);
- packet.writeD(_player.getObjectId());
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_LIST.writeId(this);
+ writeInt(2);
+ writeInt(0xffffffff);
+ writeInt(_isRedTeam);
+ writeInt(_player.getObjectId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
index 35a3f289d1..c60fc59c0b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Show Confirm Dialog for 10 seconds
* @author mrTJO
*/
-public class ExCubeGameRequestReady implements IClientOutgoingPacket
+public class ExCubeGameRequestReady extends ServerPacket
{
public static final ExCubeGameRequestReady STATIC_PACKET = new ExCubeGameRequestReady();
@@ -32,10 +31,9 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet);
- packet.writeD(4);
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_LIST.writeId(this);
+ writeInt(4);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
index 8b755dd3cc..d7acc2ec96 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExCubeGameTeamList implements IClientOutgoingPacket
+public class ExCubeGameTeamList extends ServerPacket
{
// Players Lists
private final List _bluePlayers;
@@ -47,24 +46,23 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet);
- packet.writeD(0);
- packet.writeD(_roomNumber);
- packet.writeD(0xffffffff);
- packet.writeD(_bluePlayers.size());
+ ServerPackets.EX_BLOCK_UP_SET_LIST.writeId(this);
+ writeInt(0);
+ writeInt(_roomNumber);
+ writeInt(0xffffffff);
+ writeInt(_bluePlayers.size());
for (Player player : _bluePlayers)
{
- packet.writeD(player.getObjectId());
- packet.writeS(player.getName());
+ writeInt(player.getObjectId());
+ writeString(player.getName());
}
- packet.writeD(_redPlayers.size());
+ writeInt(_redPlayers.size());
for (Player player : _redPlayers)
{
- packet.writeD(player.getObjectId());
- packet.writeS(player.getName());
+ writeInt(player.getObjectId());
+ writeString(player.getName());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
index d000112787..5532312407 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
@@ -18,22 +18,20 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class ExCursedWeaponList implements IClientOutgoingPacket
+public class ExCursedWeaponList extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet);
+ ServerPackets.EX_CURSED_WEAPON_LIST.writeId(this);
final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds();
- packet.writeD(ids.size());
- ids.forEach(packet::writeD);
- return true;
+ writeInt(ids.size());
+ ids.forEach(this::writeInt);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
index 5bc7ff3238..2cc4576de2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Format: (ch) d[ddddd]
* @author -Wooden-
*/
-public class ExCursedWeaponLocation implements IClientOutgoingPacket
+public class ExCursedWeaponLocation extends ServerPacket
{
private final List _cursedWeaponInfo;
@@ -36,26 +35,25 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet);
+ ServerPackets.EX_CURSED_WEAPON_LOCATION.writeId(this);
if (!_cursedWeaponInfo.isEmpty())
{
- packet.writeD(_cursedWeaponInfo.size());
+ writeInt(_cursedWeaponInfo.size());
for (CursedWeaponInfo w : _cursedWeaponInfo)
{
- packet.writeD(w.id);
- packet.writeD(w.activated);
- packet.writeD(w.pos.getX());
- packet.writeD(w.pos.getY());
- packet.writeD(w.pos.getZ());
+ writeInt(w.id);
+ writeInt(w.activated);
+ writeInt(w.pos.getX());
+ writeInt(w.pos.getY());
+ writeInt(w.pos.getZ());
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
public static class CursedWeaponInfo
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java
index 7ddef21299..3aa5484f5f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.DamageTakenHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExDieInfo implements IClientOutgoingPacket
+public class ExDieInfo extends ServerPacket
{
private final Collection- _droppedItems;
private final Collection _lastDamageTaken;
@@ -39,36 +38,35 @@ public class ExDieInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DIE_INFO.writeId(packet);
- packet.writeH(_droppedItems.size());
+ ServerPackets.EX_DIE_INFO.writeId(this);
+ writeShort(_droppedItems.size());
for (Item item : _droppedItems)
{
- packet.writeD(item.getId());
- packet.writeD(item.getEnchantLevel());
- packet.writeD((int) item.getCount());
+ writeInt(item.getId());
+ writeInt(item.getEnchantLevel());
+ writeInt((int) item.getCount());
}
- packet.writeH(_lastDamageTaken.size());
+ writeShort(_lastDamageTaken.size());
for (DamageTakenHolder damageHolder : _lastDamageTaken)
{
if (damageHolder.getCreature().isNpc())
{
- packet.writeH(1);
- packet.writeD(damageHolder.getCreature().getId());
- packet.writeS("");
+ writeShort(1);
+ writeInt(damageHolder.getCreature().getId());
+ writeString("");
}
else
{
final Clan clan = damageHolder.getCreature().getClan();
- packet.writeH(0);
- packet.writeS(damageHolder.getCreature().getName());
- packet.writeS(clan == null ? "" : clan.getName());
+ writeShort(0);
+ writeString(damageHolder.getCreature().getName());
+ writeString(clan == null ? "" : clan.getName());
}
- packet.writeD(damageHolder.getSkillId());
- packet.writeF(damageHolder.getDamage());
- packet.writeH(0); // damage type
+ writeInt(damageHolder.getSkillId());
+ writeDouble(damageHolder.getDamage());
+ writeShort(0); // damage type
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java
index 0456fb9dae..a4d265e763 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExDissmissMPCCRoom implements IClientOutgoingPacket
+public class ExDissmissMPCCRoom extends ServerPacket
{
public static final ExDissmissMPCCRoom STATIC_PACKET = new ExDissmissMPCCRoom();
@@ -31,9 +30,8 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet);
- return true;
+ ServerPackets.EX_DISSMISS_MPCC_ROOM.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
index c731b7c7a9..ee3d16209a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExDuelAskStart implements IClientOutgoingPacket
+public class ExDuelAskStart extends ServerPacket
{
private final String _requestorName;
private final int _partyDuel;
@@ -34,11 +33,10 @@ public class ExDuelAskStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DUEL_ASK_START.writeId(packet);
- packet.writeS(_requestorName);
- packet.writeD(_partyDuel);
- return true;
+ ServerPackets.EX_DUEL_ASK_START.writeId(this);
+ writeString(_requestorName);
+ writeInt(_partyDuel);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
index e9a31bee57..138bd3cd7d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
@@ -16,29 +16,27 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExDuelEnd implements IClientOutgoingPacket
+public class ExDuelEnd extends ServerPacket
{
public static final ExDuelEnd PLAYER_DUEL = new ExDuelEnd(false);
public static final ExDuelEnd PARTY_DUEL = new ExDuelEnd(true);
- private final int _partyDuel;
+ private final boolean _partyDuel;
public ExDuelEnd(boolean isPartyDuel)
{
- _partyDuel = isPartyDuel ? 1 : 0;
+ _partyDuel = isPartyDuel;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DUEL_END.writeId(packet);
- packet.writeD(_partyDuel);
- return true;
+ ServerPackets.EX_DUEL_END.writeId(this);
+ writeInt(_partyDuel);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
index e1fa1cea88..60245f3bfc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
@@ -16,29 +16,27 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExDuelReady implements IClientOutgoingPacket
+public class ExDuelReady extends ServerPacket
{
public static final ExDuelReady PLAYER_DUEL = new ExDuelReady(false);
public static final ExDuelReady PARTY_DUEL = new ExDuelReady(true);
- private final int _partyDuel;
+ private final boolean _partyDuel;
public ExDuelReady(boolean isPartyDuel)
{
- _partyDuel = isPartyDuel ? 1 : 0;
+ _partyDuel = isPartyDuel;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DUEL_READY.writeId(packet);
- packet.writeD(_partyDuel);
- return true;
+ ServerPackets.EX_DUEL_READY.writeId(this);
+ writeInt(_partyDuel);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
index ecdd528a16..c6e0567ce4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
@@ -16,29 +16,27 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExDuelStart implements IClientOutgoingPacket
+public class ExDuelStart extends ServerPacket
{
public static final ExDuelStart PLAYER_DUEL = new ExDuelStart(false);
public static final ExDuelStart PARTY_DUEL = new ExDuelStart(true);
- private final int _partyDuel;
+ private final boolean _partyDuel;
public ExDuelStart(boolean isPartyDuel)
{
- _partyDuel = isPartyDuel ? 1 : 0;
+ _partyDuel = isPartyDuel;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DUEL_START.writeId(packet);
- packet.writeD(_partyDuel);
- return true;
+ ServerPackets.EX_DUEL_START.writeId(this);
+ writeInt(_partyDuel);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
index 5ed0c09675..d09ce0dcdd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExDuelUpdateUserInfo implements IClientOutgoingPacket
+public class ExDuelUpdateUserInfo extends ServerPacket
{
private final Player _player;
@@ -33,19 +32,18 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet);
- packet.writeS(_player.getName());
- packet.writeD(_player.getObjectId());
- packet.writeD(_player.getClassId().getId());
- packet.writeD(_player.getLevel());
- packet.writeD((int) _player.getCurrentHp());
- packet.writeD(_player.getMaxHp());
- packet.writeD((int) _player.getCurrentMp());
- packet.writeD(_player.getMaxMp());
- packet.writeD((int) _player.getCurrentCp());
- packet.writeD(_player.getMaxCp());
- return true;
+ ServerPackets.EX_DUEL_UPDATE_USER_INFO.writeId(this);
+ writeString(_player.getName());
+ writeInt(_player.getObjectId());
+ writeInt(_player.getClassId().getId());
+ writeInt(_player.getLevel());
+ writeInt((int) _player.getCurrentHp());
+ writeInt(_player.getMaxHp());
+ writeInt((int) _player.getCurrentMp());
+ writeInt(_player.getMaxMp());
+ writeInt((int) _player.getCurrentCp());
+ writeInt(_player.getMaxCp());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemFail.java
index a48f9830d8..5fde9b3050 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemFail.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExEnchantRetryToPutItemFail implements IClientOutgoingPacket
+public class ExEnchantRetryToPutItemFail extends ServerPacket
{
public static final ExEnchantRetryToPutItemFail STATIC_PACKET = new ExEnchantRetryToPutItemFail();
@@ -31,9 +30,8 @@ public class ExEnchantRetryToPutItemFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_FAIL.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_FAIL.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemOk.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemOk.java
index 7bf21fe852..38235a0718 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemOk.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantRetryToPutItemOk.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExEnchantRetryToPutItemOk implements IClientOutgoingPacket
+public class ExEnchantRetryToPutItemOk extends ServerPacket
{
public static final ExEnchantRetryToPutItemOk STATIC_PACKET = new ExEnchantRetryToPutItemOk();
@@ -31,9 +30,8 @@ public class ExEnchantRetryToPutItemOk implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_OK.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_OK.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
index f58c0573a8..0fb2a88f63 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExEnchantSkillInfo implements IClientOutgoingPacket
+public class ExEnchantSkillInfo extends ServerPacket
{
private final Set _routes;
private final int _skillId;
@@ -40,23 +39,22 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet);
- packet.writeD(_skillId);
- packet.writeH(_skillLevel);
- packet.writeH(_skillSubLevel);
- packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1);
- packet.writeD(_skillSubLevel > 1000 ? 1 : 0);
- packet.writeD(_routes.size());
+ ServerPackets.EX_ENCHANT_SKILL_INFO.writeId(this);
+ writeInt(_skillId);
+ writeShort(_skillLevel);
+ writeShort(_skillSubLevel);
+ writeInt((_skillSubLevel % 1000) != EnchantSkillGroupsData.MAX_ENCHANT_LEVEL);
+ writeInt(_skillSubLevel > 1000);
+ writeInt(_routes.size());
_routes.forEach(route ->
{
final int routeId = route / 1000;
final int currentRouteId = _skillSubLevel / 1000;
final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route;
- packet.writeH(_skillLevel);
- packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1)));
+ writeShort(_skillLevel);
+ writeShort(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1)));
});
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
index e4ee350e64..7f9d9030bc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
@@ -18,18 +18,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.enums.SkillEnchantType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket
+public class ExEnchantSkillInfoDetail extends ServerPacket
{
private final SkillEnchantType _type;
private final int _skillId;
@@ -47,25 +46,24 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet);
- packet.writeD(_type.ordinal());
- packet.writeD(_skillId);
- packet.writeH(_skillLevel);
- packet.writeH(_skillSubLevel);
+ ServerPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(this);
+ writeInt(_type.ordinal());
+ writeInt(_skillId);
+ writeShort(_skillLevel);
+ writeShort(_skillSubLevel);
if (_enchantSkillHolder != null)
{
- packet.writeQ(_enchantSkillHolder.getSp(_type));
- packet.writeD(_enchantSkillHolder.getChance(_type));
+ writeLong(_enchantSkillHolder.getSp(_type));
+ writeInt(_enchantSkillHolder.getChance(_type));
final Set holders = _enchantSkillHolder.getRequiredItems(_type);
- packet.writeD(holders.size());
+ writeInt(holders.size());
holders.forEach(holder ->
{
- packet.writeD(holder.getId());
- packet.writeD((int) holder.getCount());
+ writeInt(holder.getId());
+ writeInt((int) holder.getCount());
});
}
- return _enchantSkillHolder != null;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
index 1d32f0d725..661ce90f59 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
@@ -19,12 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.SkillEnchantType;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExEnchantSkillList implements IClientOutgoingPacket
+public class ExEnchantSkillList extends ServerPacket
{
private final SkillEnchantType _type;
private final List _skills = new LinkedList<>();
@@ -40,17 +39,16 @@ public class ExEnchantSkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet);
- packet.writeD(_type.ordinal());
- packet.writeD(_skills.size());
+ ServerPackets.EX_ENCHANT_SKILL_LIST.writeId(this);
+ writeInt(_type.ordinal());
+ writeInt(_skills.size());
for (Skill skill : _skills)
{
- packet.writeD(skill.getId());
- packet.writeH(skill.getLevel());
- packet.writeH(skill.getSubLevel());
+ writeInt(skill.getId());
+ writeShort(skill.getLevel());
+ writeShort(skill.getSubLevel());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
index 853d74039f..9ea451132c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExEnchantSkillResult implements IClientOutgoingPacket
+public class ExEnchantSkillResult extends ServerPacket
{
public static final ExEnchantSkillResult STATIC_PACKET_TRUE = new ExEnchantSkillResult(true);
public static final ExEnchantSkillResult STATIC_PACKET_FALSE = new ExEnchantSkillResult(false);
@@ -35,10 +34,9 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet);
- packet.writeD(_enchanted ? 1 : 0);
- return true;
+ ServerPackets.EX_ENCHANT_SKILL_RESULT.writeId(this);
+ writeInt(_enchanted);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java
index e88b864437..bd3eb1dce1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java
@@ -21,13 +21,12 @@ import java.time.ZoneId;
import java.time.zone.ZoneRules;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExEnterWorld implements IClientOutgoingPacket
+public class ExEnterWorld extends ServerPacket
{
private final int _zoneIdOffsetSeconds;
private final int _epochInSeconds;
@@ -43,13 +42,12 @@ public class ExEnterWorld implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENTER_WORLD.writeId(packet);
- packet.writeD(_epochInSeconds);
- packet.writeD(-_zoneIdOffsetSeconds);
- packet.writeD(_daylight);
- packet.writeD(Config.MAX_FREE_TELEPORT_LEVEL);
- return true;
+ ServerPackets.EX_ENTER_WORLD.writeId(this);
+ writeInt(_epochInSeconds);
+ writeInt(-_zoneIdOffsetSeconds);
+ writeInt(_daylight);
+ writeInt(Config.MAX_FREE_TELEPORT_LEVEL);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
index 410bf16510..3fce68a4b0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author janiii
*/
-public class ExEventMatchMessage implements IClientOutgoingPacket
+public class ExEventMatchMessage extends ServerPacket
{
private final int _type;
private final String _message;
@@ -39,11 +38,10 @@ public class ExEventMatchMessage implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet);
- packet.writeC(_type);
- packet.writeS(_message);
- return true;
+ ServerPackets.EX_EVENT_MATCH_MESSAGE.writeId(this);
+ writeByte(_type);
+ writeString(_message);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
index 1946758bf5..908e770cc0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TeleportBookmark;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author ShanSoft
*/
-public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket
+public class ExGetBookMarkInfoPacket extends ServerPacket
{
private final Player _player;
@@ -34,22 +33,21 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet);
- packet.writeD(0); // Dummy
- packet.writeD(_player.getBookMarkSlot());
- packet.writeD(_player.getTeleportBookmarks().size());
+ ServerPackets.EX_GET_BOOK_MARK_INFO.writeId(this);
+ writeInt(0); // Dummy
+ writeInt(_player.getBookMarkSlot());
+ writeInt(_player.getTeleportBookmarks().size());
for (TeleportBookmark tpbm : _player.getTeleportBookmarks())
{
- packet.writeD(tpbm.getId());
- packet.writeD(tpbm.getX());
- packet.writeD(tpbm.getY());
- packet.writeD(tpbm.getZ());
- packet.writeS(tpbm.getName());
- packet.writeD(tpbm.getIcon());
- packet.writeS(tpbm.getTag());
+ writeInt(tpbm.getId());
+ writeInt(tpbm.getX());
+ writeInt(tpbm.getY());
+ writeInt(tpbm.getZ());
+ writeString(tpbm.getName());
+ writeInt(tpbm.getIcon());
+ writeString(tpbm.getTag());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
index 201e8eb49b..7f5ae791b4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
@@ -19,13 +19,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExGetBossRecord implements IClientOutgoingPacket
+public class ExGetBossRecord extends ServerPacket
{
private final Map _bossRecordInfo;
private final int _ranking;
@@ -39,28 +38,27 @@ public class ExGetBossRecord implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet);
- packet.writeD(_ranking);
- packet.writeD(_totalPoints);
+ ServerPackets.EX_GET_BOSS_RECORD.writeId(this);
+ writeInt(_ranking);
+ writeInt(_totalPoints);
if (_bossRecordInfo == null)
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
else
{
- packet.writeD(_bossRecordInfo.size()); // list size
+ writeInt(_bossRecordInfo.size()); // list size
for (Entry entry : _bossRecordInfo.entrySet())
{
- packet.writeD(entry.getKey());
- packet.writeD(entry.getValue());
- packet.writeD(0); // ??
+ writeInt(entry.getKey());
+ writeInt(entry.getValue());
+ writeInt(0); // ??
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
index 85ccad0758..c99a693ec2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExGetOffAirShip implements IClientOutgoingPacket
+public class ExGetOffAirShip extends ServerPacket
{
private final int _playerId;
private final int _airShipId;
@@ -38,14 +37,13 @@ public class ExGetOffAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet);
- packet.writeD(_playerId);
- packet.writeD(_airShipId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.EX_GET_OFF_AIR_SHIP.writeId(this);
+ writeInt(_playerId);
+ writeInt(_airShipId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
index 9a02e49223..ee43e30d84 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExGetOnAirShip implements IClientOutgoingPacket
+public class ExGetOnAirShip extends ServerPacket
{
private final int _playerId;
private final int _airShipId;
@@ -36,14 +35,13 @@ public class ExGetOnAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet);
- packet.writeD(_playerId);
- packet.writeD(_airShipId);
- packet.writeD(_pos.getX());
- packet.writeD(_pos.getY());
- packet.writeD(_pos.getZ());
- return true;
+ ServerPackets.EX_GET_ON_AIR_SHIP.writeId(this);
+ writeInt(_playerId);
+ writeInt(_airShipId);
+ writeInt(_pos.getX());
+ writeInt(_pos.getY());
+ writeInt(_pos.getZ());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
index 704b3212a1..579821612a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.PremiumItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ExGetPremiumItemList implements IClientOutgoingPacket
+public class ExGetPremiumItemList extends ServerPacket
{
private final Player _player;
private final Map _map;
@@ -39,19 +38,18 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet);
- packet.writeD(_map.size());
+ ServerPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(this);
+ writeInt(_map.size());
for (Entry entry : _map.entrySet())
{
final PremiumItem item = entry.getValue();
- packet.writeQ(entry.getKey());
- packet.writeD(item.getItemId());
- packet.writeQ(item.getCount());
- packet.writeD(0); // ?
- packet.writeS(item.getSender());
+ writeLong(entry.getKey());
+ writeInt(item.getItemId());
+ writeLong(item.getCount());
+ writeInt(0); // ?
+ writeString(item.getSender());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
index 8c7b5fef9a..824239285d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
@@ -19,16 +19,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.olympiad.Hero;
import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-, KenM, godson
*/
-public class ExHeroList implements IClientOutgoingPacket
+public class ExHeroList extends ServerPacket
{
private final Map _heroList;
@@ -38,22 +37,21 @@ public class ExHeroList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_HERO_LIST.writeId(packet);
- packet.writeD(_heroList.size());
+ ServerPackets.EX_HERO_LIST.writeId(this);
+ writeInt(_heroList.size());
for (StatSet hero : _heroList.values())
{
- packet.writeS(hero.getString(Olympiad.CHAR_NAME));
- packet.writeD(hero.getInt(Olympiad.CLASS_ID));
- packet.writeS(hero.getString(Hero.CLAN_NAME, ""));
- packet.writeD(0); // hero.getInt(Hero.CLAN_CREST, 0)
- packet.writeS(hero.getString(Hero.ALLY_NAME, ""));
- packet.writeD(0); // hero.getInt(Hero.ALLY_CREST, 0)
- packet.writeD(hero.getInt(Hero.COUNT));
- packet.writeD(Config.SERVER_ID);
- packet.writeC(0); // 272
+ writeString(hero.getString(Olympiad.CHAR_NAME));
+ writeInt(hero.getInt(Olympiad.CLASS_ID));
+ writeString(hero.getString(Hero.CLAN_NAME, ""));
+ writeInt(0); // hero.getInt(Hero.CLAN_CREST, 0)
+ writeString(hero.getString(Hero.ALLY_NAME, ""));
+ writeInt(0); // hero.getInt(Hero.ALLY_CREST, 0)
+ writeInt(hero.getInt(Hero.COUNT));
+ writeInt(Config.SERVER_ID);
+ writeByte(0); // 272
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
index fe5792eaf3..7f5f3cfe37 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
@@ -20,16 +20,15 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExInzoneWaiting implements IClientOutgoingPacket
+public class ExInzoneWaiting extends ServerPacket
{
private final int _currentTemplateId;
private final Map _instanceTimes;
@@ -44,18 +43,17 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
- packet.writeC(_hide ? 0 : 1); // Grand Crusade
- packet.writeD(_currentTemplateId);
- packet.writeD(_instanceTimes.size());
+ ServerPackets.EX_INZONE_WAITING_INFO.writeId(this);
+ writeByte(!_hide); // Grand Crusade
+ writeInt(_currentTemplateId);
+ writeInt(_instanceTimes.size());
for (Entry entry : _instanceTimes.entrySet())
{
final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis());
- packet.writeD(entry.getKey());
- packet.writeD((int) instanceTime);
+ writeInt(entry.getKey());
+ writeInt((int) instanceTime);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java
index 323c0cdf1e..c1acc4ea75 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExIsCharNameCreatable implements IClientOutgoingPacket
+public class ExIsCharNameCreatable extends ServerPacket
{
private final int _allowed;
@@ -32,10 +31,9 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet);
- packet.writeD(_allowed);
- return true;
+ ServerPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(this);
+ writeInt(_allowed);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java
index 44a5e8d6a5..20ff0fed15 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author NviX, Mobius
*/
-public class ExItemAnnounce implements IClientOutgoingPacket
+public class ExItemAnnounce extends ServerPacket
{
public static final int ENCHANT = 0;
public static final int RANDOM_CRAFT = 2;
@@ -60,9 +59,9 @@ public class ExItemAnnounce implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet);
+ ServerPackets.EX_ITEM_ANNOUNCE.writeId(this);
// _type
// 0 - enchant
// 1 - item get from container
@@ -73,11 +72,10 @@ public class ExItemAnnounce implements IClientOutgoingPacket
// 6 - item get from "limited random creation"
// 7 - fire and item get from container
// 8 and others - null item name by item_id and icon from chest.
- packet.writeC(_type); // announce type
- packet.writeString(_announceName); // name of player
- packet.writeD(_item.getId()); // item id
- packet.writeC(_item.getEnchantLevel()); // enchant level
- packet.writeD(0); // chest item id
- return true;
+ writeByte(_type); // announce type
+ writeSizedString(_announceName); // name of player
+ writeInt(_item.getId()); // item id
+ writeByte(_item.getEnchantLevel()); // enchant level
+ writeInt(0); // chest item id
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
index 45def9e0be..222055947d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.itemauction.ItemAuction;
import org.l2jmobius.gameserver.model.itemauction.ItemAuctionBid;
import org.l2jmobius.gameserver.model.itemauction.ItemAuctionState;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Forsaiken
@@ -52,21 +51,20 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet);
- packet.writeC(_refresh ? 0 : 1);
- packet.writeD(_currentAuction.getInstanceId());
+ ServerPackets.EX_ITEM_AUCTION_INFO.writeId(this);
+ writeByte(!_refresh);
+ writeInt(_currentAuction.getInstanceId());
final ItemAuctionBid highestBid = _currentAuction.getHighestBid();
- packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid());
- packet.writeD(_timeRemaining);
- writeItem(packet, _currentAuction.getItemInfo());
+ writeLong(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid());
+ writeInt(_timeRemaining);
+ writeItem(_currentAuction.getItemInfo());
if (_nextAuction != null)
{
- packet.writeQ(_nextAuction.getAuctionInitBid());
- packet.writeD((int) (_nextAuction.getStartingTime() / 1000)); // unix time in seconds
- writeItem(packet, _nextAuction.getItemInfo());
+ writeLong(_nextAuction.getAuctionInitBid());
+ writeInt((int) (_nextAuction.getStartingTime() / 1000)); // unix time in seconds
+ writeItem(_nextAuction.getItemInfo());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java
index 991437e881..ac58a15571 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java
@@ -17,17 +17,16 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.events.LetterCollectorManager;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Index
*/
-public class ExLetterCollectorUI implements IClientOutgoingPacket
+public class ExLetterCollectorUI extends ServerPacket
{
- final int _minimumLevel;
+ private final int _minimumLevel;
public ExLetterCollectorUI(Player player)
{
@@ -35,11 +34,10 @@ public class ExLetterCollectorUI implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_LETTER_COLLECTOR_UI_LAUNCHER.writeId(packet);
- packet.writeC(1); // enabled (0x00 - no, 0x01 -yes)
- packet.writeD(_minimumLevel); // Minimum Level
- return true;
+ ServerPackets.EX_LETTER_COLLECTOR_UI_LAUNCHER.writeId(this);
+ writeByte(1); // enabled (0x00 - no, 0x01 -yes)
+ writeInt(_minimumLevel); // Minimum Level
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java
index 1c5e38cbab..689d3cef7e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExListMpccWaiting implements IClientOutgoingPacket
+public class ExListMpccWaiting extends ServerPacket
{
private static final int NUM_PER_PAGE = 64;
@@ -51,22 +50,21 @@ public class ExListMpccWaiting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet);
- packet.writeD(_size);
- packet.writeD(_rooms.size());
+ ServerPackets.EX_LIST_MPCC_WAITING.writeId(this);
+ writeInt(_size);
+ writeInt(_rooms.size());
for (MatchingRoom room : _rooms)
{
- packet.writeD(room.getId());
- packet.writeS(room.getTitle());
- packet.writeD(room.getMembersCount());
- packet.writeD(room.getMinLevel());
- packet.writeD(room.getMaxLevel());
- packet.writeD(room.getLocation());
- packet.writeD(room.getMaxMembers());
- packet.writeS(room.getLeader().getName());
+ writeInt(room.getId());
+ writeString(room.getTitle());
+ writeInt(room.getMembersCount());
+ writeInt(room.getMinLevel());
+ writeInt(room.getMaxLevel());
+ writeInt(room.getLocation());
+ writeInt(room.getMaxMembers());
+ writeString(room.getLeader().getName());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
index 8a8da8257c..c15f6f6753 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
@@ -22,18 +22,17 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket
+public class ExListPartyMatchingWaitingRoom extends ServerPacket
{
private static final int NUM_PER_PAGE = 64;
@@ -57,27 +56,26 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet);
- packet.writeD(_size);
- packet.writeD(_players.size());
+ ServerPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(this);
+ writeInt(_size);
+ writeInt(_players.size());
for (Player player : _players)
{
- packet.writeS(player.getName());
- packet.writeD(player.getClassId().getId());
- packet.writeD(player.getLevel());
+ writeString(player.getName());
+ writeInt(player.getClassId().getId());
+ writeInt(player.getLevel());
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
- packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1);
+ writeInt((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1);
final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
- packet.writeD(instanceTimes.size());
+ writeInt(instanceTimes.size());
for (Entry entry : instanceTimes.entrySet())
{
final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis());
- packet.writeD(entry.getKey());
- packet.writeD((int) instanceTime);
+ writeInt(entry.getKey());
+ writeInt((int) instanceTime);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
index c8723a9fc0..17ee932d56 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author chris_00
*/
-public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket
+public class ExMPCCPartyInfoUpdate extends ServerPacket
{
private final int _mode;
private final int _LeaderOID;
@@ -43,13 +42,12 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet);
- packet.writeS(_name);
- packet.writeD(_LeaderOID);
- packet.writeD(_memberCount);
- packet.writeD(_mode); // mode 0 = Remove Party, 1 = AddParty, maybe more...
- return true;
+ ServerPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(this);
+ writeString(_name);
+ writeInt(_LeaderOID);
+ writeInt(_memberCount);
+ writeInt(_mode); // mode 0 = Remove Party, 1 = AddParty, maybe more...
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java
index 08259e4e6c..1905bbad90 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java
@@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExMPCCPartymasterList implements IClientOutgoingPacket
+public class ExMPCCPartymasterList extends ServerPacket
{
private final Set _leadersName;
@@ -34,11 +33,10 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet);
- packet.writeD(_leadersName.size());
- _leadersName.forEach(packet::writeS);
- return true;
+ ServerPackets.EX_MPCC_PARTYMASTER_LIST.writeId(this);
+ writeInt(_leadersName.size());
+ _leadersName.forEach(this::writeString);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java
index f021ef5f1f..29f03f4598 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExMPCCRoomInfo implements IClientOutgoingPacket
+public class ExMPCCRoomInfo extends ServerPacket
{
private final CommandChannelMatchingRoom _room;
@@ -33,16 +32,15 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet);
- packet.writeD(_room.getId());
- packet.writeD(_room.getMaxMembers());
- packet.writeD(_room.getMinLevel());
- packet.writeD(_room.getMaxLevel());
- packet.writeD(_room.getLootType());
- packet.writeD(_room.getLocation());
- packet.writeS(_room.getTitle());
- return true;
+ ServerPackets.EX_MPCC_ROOM_INFO.writeId(this);
+ writeInt(_room.getId());
+ writeInt(_room.getMaxMembers());
+ writeInt(_room.getMinLevel());
+ writeInt(_room.getMaxLevel());
+ writeInt(_room.getLootType());
+ writeInt(_room.getLocation());
+ writeString(_room.getTitle());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java
index 2eec590cb4..9bbb8310c9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.MatchingMemberType;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExMPCCRoomMember implements IClientOutgoingPacket
+public class ExMPCCRoomMember extends ServerPacket
{
private final CommandChannelMatchingRoom _room;
private final MatchingMemberType _type;
@@ -38,20 +37,19 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet);
- packet.writeD(_type.ordinal());
- packet.writeD(_room.getMembersCount());
+ ServerPackets.EX_MPCC_ROOM_MEMBER.writeId(this);
+ writeInt(_type.ordinal());
+ writeInt(_room.getMembersCount());
for (Player member : _room.getMembers())
{
- packet.writeD(member.getObjectId());
- packet.writeS(member.getName());
- packet.writeD(member.getLevel());
- packet.writeD(member.getClassId().getId());
- packet.writeD(MapRegionManager.getInstance().getBBs(member.getLocation()));
- packet.writeD(_room.getMemberType(member).ordinal());
+ writeInt(member.getObjectId());
+ writeString(member.getName());
+ writeInt(member.getLevel());
+ writeInt(member.getClassId().getId());
+ writeInt(MapRegionManager.getInstance().getBBs(member.getLocation()));
+ writeInt(_room.getMemberType(member).ordinal());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
index a0e9d0a4b0..6d7e81ff6b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author chris_00
*/
-public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket
+public class ExMPCCShowPartyMemberInfo extends ServerPacket
{
private final Party _party;
@@ -34,16 +33,15 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet);
- packet.writeD(_party.getMemberCount());
+ ServerPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(this);
+ writeInt(_party.getMemberCount());
for (Player pc : _party.getMembers())
{
- packet.writeS(pc.getName());
- packet.writeD(pc.getObjectId());
- packet.writeD(pc.getClassId().getId());
+ writeString(pc.getName());
+ writeInt(pc.getObjectId());
+ writeInt(pc.getClassId().getId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java
index 771b2f22cb..03826b18f0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExMagicAttackInfo implements IClientOutgoingPacket
+public class ExMagicAttackInfo extends ServerPacket
{
// TODO: Enum
public static final int CRITICAL = 1;
@@ -46,12 +45,11 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet);
- packet.writeD(_caster);
- packet.writeD(_target);
- packet.writeD(_type);
- return true;
+ ServerPackets.EX_MAGIC_ATTACK_INFO.writeId(this);
+ writeInt(_caster);
+ writeInt(_target);
+ writeInt(_type);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
index 1aaa5b6520..bb70c40aba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* (just a trigger)
* @author -Wooden-
*/
-public class ExMailArrived implements IClientOutgoingPacket
+public class ExMailArrived extends ServerPacket
{
public static final ExMailArrived STATIC_PACKET = new ExMailArrived();
@@ -32,9 +31,8 @@ public class ExMailArrived implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet);
- return true;
+ ServerPackets.EX_MAIL_ARRIVED.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java
index 48156c0600..19b640b469 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java
@@ -16,18 +16,17 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ExManagePartyRoomMemberType;
import org.l2jmobius.gameserver.enums.MatchingMemberType;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ExManageMpccRoomMember implements IClientOutgoingPacket
+public class ExManageMpccRoomMember extends ServerPacket
{
private final Player _player;
private final MatchingMemberType _memberType;
@@ -41,16 +40,15 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet);
- packet.writeD(_type.ordinal());
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getName());
- packet.writeD(_player.getClassId().getId());
- packet.writeD(_player.getLevel());
- packet.writeD(MapRegionManager.getInstance().getBBs(_player.getLocation()));
- packet.writeD(_memberType.ordinal());
- return true;
+ ServerPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(this);
+ writeInt(_type.ordinal());
+ writeInt(_player.getObjectId());
+ writeString(_player.getName());
+ writeInt(_player.getClassId().getId());
+ writeInt(_player.getLevel());
+ writeInt(MapRegionManager.getInstance().getBBs(_player.getLocation()));
+ writeInt(_memberType.ordinal());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
index 9d7d14211e..3ade23be96 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExMoveToLocationAirShip implements IClientOutgoingPacket
+public class ExMoveToLocationAirShip extends ServerPacket
{
private final int _objId;
private final int _tx;
@@ -42,16 +41,15 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(_tx);
- packet.writeD(_ty);
- packet.writeD(_tz);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(this);
+ writeInt(_objId);
+ writeInt(_tx);
+ writeInt(_ty);
+ writeInt(_tz);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
index 87e44b51cd..c98aee9815 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExMoveToLocationInAirShip implements IClientOutgoingPacket
+public class ExMoveToLocationInAirShip extends ServerPacket
{
private final int _objectId;
private final int _airShipId;
@@ -40,15 +39,14 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_airShipId);
- packet.writeD(_destination.getX());
- packet.writeD(_destination.getY());
- packet.writeD(_destination.getZ());
- packet.writeD(_heading);
- return true;
+ ServerPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(this);
+ writeInt(_objectId);
+ writeInt(_airShipId);
+ writeInt(_destination.getX());
+ writeInt(_destination.getY());
+ writeInt(_destination.getZ());
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
index 3c1902892a..be479d5def 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Objects;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author chris_00
*/
-public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket
+public class ExMultiPartyCommandChannelInfo extends ServerPacket
{
private final CommandChannel _channel;
@@ -37,19 +36,18 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet);
- packet.writeS(_channel.getLeader().getName());
- packet.writeD(0); // Channel loot 0 or 1
- packet.writeD(_channel.getMemberCount());
- packet.writeD(_channel.getParties().size());
+ ServerPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(this);
+ writeString(_channel.getLeader().getName());
+ writeInt(0); // Channel loot 0 or 1
+ writeInt(_channel.getMemberCount());
+ writeInt(_channel.getParties().size());
for (Party p : _channel.getParties())
{
- packet.writeS(p.getLeader().getName());
- packet.writeD(p.getLeaderObjectId());
- packet.writeD(p.getMemberCount());
+ writeString(p.getLeader().getName());
+ writeInt(p.getLeaderObjectId());
+ writeInt(p.getMemberCount());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
index f2a32bb6e8..e4a37f7234 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
@@ -16,8 +16,7 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Dialog with input field
@@ -25,7 +24,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
* type 1 = clan name
* @author JIV
*/
-public class ExNeedToChangeName implements IClientOutgoingPacket
+public class ExNeedToChangeName extends ServerPacket
{
private final int _type;
private final int _subType;
@@ -33,19 +32,17 @@ public class ExNeedToChangeName implements IClientOutgoingPacket
public ExNeedToChangeName(int type, int subType, String name)
{
- super();
_type = type;
_subType = subType;
_name = name;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet);
- packet.writeD(_type);
- packet.writeD(_subType);
- packet.writeS(_name);
- return true;
+ ServerPackets.EX_NEED_TO_CHANGE_NAME.writeId(this);
+ writeInt(_type);
+ writeInt(_subType);
+ writeString(_name);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
index d18b4606b3..ecbaecf616 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mochitto
*/
-public class ExNevitAdventEffect implements IClientOutgoingPacket
+public class ExNevitAdventEffect extends ServerPacket
{
private final int _timeLeft;
@@ -32,10 +31,9 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet);
- packet.writeD(_timeLeft);
- return true;
+ ServerPackets.EX_SHOW_CHANNELING_EFFECT.writeId(this);
+ writeInt(_timeLeft);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
index 09f6250f51..b1201a0d05 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mochitto
*/
-public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket
+public class ExNevitAdventPointInfoPacket extends ServerPacket
{
private final int _points;
@@ -32,10 +31,9 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet);
- packet.writeD(_points); // 72 = 1%, max 7200 = 100%
- return true;
+ ServerPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(this);
+ writeInt(_points); // 72 = 1%, max 7200 = 100%
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
index ef220d86de..68323d217b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mochitto
*/
-public class ExNevitAdventTimeChange implements IClientOutgoingPacket
+public class ExNevitAdventTimeChange extends ServerPacket
{
private final boolean _paused;
private final int _time;
@@ -34,13 +33,12 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet);
+ ServerPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(this);
// state 0 - pause 1 - started
- packet.writeC(_paused ? 0 : 1);
+ writeByte(!_paused);
// left time in ms max is 16000 its 4m and state is automatically changed to quit
- packet.writeD(_time);
- return true;
+ writeInt(_time);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java
index 4025bf78fa..31c33e3212 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket
+public class ExNewSkillToLearnByLevelUp extends ServerPacket
{
public static final ExNewSkillToLearnByLevelUp STATIC_PACKET = new ExNewSkillToLearnByLevelUp();
@@ -31,9 +30,8 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet);
- return true;
+ ServerPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
index f2ce8614dc..cb7d098b0b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Migi
*/
-public class ExNoticePostArrived implements IClientOutgoingPacket
+public class ExNoticePostArrived extends ServerPacket
{
private static final ExNoticePostArrived STATIC_PACKET_TRUE = new ExNoticePostArrived(true);
private static final ExNoticePostArrived STATIC_PACKET_FALSE = new ExNoticePostArrived(false);
@@ -40,10 +39,9 @@ public class ExNoticePostArrived implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet);
- packet.writeD(_showAnim ? 1 : 0);
- return true;
+ ServerPackets.EX_NOTICE_POST_ARRIVED.writeId(this);
+ writeInt(_showAnim);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
index 050c7ccea5..d00099abd7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Migi
*/
-public class ExNoticePostSent implements IClientOutgoingPacket
+public class ExNoticePostSent extends ServerPacket
{
private static final ExNoticePostSent STATIC_PACKET_TRUE = new ExNoticePostSent(true);
private static final ExNoticePostSent STATIC_PACKET_FALSE = new ExNoticePostSent(false);
@@ -40,10 +39,9 @@ public class ExNoticePostSent implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet);
- packet.writeD(_showAnim ? 1 : 0);
- return true;
+ ServerPackets.EX_REPLY_WRITE_POST.writeId(this);
+ writeInt(_showAnim);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
index e0bd08d39a..87c9a92b58 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
@@ -16,20 +16,18 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ExNotifyPremiumItem implements IClientOutgoingPacket
+public class ExNotifyPremiumItem extends ServerPacket
{
public static final ExNotifyPremiumItem STATIC_PACKET = new ExNotifyPremiumItem();
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet);
- return true;
+ ServerPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
index ba3c0cfeaa..eea0be7008 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author GodKratos
*/
-public class ExOlympiadMatchEnd implements IClientOutgoingPacket
+public class ExOlympiadMatchEnd extends ServerPacket
{
public static final ExOlympiadMatchEnd STATIC_PACKET = new ExOlympiadMatchEnd();
@@ -31,9 +30,8 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet);
- return true;
+ ServerPackets.EX_OLYMPIAD_MATCH_END.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
index 7ffd5ed3bd..86cb0ec676 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
@@ -19,18 +19,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.olympiad.AbstractOlympiadGame;
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameClassed;
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameNonClassed;
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExOlympiadMatchList implements IClientOutgoingPacket
+public class ExOlympiadMatchList extends ServerPacket
{
private final List _games = new ArrayList<>();
@@ -52,35 +51,34 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet);
- packet.writeD(0); // Type 0 = Match List, 1 = Match Result
- packet.writeD(_games.size());
- packet.writeD(0);
+ ServerPackets.EX_RECEIVE_OLYMPIAD.writeId(this);
+ writeInt(0); // Type 0 = Match List, 1 = Match Result
+ writeInt(_games.size());
+ writeInt(0);
for (OlympiadGameTask curGame : _games)
{
final AbstractOlympiadGame game = curGame.getGame();
if (game != null)
{
- packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0)
+ writeInt(game.getStadiumId()); // Stadium Id (Arena 1 = 0)
if (game instanceof OlympiadGameNonClassed)
{
- packet.writeD(1);
+ writeInt(1);
}
else if (game instanceof OlympiadGameClassed)
{
- packet.writeD(2);
+ writeInt(2);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing)
- packet.writeS(game.getPlayerNames()[0]); // Player 1 Name
- packet.writeS(game.getPlayerNames()[1]); // Player 2 Name
+ writeInt(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing)
+ writeString(game.getPlayerNames()[0]); // Player 1 Name
+ writeString(game.getPlayerNames()[1]); // Player 2 Name
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
index b387271fba..015e85a14a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.olympiad.OlympiadInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExOlympiadMatchResult implements IClientOutgoingPacket
+public class ExOlympiadMatchResult extends ServerPacket
{
private final boolean _tie;
private int _winTeam; // 1,2
@@ -50,38 +49,37 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet);
- packet.writeD(1); // Type 0 = Match List, 1 = Match Result
- packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie
- packet.writeS(_winnerList.get(0).getName());
- packet.writeD(_winTeam);
- packet.writeD(_winnerList.size());
+ ServerPackets.EX_RECEIVE_OLYMPIAD.writeId(this);
+ writeInt(1); // Type 0 = Match List, 1 = Match Result
+ writeInt(_tie); // 0 - win, 1 - tie
+ writeString(_winnerList.get(0).getName());
+ writeInt(_winTeam);
+ writeInt(_winnerList.size());
for (OlympiadInfo info : _winnerList)
{
- packet.writeS(info.getName());
- packet.writeS(info.getClanName());
- packet.writeD(info.getClanId());
- packet.writeD(info.getClassId());
- packet.writeD(info.getDamage());
- packet.writeD(info.getCurrentPoints());
- packet.writeD(info.getDiffPoints());
- packet.writeD(0); // Helios
+ writeString(info.getName());
+ writeString(info.getClanName());
+ writeInt(info.getClanId());
+ writeInt(info.getClassId());
+ writeInt(info.getDamage());
+ writeInt(info.getCurrentPoints());
+ writeInt(info.getDiffPoints());
+ writeInt(0); // Helios
}
- packet.writeD(_loseTeam);
- packet.writeD(_loserList.size());
+ writeInt(_loseTeam);
+ writeInt(_loserList.size());
for (OlympiadInfo info : _loserList)
{
- packet.writeS(info.getName());
- packet.writeS(info.getClanName());
- packet.writeD(info.getClanId());
- packet.writeD(info.getClassId());
- packet.writeD(info.getDamage());
- packet.writeD(info.getCurrentPoints());
- packet.writeD(info.getDiffPoints());
- packet.writeD(0); // Helios
+ writeString(info.getName());
+ writeString(info.getClanName());
+ writeInt(info.getClanId());
+ writeInt(info.getClassId());
+ writeInt(info.getDamage());
+ writeInt(info.getCurrentPoints());
+ writeInt(info.getDiffPoints());
+ writeInt(0); // Helios
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
index 712b9e06c6..734c56e2c7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author godson
*/
-public class ExOlympiadMode implements IClientOutgoingPacket
+public class ExOlympiadMode extends ServerPacket
{
private final int _mode;
@@ -35,10 +34,9 @@ public class ExOlympiadMode implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet);
- packet.writeC(_mode);
- return true;
+ ServerPackets.EX_OLYMPIAD_MODE.writeId(this);
+ writeByte(_mode);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
index 5b4f2c2523..b071d16c2b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
@@ -19,16 +19,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author godson
*/
-public class ExOlympiadSpelledInfo implements IClientOutgoingPacket
+public class ExOlympiadSpelledInfo extends ServerPacket
{
private final int _playerId;
private final List _effects = new ArrayList<>();
@@ -50,33 +49,32 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet);
- packet.writeD(_playerId);
- packet.writeD(_effects.size() + _effects2.size());
+ ServerPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(this);
+ writeInt(_playerId);
+ writeInt(_effects.size() + _effects2.size());
for (BuffInfo info : _effects)
{
if ((info != null) && info.isInUse())
{
- packet.writeD(info.getSkill().getDisplayId());
- packet.writeH(info.getSkill().getDisplayLevel());
- packet.writeH(0); // Sub level
- packet.writeD(info.getSkill().getAbnormalType().getClientId());
- writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime());
+ writeInt(info.getSkill().getDisplayId());
+ writeShort(info.getSkill().getDisplayLevel());
+ writeShort(0); // Sub level
+ writeInt(info.getSkill().getAbnormalType().getClientId());
+ writeOptionalInt(info.getSkill().isAura() ? -1 : info.getTime());
}
}
for (Skill skill : _effects2)
{
if (skill != null)
{
- packet.writeD(skill.getDisplayId());
- packet.writeH(skill.getDisplayLevel());
- packet.writeH(0); // Sub level
- packet.writeD(skill.getAbnormalType().getClientId());
- packet.writeH(-1);
+ writeInt(skill.getDisplayId());
+ writeShort(skill.getDisplayLevel());
+ writeShort(0); // Sub level
+ writeInt(skill.getAbnormalType().getClientId());
+ writeShort(-1);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
index ca473edfcf..3a01b48590 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.olympiad.Participant;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author godson
*/
-public class ExOlympiadUserInfo implements IClientOutgoingPacket
+public class ExOlympiadUserInfo extends ServerPacket
{
private final Player _player;
private Participant _par = null;
@@ -73,27 +72,26 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet);
+ ServerPackets.EX_OLYMPIAD_USER_INFO.writeId(this);
if (_player != null)
{
- packet.writeC(_player.getOlympiadSide());
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getName());
- packet.writeD(_player.getClassId().getId());
+ writeByte(_player.getOlympiadSide());
+ writeInt(_player.getObjectId());
+ writeString(_player.getName());
+ writeInt(_player.getClassId().getId());
}
else
{
- packet.writeC(_par.getSide());
- packet.writeD(_par.getObjectId());
- packet.writeS(_par.getName());
- packet.writeD(_par.getBaseClass());
+ writeByte(_par.getSide());
+ writeInt(_par.getObjectId());
+ writeString(_par.getName());
+ writeInt(_par.getBaseClass());
}
- packet.writeD(_curHp);
- packet.writeD(_maxHp);
- packet.writeD(_curCp);
- packet.writeD(_maxCp);
- return true;
+ writeInt(_curHp);
+ writeInt(_maxHp);
+ writeInt(_curCp);
+ writeInt(_maxCp);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
index 7ec64cc8c3..7df8985714 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Opens the CommandChannel Information window
* @author chris_00
*/
-public class ExOpenMPCC implements IClientOutgoingPacket
+public class ExOpenMPCC extends ServerPacket
{
public static final ExOpenMPCC STATIC_PACKET = new ExOpenMPCC();
@@ -32,9 +31,8 @@ public class ExOpenMPCC implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_OPEN_MPCC.writeId(packet);
- return true;
+ ServerPackets.EX_OPEN_MPCC.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
index 5661dc9f57..4cea109f16 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
* @author UnAfraid
*/
-public class ExPCCafePointInfo implements IClientOutgoingPacket
+public class ExPCCafePointInfo extends ServerPacket
{
private final int _points;
private final int _mAddPoint;
@@ -53,15 +52,14 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet);
- packet.writeD(_points); // num points
- packet.writeD(_mAddPoint); // points inc display
- packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points)
- packet.writeD(_remainTime); // period hours left
- packet.writeC(_pointType); // points inc display color(0=yellow, 1=cyan-blue, 2=red, all other black)
- packet.writeD(_time * 3); // value is in seconds * 3
- return true;
+ ServerPackets.EX_PCCAFE_POINT_INFO.writeId(this);
+ writeInt(_points); // num points
+ writeInt(_mAddPoint); // points inc display
+ writeByte(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points)
+ writeInt(_remainTime); // period hours left
+ writeByte(_pointType); // points inc display color(0=yellow, 1=cyan-blue, 2=red, all other black)
+ writeInt(_time * 3); // value is in seconds * 3
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCMyRecord.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCMyRecord.java
index 81bdc418d0..71a7c96dc1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCMyRecord.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCMyRecord.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExPVPMatchCCMyRecord implements IClientOutgoingPacket
+public class ExPVPMatchCCMyRecord extends ServerPacket
{
private final int _points;
@@ -32,10 +31,9 @@ public class ExPVPMatchCCMyRecord implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PVP_MATCH_CCMY_RECORD.writeId(packet);
- packet.writeD(_points);
- return true;
+ ServerPackets.EX_PVP_MATCH_CCMY_RECORD.writeId(this);
+ writeInt(_points);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java
index 640351302e..26051412bf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java
@@ -19,14 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExPVPMatchCCRecord implements IClientOutgoingPacket
+public class ExPVPMatchCCRecord extends ServerPacket
{
public static final int INITIALIZE = 0;
public static final int UPDATE = 1;
@@ -42,11 +41,11 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet);
- packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish
- packet.writeD(Math.min(_players.size(), 25));
+ ServerPackets.EX_PVP_MATCH_CCRECORD.writeId(this);
+ writeInt(_state); // 0 - initialize, 1 - update, 2 - finish
+ writeInt(Math.min(_players.size(), 25));
int counter = 0;
for (Entry entry : _players.entrySet())
{
@@ -55,9 +54,8 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket
{
break;
}
- packet.writeS(entry.getKey().getName());
- packet.writeD(entry.getValue());
+ writeString(entry.getKey().getName());
+ writeInt(entry.getValue());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
index 248a2f7d98..50f2a0eeaa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExPartyPetWindowAdd implements IClientOutgoingPacket
+public class ExPartyPetWindowAdd extends ServerPacket
{
private final Summon _summon;
@@ -33,17 +32,16 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet);
- packet.writeD(_summon.getObjectId());
- packet.writeD(_summon.getTemplate().getDisplayId() + 1000000);
- packet.writeC(_summon.getSummonType());
- packet.writeD(_summon.getOwner().getObjectId());
- packet.writeD((int) _summon.getCurrentHp());
- packet.writeD(_summon.getMaxHp());
- packet.writeD((int) _summon.getCurrentMp());
- packet.writeD(_summon.getMaxMp());
- return true;
+ ServerPackets.EX_PARTY_PET_WINDOW_ADD.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+ writeByte(_summon.getSummonType());
+ writeInt(_summon.getOwner().getObjectId());
+ writeInt((int) _summon.getCurrentHp());
+ writeInt(_summon.getMaxHp());
+ writeInt((int) _summon.getCurrentMp());
+ writeInt(_summon.getMaxMp());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
index 1f452f4bae..f3f53a2714 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExPartyPetWindowDelete implements IClientOutgoingPacket
+public class ExPartyPetWindowDelete extends ServerPacket
{
private final Summon _summon;
@@ -33,12 +32,11 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet);
- packet.writeD(_summon.getObjectId());
- packet.writeC(_summon.getSummonType());
- packet.writeD(_summon.getOwner().getObjectId());
- return true;
+ ServerPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeByte(_summon.getSummonType());
+ writeInt(_summon.getOwner().getObjectId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
index 703694fa2f..4eb0f09d9f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExPartyPetWindowUpdate implements IClientOutgoingPacket
+public class ExPartyPetWindowUpdate extends ServerPacket
{
private final Summon _summon;
@@ -33,17 +32,16 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet);
- packet.writeD(_summon.getObjectId());
- packet.writeD(_summon.getTemplate().getDisplayId() + 1000000);
- packet.writeC(_summon.getSummonType());
- packet.writeD(_summon.getOwner().getObjectId());
- packet.writeD((int) _summon.getCurrentHp());
- packet.writeD(_summon.getMaxHp());
- packet.writeD((int) _summon.getCurrentMp());
- packet.writeD(_summon.getMaxMp());
- return true;
+ ServerPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+ writeByte(_summon.getSummonType());
+ writeInt(_summon.getOwner().getObjectId());
+ writeInt((int) _summon.getCurrentHp());
+ writeInt(_summon.getMaxHp());
+ writeInt((int) _summon.getCurrentMp());
+ writeInt(_summon.getMaxMp());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
index 8b2a069152..79c2942e04 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
@@ -20,18 +20,17 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.MatchingMemberType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.PartyMatchingRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ExPartyRoomMember implements IClientOutgoingPacket
+public class ExPartyRoomMember extends ServerPacket
{
private final PartyMatchingRoom _room;
private final MatchingMemberType _type;
@@ -43,28 +42,27 @@ public class ExPartyRoomMember implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet);
- packet.writeD(_type.ordinal());
- packet.writeD(_room.getMembersCount());
+ ServerPackets.EX_PARTY_ROOM_MEMBER.writeId(this);
+ writeInt(_type.ordinal());
+ writeInt(_room.getMembersCount());
for (Player member : _room.getMembers())
{
- packet.writeD(member.getObjectId());
- packet.writeS(member.getName());
- packet.writeD(member.getActiveClass());
- packet.writeD(member.getLevel());
- packet.writeD(MapRegionManager.getInstance().getBBs(member.getLocation()));
- packet.writeD(_room.getMemberType(member).ordinal());
+ writeInt(member.getObjectId());
+ writeString(member.getName());
+ writeInt(member.getActiveClass());
+ writeInt(member.getLevel());
+ writeInt(MapRegionManager.getInstance().getBBs(member.getLocation()));
+ writeInt(_room.getMemberType(member).ordinal());
final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(member);
- packet.writeD(instanceTimes.size());
+ writeInt(instanceTimes.size());
for (Entry entry : instanceTimes.entrySet())
{
final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis());
- packet.writeD(entry.getKey());
- packet.writeD((int) instanceTime);
+ writeInt(entry.getKey());
+ writeInt((int) instanceTime);
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
index 0f72c05a3a..c91d6f0dba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author devScarlet, mrTJO
*/
-public class ExPlayScene implements IClientOutgoingPacket
+public class ExPlayScene extends ServerPacket
{
public static final ExPlayScene STATIC_PACKET = new ExPlayScene();
@@ -31,9 +30,8 @@ public class ExPlayScene implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLAY_SCENE.writeId(packet);
- return true;
+ ServerPackets.EX_PLAY_SCENE.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCoinInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCoinInfo.java
index ab773b22d1..a689b0965a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCoinInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCoinInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExPledgeCoinInfo implements IClientOutgoingPacket
+public class ExPledgeCoinInfo extends ServerPacket
{
private final long _count;
@@ -33,10 +32,9 @@ public class ExPledgeCoinInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_COIN_INFO.writeId(packet);
- packet.writeQ(_count);
- return true;
+ ServerPackets.EX_PLEDGE_COIN_INFO.writeId(this);
+ writeLong(_count);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java
index 7e3803bdaa..cdf3afa983 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExPledgeCount implements IClientOutgoingPacket
+public class ExPledgeCount extends ServerPacket
{
private final int _count;
@@ -33,10 +32,9 @@ public class ExPledgeCount implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet);
- packet.writeD(_count);
- return true;
+ ServerPackets.EX_PLEDGE_COUNT.writeId(this);
+ writeInt(_count);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java
index 4084de3481..24b679cacf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeDraftListSearch implements IClientOutgoingPacket
+public class ExPledgeDraftListSearch extends ServerPacket
{
final List _pledgeRecruitList;
@@ -35,18 +34,17 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet);
- packet.writeD(_pledgeRecruitList.size());
+ ServerPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(this);
+ writeInt(_pledgeRecruitList.size());
for (PledgeWaitingInfo prl : _pledgeRecruitList)
{
- packet.writeD(prl.getPlayerId());
- packet.writeS(prl.getPlayerName());
- packet.writeD(prl.getKarma());
- packet.writeD(prl.getPlayerClassId());
- packet.writeD(prl.getPlayerLvl());
+ writeInt(prl.getPlayerId());
+ writeString(prl.getPlayerName());
+ writeInt(prl.getKarma());
+ writeInt(prl.getPlayerClassId());
+ writeInt(prl.getPlayerLvl());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
index 44e34004ea..1eb395ace8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
@@ -17,13 +17,12 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-, Sdw
*/
-public class ExPledgeEmblem implements IClientOutgoingPacket
+public class ExPledgeEmblem extends ServerPacket
{
private static final int TOTAL_SIZE = 65664;
@@ -41,23 +40,22 @@ public class ExPledgeEmblem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet);
- packet.writeD(Config.SERVER_ID);
- packet.writeD(_clanId);
- packet.writeD(_crestId);
- packet.writeD(_chunkId);
- packet.writeD(TOTAL_SIZE);
+ ServerPackets.EX_PLEDGE_EMBLEM.writeId(this);
+ writeInt(Config.SERVER_ID);
+ writeInt(_clanId);
+ writeInt(_crestId);
+ writeInt(_chunkId);
+ writeInt(TOTAL_SIZE);
if (_data != null)
{
- packet.writeD(_data.length);
- packet.writeB(_data);
+ writeInt(_data.length);
+ writeBytes(_data);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java
index b32f8c0645..2c2aeb2607 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ClanEntryStatus;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket
+public class ExPledgeRecruitApplyInfo extends ServerPacket
{
private final ClanEntryStatus _status;
@@ -33,10 +32,9 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet);
- packet.writeD(_status.ordinal());
- return true;
+ ServerPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(this);
+ writeInt(_status.ordinal());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java
index af4af9c9c1..45d7fb17e8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket
+public class ExPledgeRecruitBoardDetail extends ServerPacket
{
final PledgeRecruitInfo _pledgeRecruitInfo;
@@ -33,15 +32,14 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet);
- packet.writeD(_pledgeRecruitInfo.getClanId());
- packet.writeD(_pledgeRecruitInfo.getKarma());
- packet.writeS(_pledgeRecruitInfo.getInformation());
- packet.writeS(_pledgeRecruitInfo.getDetailedInformation());
- packet.writeD(_pledgeRecruitInfo.getApplicationType());
- packet.writeD(_pledgeRecruitInfo.getRecruitType());
- return true;
+ ServerPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(this);
+ writeInt(_pledgeRecruitInfo.getClanId());
+ writeInt(_pledgeRecruitInfo.getKarma());
+ writeString(_pledgeRecruitInfo.getInformation());
+ writeString(_pledgeRecruitInfo.getDetailedInformation());
+ writeInt(_pledgeRecruitInfo.getApplicationType());
+ writeInt(_pledgeRecruitInfo.getRecruitType());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
index eda808e754..a97660ffc7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket
+public class ExPledgeRecruitBoardSearch extends ServerPacket
{
final List _clanList;
private final int _currentPage;
@@ -47,31 +46,30 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet);
- packet.writeD(_currentPage);
- packet.writeD(_totalNumberOfPage);
- packet.writeD(_clanOnCurrentPage);
+ ServerPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(this);
+ writeInt(_currentPage);
+ writeInt(_totalNumberOfPage);
+ writeInt(_clanOnCurrentPage);
for (int i = _startIndex; i < _endIndex; i++)
{
- packet.writeD(_clanList.get(i).getClanId());
- packet.writeD(_clanList.get(i).getClan().getAllyId());
+ writeInt(_clanList.get(i).getClanId());
+ writeInt(_clanList.get(i).getClan().getAllyId());
}
for (int i = _startIndex; i < _endIndex; i++)
{
final Clan clan = _clanList.get(i).getClan();
- packet.writeD(clan.getCrestId());
- packet.writeD(clan.getAllyCrestId());
- packet.writeS(clan.getName());
- packet.writeS(clan.getLeaderName());
- packet.writeD(clan.getLevel());
- packet.writeD(clan.getMembersCount());
- packet.writeD(_clanList.get(i).getKarma());
- packet.writeS(_clanList.get(i).getInformation());
- packet.writeD(_clanList.get(i).getApplicationType()); // Helios
- packet.writeD(_clanList.get(i).getRecruitType()); // Helios
+ writeInt(clan.getCrestId());
+ writeInt(clan.getAllyCrestId());
+ writeString(clan.getName());
+ writeString(clan.getLeaderName());
+ writeInt(clan.getLevel());
+ writeInt(clan.getMembersCount());
+ writeInt(_clanList.get(i).getKarma());
+ writeString(_clanList.get(i).getInformation());
+ writeInt(_clanList.get(i).getApplicationType()); // Helios
+ writeInt(_clanList.get(i).getRecruitType()); // Helios
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
index b1f139226d..42dff55a53 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.Clan.SubPledge;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeRecruitInfo implements IClientOutgoingPacket
+public class ExPledgeRecruitInfo extends ServerPacket
{
private final Clan _clan;
@@ -37,20 +36,19 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet);
+ ServerPackets.EX_PLEDGE_RECRUIT_INFO.writeId(this);
final Collection subPledges = _clan.getAllSubPledges();
- packet.writeS(_clan.getName());
- packet.writeS(_clan.getLeaderName());
- packet.writeD(_clan.getLevel());
- packet.writeD(_clan.getMembersCount());
- packet.writeD(subPledges.size());
+ writeString(_clan.getName());
+ writeString(_clan.getLeaderName());
+ writeInt(_clan.getLevel());
+ writeInt(_clan.getMembersCount());
+ writeInt(subPledges.size());
for (SubPledge subPledge : subPledges)
{
- packet.writeD(subPledge.getId());
- packet.writeS(subPledge.getName());
+ writeInt(subPledge.getId());
+ writeString(subPledge.getName());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java
index 5844f220ec..124f461af4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java
@@ -18,35 +18,33 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeWaitingList implements IClientOutgoingPacket
+public class ExPledgeWaitingList extends ServerPacket
{
- private final Map pledgePlayerRecruitInfos;
+ private final Map _pledgePlayerRecruitInfos;
public ExPledgeWaitingList(int clanId)
{
- pledgePlayerRecruitInfos = ClanEntryManager.getInstance().getApplicantListForClan(clanId);
+ _pledgePlayerRecruitInfos = ClanEntryManager.getInstance().getApplicantListForClan(clanId);
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet);
- packet.writeD(pledgePlayerRecruitInfos.size());
- for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values())
+ ServerPackets.EX_PLEDGE_WAITING_LIST.writeId(this);
+ writeInt(_pledgePlayerRecruitInfos.size());
+ for (PledgeApplicantInfo recruitInfo : _pledgePlayerRecruitInfos.values())
{
- packet.writeD(recruitInfo.getPlayerId());
- packet.writeS(recruitInfo.getPlayerName());
- packet.writeD(recruitInfo.getClassId());
- packet.writeD(recruitInfo.getPlayerLvl());
+ writeInt(recruitInfo.getPlayerId());
+ writeString(recruitInfo.getPlayerName());
+ writeInt(recruitInfo.getClassId());
+ writeInt(recruitInfo.getPlayerLvl());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java
index 6b88572057..5d2b0dded2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java
@@ -16,20 +16,18 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket
+public class ExPledgeWaitingListAlarm extends ServerPacket
{
public static final ExPledgeWaitingListAlarm STATIC_PACKET = new ExPledgeWaitingListAlarm();
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet);
- return true;
+ ServerPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java
index 28c3967119..95ea1d1a18 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import org.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeWaitingListApplied implements IClientOutgoingPacket
+public class ExPledgeWaitingListApplied extends ServerPacket
{
private final PledgeApplicantInfo _pledgePlayerRecruitInfo;
private final PledgeRecruitInfo _pledgeRecruitInfo;
@@ -37,17 +36,16 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet);
- packet.writeD(_pledgeRecruitInfo.getClan().getId());
- packet.writeS(_pledgeRecruitInfo.getClan().getName());
- packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName());
- packet.writeD(_pledgeRecruitInfo.getClan().getLevel());
- packet.writeD(_pledgeRecruitInfo.getClan().getMembersCount());
- packet.writeD(_pledgeRecruitInfo.getKarma());
- packet.writeS(_pledgeRecruitInfo.getInformation());
- packet.writeS(_pledgePlayerRecruitInfo.getMessage());
- return true;
+ ServerPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(this);
+ writeInt(_pledgeRecruitInfo.getClan().getId());
+ writeString(_pledgeRecruitInfo.getClan().getName());
+ writeString(_pledgeRecruitInfo.getClan().getLeaderName());
+ writeInt(_pledgeRecruitInfo.getClan().getLevel());
+ writeInt(_pledgeRecruitInfo.getClan().getMembersCount());
+ writeInt(_pledgeRecruitInfo.getKarma());
+ writeString(_pledgeRecruitInfo.getInformation());
+ writeString(_pledgePlayerRecruitInfo.getMessage());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java
index 1f53d1bb38..6436e02e1d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPledgeWaitingUser implements IClientOutgoingPacket
+public class ExPledgeWaitingUser extends ServerPacket
{
private final PledgeApplicantInfo _pledgeRecruitInfo;
@@ -33,11 +32,10 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet);
- packet.writeD(_pledgeRecruitInfo.getPlayerId());
- packet.writeS(_pledgeRecruitInfo.getMessage());
- return true;
+ ServerPackets.EX_PLEDGE_WAITING_USER.writeId(this);
+ writeInt(_pledgeRecruitInfo.getPlayerId());
+ writeString(_pledgeRecruitInfo.getMessage());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPremiumManagerShowHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPremiumManagerShowHtml.java
index 426f884abf..b248ed0d06 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPremiumManagerShowHtml.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPremiumManagerShowHtml.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.HtmlActionScope;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JoeAlisson
@@ -31,14 +30,13 @@ public class ExPremiumManagerShowHtml extends AbstractHtmlPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PREMIUM_MANAGER_SHOW_HTML.writeId(packet);
- packet.writeD(getNpcObjId());
- packet.writeS(getHtml());
- packet.writeD(-1);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_PREMIUM_MANAGER_SHOW_HTML.writeId(this);
+ writeInt(getNpcObjId());
+ writeString(getHtml());
+ writeInt(-1);
+ writeInt(0);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreBuyingResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreBuyingResult.java
index 431bdaaca9..f09715b127 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreBuyingResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreBuyingResult.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExPrivateStoreBuyingResult implements IClientOutgoingPacket
+public class ExPrivateStoreBuyingResult extends ServerPacket
{
private final int _objectId;
private final long _count;
@@ -33,12 +32,11 @@ public class ExPrivateStoreBuyingResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PRIVATE_STORE_BUYING_RESULT.writeId(packet);
- packet.writeD(_objectId);
- packet.writeQ(_count);
- packet.writeS(_seller);
- return true;
+ ServerPackets.EX_PRIVATE_STORE_BUYING_RESULT.writeId(this);
+ writeInt(_objectId);
+ writeLong(_count);
+ writeString(_seller);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSellingResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSellingResult.java
index 4b61d22e96..52ca52595e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSellingResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSellingResult.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExPrivateStoreSellingResult implements IClientOutgoingPacket
+public class ExPrivateStoreSellingResult extends ServerPacket
{
private final int _objectId;
private final long _count;
@@ -33,12 +32,11 @@ public class ExPrivateStoreSellingResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PRIVATE_STORE_SELLING_RESULT.writeId(packet);
- packet.writeD(_objectId);
- packet.writeQ(_count);
- packet.writeS(_buyer);
- return true;
+ ServerPackets.EX_PRIVATE_STORE_SELLING_RESULT.writeId(this);
+ writeInt(_objectId);
+ writeLong(_count);
+ writeString(_buyer);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
index 5f404779f5..449b36e32a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket
+public class ExPrivateStoreSetWholeMsg extends ServerPacket
{
private final int _objectId;
private final String _msg;
@@ -40,11 +39,10 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet);
- packet.writeD(_objectId);
- packet.writeS(_msg);
- return true;
+ ServerPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(this);
+ writeInt(_objectId);
+ writeString(_msg);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
index ff996b5d0c..7c314ae967 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExPutCommissionResultForVariationMake implements IClientOutgoingPacket
+public class ExPutCommissionResultForVariationMake extends ServerPacket
{
private final int _gemstoneObjId;
private final int _itemId;
@@ -37,14 +36,13 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet);
- packet.writeD(_gemstoneObjId);
- packet.writeD(_itemId);
- packet.writeQ(_gemstoneCount);
- packet.writeQ(_unk1);
- packet.writeD(_unk2);
- return true;
+ ServerPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(this);
+ writeInt(_gemstoneObjId);
+ writeInt(_itemId);
+ writeLong(_gemstoneCount);
+ writeLong(_unk1);
+ writeInt(_unk2);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java
index 098472b7ae..77401c4731 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket
+public class ExPutEnchantScrollItemResult extends ServerPacket
{
private final int _result;
@@ -32,10 +31,9 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(this);
+ writeInt(_result);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
index ffea182a49..24ae7d4359 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author nBd
*/
-public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket
+public class ExPutEnchantSupportItemResult extends ServerPacket
{
private final int _result;
@@ -32,10 +31,9 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
index 8016e128f4..bdf7130e1c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author nBd
*/
-public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket
+public class ExPutEnchantTargetItemResult extends ServerPacket
{
private final int _result;
@@ -32,10 +31,9 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
index 95c0c0e4e1..01756a9814 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPacket
+public class ExPutIntensiveResultForVariationMake extends ServerPacket
{
private final int _refinerItemObjId;
private final int _lifestoneItemId;
@@ -37,14 +36,13 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet);
- packet.writeD(_refinerItemObjId);
- packet.writeD(_lifestoneItemId);
- packet.writeD(_gemstoneItemId);
- packet.writeQ(_gemstoneCount);
- packet.writeD(_unk2);
- return true;
+ ServerPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(this);
+ writeInt(_refinerItemObjId);
+ writeInt(_lifestoneItemId);
+ writeInt(_gemstoneItemId);
+ writeLong(_gemstoneCount);
+ writeInt(_unk2);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
index 2970ca00a2..a63cd691c1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket
+public class ExPutItemResultForVariationCancel extends ServerPacket
{
private final int _itemObjId;
private final int _itemId;
@@ -38,15 +37,14 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet);
- packet.writeD(_itemObjId);
- packet.writeD(_itemId);
- packet.writeD(_itemAug1);
- packet.writeD(_itemAug2);
- packet.writeQ(_price);
- packet.writeD(1);
- return true;
+ ServerPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(this);
+ writeInt(_itemObjId);
+ writeInt(_itemId);
+ writeInt(_itemAug1);
+ writeInt(_itemAug2);
+ writeLong(_price);
+ writeInt(1);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
index c25dd16b01..99a97e6814 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExPutItemResultForVariationMake implements IClientOutgoingPacket
+public class ExPutItemResultForVariationMake extends ServerPacket
{
private final int _itemObjId;
private final int _itemId;
@@ -31,12 +30,11 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet);
- packet.writeD(_itemObjId);
- packet.writeD(_itemId);
- packet.writeD(1);
- return true;
+ ServerPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(this);
+ writeInt(_itemObjId);
+ writeInt(_itemId);
+ writeInt(1);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
index 077f33cb49..1fc254df11 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
@@ -19,10 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
@@ -47,24 +46,23 @@ public class ExQuestItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.EX_QUEST_ITEM_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_items.size());
+ writeInt(_items.size());
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
- packet.writeD(_items.size());
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
+ writeItem(item);
}
- writeInventoryBlock(packet, _player.getInventory());
- return true;
+ writeInventoryBlock(_player.getInventory());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
index bc8896164d..d2fa48d3ed 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
import org.l2jmobius.gameserver.network.NpcStringId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExQuestNpcLogList implements IClientOutgoingPacket
+public class ExQuestNpcLogList extends ServerPacket
{
private final int _questId;
private final List _npcLogList = new ArrayList<>();
@@ -53,17 +52,16 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet);
- packet.writeD(_questId);
- packet.writeC(_npcLogList.size());
+ ServerPackets.EX_QUEST_NPC_LOG_LIST.writeId(this);
+ writeInt(_questId);
+ writeByte(_npcLogList.size());
for (NpcLogListHolder holder : _npcLogList)
{
- packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000);
- packet.writeC(holder.isNpcString() ? 1 : 0);
- packet.writeD(holder.getCount());
+ writeInt(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000);
+ writeByte(holder.isNpcString());
+ writeInt(holder.getCount());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
index 60616b256d..76405e1965 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExRedSky implements IClientOutgoingPacket
+public class ExRedSky extends ServerPacket
{
private final int _duration;
@@ -32,10 +31,9 @@ public class ExRedSky implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RED_SKY.writeId(packet);
- packet.writeD(_duration);
- return true;
+ ServerPackets.EX_RED_SKY.writeId(this);
+ writeInt(_duration);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
index 163faff855..ee8756cdee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExRegenMax implements IClientOutgoingPacket
+public class ExRegenMax extends ServerPacket
{
private final int _time;
private final int _tickInterval;
@@ -33,13 +32,12 @@ public class ExRegenMax implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REGEN_MAX.writeId(packet);
- packet.writeD(1);
- packet.writeD(_time);
- packet.writeD(_tickInterval);
- packet.writeF(_amountPerTick);
- return true;
+ ServerPackets.EX_REGEN_MAX.writeId(this);
+ writeInt(1);
+ writeInt(_time);
+ writeInt(_tickInterval);
+ writeDouble(_amountPerTick);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java
index a17525576b..d9ff218682 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket
+public class ExRemoveEnchantSupportItemResult extends ServerPacket
{
public static final ExRemoveEnchantSupportItemResult STATIC_PACKET = new ExRemoveEnchantSupportItemResult();
@@ -31,9 +30,8 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet);
- return true;
+ ServerPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
index 76375a86f7..077647c6fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
@@ -18,10 +18,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Migi, DS
@@ -40,19 +39,18 @@ public class ExReplyPostItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet);
- packet.writeC(_sendType);
- packet.writeD(_itemList.size());
+ ServerPackets.EX_REPLY_POST_ITEM_LIST.writeId(this);
+ writeByte(_sendType);
+ writeInt(_itemList.size());
if (_sendType == 2)
{
- packet.writeD(_itemList.size());
+ writeInt(_itemList.size());
for (Item item : _itemList)
{
- writeItem(packet, item);
+ writeItem(item);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
index 4e479e75a6..1b76f555b8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
@@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.MailType;
import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
/**
@@ -53,48 +52,47 @@ public class ExReplyReceivedPost extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet);
- packet.writeD(_msg.getMailType().ordinal()); // GOD
+ ServerPackets.EX_REPLY_RECEIVED_POST.writeId(this);
+ writeInt(_msg.getMailType().ordinal()); // GOD
if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)
{
- packet.writeD(SystemMessageId.THE_REGISTRATION_PERIOD_FOR_THE_ITEM_YOU_REGISTERED_HAS_EXPIRED.getId());
- packet.writeD(SystemMessageId.THE_AUCTION_HOUSE_REGISTRATION_PERIOD_HAS_EXPIRED_AND_THE_CORRESPONDING_ITEM_IS_BEING_FORWARDED.getId());
+ writeInt(SystemMessageId.THE_REGISTRATION_PERIOD_FOR_THE_ITEM_YOU_REGISTERED_HAS_EXPIRED.getId());
+ writeInt(SystemMessageId.THE_AUCTION_HOUSE_REGISTRATION_PERIOD_HAS_EXPIRED_AND_THE_CORRESPONDING_ITEM_IS_BEING_FORWARDED.getId());
}
else if (_msg.getMailType() == MailType.COMMISSION_ITEM_SOLD)
{
- packet.writeD(_msg.getItemId());
- packet.writeD(_msg.getEnchantLvl());
+ writeInt(_msg.getItemId());
+ writeInt(_msg.getEnchantLvl());
for (int i = 0; i < 6; i++)
{
- packet.writeD(_msg.getElementals()[i]);
+ writeInt(_msg.getElementals()[i]);
}
- packet.writeD(SystemMessageId.THE_ITEM_YOU_REGISTERED_HAS_BEEN_SOLD.getId());
- packet.writeD(SystemMessageId.S1_HAS_BEEN_SOLD.getId());
+ writeInt(SystemMessageId.THE_ITEM_YOU_REGISTERED_HAS_BEEN_SOLD.getId());
+ writeInt(SystemMessageId.S1_HAS_BEEN_SOLD.getId());
}
- packet.writeD(_msg.getId());
- packet.writeD(_msg.isLocked() ? 1 : 0);
- packet.writeD(0); // Unknown
- packet.writeS(_msg.getSenderName());
- packet.writeS(_msg.getSubject());
- packet.writeS(_msg.getContent());
+ writeInt(_msg.getId());
+ writeInt(_msg.isLocked());
+ writeInt(0); // Unknown
+ writeString(_msg.getSenderName());
+ writeString(_msg.getSubject());
+ writeString(_msg.getContent());
if ((_items != null) && !_items.isEmpty())
{
- packet.writeD(_items.size());
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeQ(_msg.getReqAdena());
- packet.writeD(_msg.hasAttachments() ? 1 : 0);
- packet.writeD(_msg.isReturned() ? 1 : 0);
- return true;
+ writeLong(_msg.getReqAdena());
+ writeInt(_msg.hasAttachments());
+ writeInt(_msg.isReturned());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
index ed490eae91..6562f8ae0f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
@@ -51,31 +50,30 @@ public class ExReplySentPost extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet);
- packet.writeD(0); // GOD
- packet.writeD(_msg.getId());
- packet.writeD(_msg.isLocked() ? 1 : 0);
- packet.writeS(_msg.getReceiverName());
- packet.writeS(_msg.getSubject());
- packet.writeS(_msg.getContent());
+ ServerPackets.EX_REPLY_SENT_POST.writeId(this);
+ writeInt(0); // GOD
+ writeInt(_msg.getId());
+ writeInt(_msg.isLocked());
+ writeString(_msg.getReceiverName());
+ writeString(_msg.getSubject());
+ writeString(_msg.getContent());
if ((_items != null) && !_items.isEmpty())
{
- packet.writeD(_items.size());
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeQ(_msg.getReqAdena());
- packet.writeD(_msg.hasAttachments() ? 1 : 0);
- packet.writeD(_msg.isReturned() ? 1 : 0);
- return true;
+ writeLong(_msg.getReqAdena());
+ writeInt(_msg.hasAttachments());
+ writeInt(_msg.isReturned());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
index e6a3f9bca2..0c8c37131a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ExRequestChangeNicknameColor implements IClientOutgoingPacket
+public class ExRequestChangeNicknameColor extends ServerPacket
{
private final int _itemId;
@@ -32,10 +31,9 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet);
- packet.writeD(_itemId);
- return true;
+ ServerPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(this);
+ writeInt(_itemId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
index 60201b177f..c1520c1a84 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Trigger packet
* @author KenM
*/
-public class ExRequestHackShield implements IClientOutgoingPacket
+public class ExRequestHackShield extends ServerPacket
{
public static final ExRequestHackShield STATIC_PACKET = new ExRequestHackShield();
@@ -32,9 +31,8 @@ public class ExRequestHackShield implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet);
- return true;
+ ServerPackets.EX_REQUEST_HACK_SHIELD.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java
index 75e3b3a945..81c4d8a58d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.BeautyShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.beautyshop.BeautyItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExResponseBeautyList implements IClientOutgoingPacket
+public class ExResponseBeautyList extends ServerPacket
{
public static final int SHOW_FACESHAPE = 1;
public static final int SHOW_HAIRSTYLE = 0;
@@ -51,19 +50,18 @@ public class ExResponseBeautyList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet);
- packet.writeQ(_player.getAdena());
- packet.writeQ(_player.getBeautyTickets());
- packet.writeD(_type);
- packet.writeD(_beautyItem.size());
+ ServerPackets.EX_RESPONSE_BEAUTY_LIST.writeId(this);
+ writeLong(_player.getAdena());
+ writeLong(_player.getBeautyTickets());
+ writeInt(_type);
+ writeInt(_beautyItem.size());
for (BeautyItem item : _beautyItem.values())
{
- packet.writeD(item.getId());
- packet.writeD(1); // Limit
+ writeInt(item.getId());
+ writeInt(1); // Limit
}
- packet.writeD(0);
- return true;
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java
index 4b19201833..6ff0dc65cc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExResponseBeautyRegistReset implements IClientOutgoingPacket
+public class ExResponseBeautyRegistReset extends ServerPacket
{
public static final int FAILURE = 0;
public static final int SUCCESS = 1;
@@ -42,16 +41,15 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet);
- packet.writeQ(_player.getAdena());
- packet.writeQ(_player.getBeautyTickets());
- packet.writeD(_type);
- packet.writeD(_result);
- packet.writeD(_player.getVisualHair());
- packet.writeD(_player.getVisualFace());
- packet.writeD(_player.getVisualHairColor());
- return true;
+ ServerPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(this);
+ writeLong(_player.getAdena());
+ writeLong(_player.getBeautyTickets());
+ writeInt(_type);
+ writeInt(_result);
+ writeInt(_player.getVisualHair());
+ writeInt(_player.getVisualFace());
+ writeInt(_player.getVisualHairColor());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java
index c0922cfb04..ec67c2d8fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExResponseResetList implements IClientOutgoingPacket
+public class ExResponseResetList extends ServerPacket
{
private final Player _player;
@@ -33,14 +32,13 @@ public class ExResponseResetList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet);
- packet.writeQ(_player.getAdena());
- packet.writeQ(_player.getBeautyTickets());
- packet.writeD(_player.getAppearance().getHairStyle());
- packet.writeD(_player.getAppearance().getHairColor());
- packet.writeD(_player.getAppearance().getFace());
- return true;
+ ServerPackets.EX_RESPONSE_RESET_LIST.writeId(this);
+ writeLong(_player.getAdena());
+ writeLong(_player.getBeautyTickets());
+ writeInt(_player.getAppearance().getHairStyle());
+ writeInt(_player.getAppearance().getHairColor());
+ writeInt(_player.getAppearance().getFace());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index f8d602624b..689ae4744e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class ExRestartClient implements IClientOutgoingPacket
+public class ExRestartClient extends ServerPacket
{
public static final ExRestartClient STATIC_PACKET = new ExRestartClient();
@@ -31,9 +30,8 @@ public class ExRestartClient implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
- return true;
+ ServerPackets.EX_RESTART_CLIENT.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java
index a230033d67..8ef6ef5750 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExRotation implements IClientOutgoingPacket
+public class ExRotation extends ServerPacket
{
private final int _charId;
private final int _heading;
@@ -34,11 +33,10 @@ public class ExRotation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ROTATION.writeId(packet);
- packet.writeD(_charId);
- packet.writeD(_heading);
- return true;
+ ServerPackets.EX_ROTATION.writeId(this);
+ writeInt(_charId);
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
index 2646a71e77..ab836a84ce 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
@@ -33,10 +32,9 @@ public class ExRpItemLink extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet);
- writeItem(packet, _item);
- return true;
+ ServerPackets.EX_RP_ITEM_LINK.writeId(this);
+ writeItem(_item);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
index f0c6eba8e9..d9124d8103 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class ExSearchOrc implements IClientOutgoingPacket
+public class ExSearchOrc extends ServerPacket
{
public static final ExSearchOrc STATIC_PACKET = new ExSearchOrc();
@@ -31,9 +30,8 @@ public class ExSearchOrc implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SEARCH_ORC.writeId(packet);
- return true;
+ ServerPackets.EX_SEARCH_ORC.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
index 7a4dced122..a33b36112a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExSendManorList implements IClientOutgoingPacket
+public class ExSendManorList extends ServerPacket
{
public static final ExSendManorList STATIC_PACKET = new ExSendManorList();
@@ -35,15 +34,14 @@ public class ExSendManorList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet);
+ ServerPackets.EX_SEND_MANOR_LIST.writeId(this);
final Collection castles = CastleManager.getInstance().getCastles();
- packet.writeD(castles.size());
+ writeInt(castles.size());
for (Castle castle : castles)
{
- packet.writeD(castle.getResidenceId());
+ writeInt(castle.getResidenceId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
index 2c25cc8bfc..0a842edaf4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
@@ -19,12 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Arrays;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.NpcStringId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExSendUIEvent implements IClientOutgoingPacket
+public class ExSendUIEvent extends ServerPacket
{
// UI Types
public static final int TYPE_COUNT_DOWN = 0;
@@ -121,26 +120,25 @@ public class ExSendUIEvent implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SEND_UIEVENT.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter).
- packet.writeD(0); // unknown
- packet.writeD(0); // unknown
- packet.writeS(String.valueOf(_countUp)); // 0 = count down, 1 = count up timer always disappears 10 seconds before end
- packet.writeS(String.valueOf(_startTime));
- packet.writeS(String.valueOf(_startTime2));
- packet.writeS(String.valueOf(_endTime));
- packet.writeS(String.valueOf(_endTime2));
- packet.writeD(_npcstringId);
+ ServerPackets.EX_SEND_UIEVENT.writeId(this);
+ writeInt(_objectId);
+ writeInt(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter).
+ writeInt(0); // unknown
+ writeInt(0); // unknown
+ writeString(String.valueOf(_countUp)); // 0 = count down, 1 = count up timer always disappears 10 seconds before end
+ writeString(String.valueOf(_startTime));
+ writeString(String.valueOf(_startTime2));
+ writeString(String.valueOf(_endTime));
+ writeString(String.valueOf(_endTime2));
+ writeInt(_npcstringId);
if (_params != null)
{
for (String param : _params)
{
- packet.writeS(param);
+ writeString(param);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index ff475e52e2..9cd8bcfd53 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -20,16 +20,15 @@ import java.awt.Color;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.interfaces.ILocational;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
- * A packet used to draw points and lines on player.
+ * A packet used to draw points and lines on client.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
-public class ExServerPrimitive implements IClientOutgoingPacket
+public class ExServerPrimitive extends ServerPacket
{
private final String _name;
private final int _x;
@@ -62,7 +61,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +75,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +87,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +99,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +109,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +123,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +135,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +147,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on player.
+ * Adds a point to be displayed on client.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -382,46 +381,45 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet);
- packet.writeS(_name);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(65535); // has to do something with display range and angle
- packet.writeD(65535); // has to do something with display range and angle
- packet.writeD(_points.size() + _lines.size());
+ ServerPackets.EX_SERVER_PRIMITIVE.writeId(this);
+ writeString(_name);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(65535); // has to do something with display range and angle
+ writeInt(65535); // has to do something with display range and angle
+ writeInt(_points.size() + _lines.size());
for (Point point : _points)
{
- packet.writeC(1); // Its the type in this case Point
- packet.writeS(point.getName());
+ writeByte(1); // Its the type in this case Point
+ writeString(point.getName());
final int color = point.getColor();
- packet.writeD((color >> 16) & 0xFF); // R
- packet.writeD((color >> 8) & 0xFF); // G
- packet.writeD(color & 0xFF); // B
- packet.writeD(point.isNameColored() ? 1 : 0);
- packet.writeD(point.getX());
- packet.writeD(point.getY());
- packet.writeD(point.getZ());
+ writeInt((color >> 16) & 0xFF); // R
+ writeInt((color >> 8) & 0xFF); // G
+ writeInt(color & 0xFF); // B
+ writeInt(point.isNameColored());
+ writeInt(point.getX());
+ writeInt(point.getY());
+ writeInt(point.getZ());
}
for (Line line : _lines)
{
- packet.writeC(2); // Its the type in this case Line
- packet.writeS(line.getName());
+ writeByte(2); // Its the type in this case Line
+ writeString(line.getName());
final int color = line.getColor();
- packet.writeD((color >> 16) & 0xFF); // R
- packet.writeD((color >> 8) & 0xFF); // G
- packet.writeD(color & 0xFF); // B
- packet.writeD(line.isNameColored() ? 1 : 0);
- packet.writeD(line.getX());
- packet.writeD(line.getY());
- packet.writeD(line.getZ());
- packet.writeD(line.getX2());
- packet.writeD(line.getY2());
- packet.writeD(line.getZ2());
+ writeInt((color >> 16) & 0xFF); // R
+ writeInt((color >> 8) & 0xFF); // G
+ writeInt(color & 0xFF); // B
+ writeInt(line.isNameColored());
+ writeInt(line.getX());
+ writeInt(line.getY());
+ writeInt(line.getZ());
+ writeInt(line.getX2());
+ writeInt(line.getY2());
+ writeInt(line.getZ2());
}
- return true;
}
private static class Point
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
index 51fb91b643..eba48f6ba6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExSetCompassZoneCode implements IClientOutgoingPacket
+public class ExSetCompassZoneCode extends ServerPacket
{
// TODO: Enum
public static final int ALTEREDZONE = 0x08;
@@ -43,10 +42,9 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet);
- packet.writeD(_zoneType);
- return true;
+ ServerPackets.EX_SET_COMPASS_ZONE_CODE.writeId(this);
+ writeInt(_zoneType);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
index 34dee8bda0..33516c7ac2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.PartyDistributionType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExSetPartyLooting implements IClientOutgoingPacket
+public class ExSetPartyLooting extends ServerPacket
{
private final int _result;
private final PartyDistributionType _partyDistributionType;
@@ -35,11 +34,10 @@ public class ExSetPartyLooting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet);
- packet.writeD(_result);
- packet.writeD(_partyDistributionType.getId());
- return true;
+ ServerPackets.EX_SET_PARTY_LOOTING.writeId(this);
+ writeInt(_result);
+ writeInt(_partyDistributionType.getId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
index 4e491af9d1..73c7868428 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExShowAdventurerGuideBook implements IClientOutgoingPacket
+public class ExShowAdventurerGuideBook extends ServerPacket
{
public static final ExShowAdventurerGuideBook STATIC_PACKET = new ExShowAdventurerGuideBook();
@@ -31,9 +30,8 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet);
- return true;
+ ServerPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
index 1f8df76083..b88b779681 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.xml.ClanHallData;
import org.l2jmobius.gameserver.model.residences.ClanHall;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExShowAgitInfo implements IClientOutgoingPacket
+public class ExShowAgitInfo extends ServerPacket
{
public static final ExShowAgitInfo STATIC_PACKET = new ExShowAgitInfo();
@@ -36,18 +35,17 @@ public class ExShowAgitInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet);
+ ServerPackets.EX_SHOW_AGIT_INFO.writeId(this);
final Collection clanHalls = ClanHallData.getInstance().getClanHalls();
- packet.writeD(clanHalls.size());
+ writeInt(clanHalls.size());
clanHalls.forEach(clanHall ->
{
- packet.writeD(clanHall.getResidenceId());
- packet.writeS(clanHall.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(clanHall.getOwnerId()).getName()); // owner clan name
- packet.writeS(clanHall.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(clanHall.getOwnerId()).getLeaderName()); // leader name
- packet.writeD(clanHall.getType().getClientVal()); // Clan hall type
+ writeInt(clanHall.getResidenceId());
+ writeString(clanHall.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(clanHall.getOwnerId()).getName()); // owner clan name
+ writeString(clanHall.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(clanHall.getOwnerId()).getLeaderName()); // leader name
+ writeInt(clanHall.getType().getClientVal()); // Clan hall type
});
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
index 834777139d..9194614756 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
@@ -19,12 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket
+public class ExShowBaseAttributeCancelWindow extends ServerPacket
{
private final List- _items = new ArrayList<>();
private long _price;
@@ -41,16 +40,15 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet);
- packet.writeD(_items.size());
+ ServerPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(this);
+ writeInt(_items.size());
for (Item item : _items)
{
- packet.writeD(item.getObjectId());
- packet.writeQ(getPrice(item));
+ writeInt(item.getObjectId());
+ writeLong(getPrice(item));
}
- return true;
}
/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java
index e22345c4fd..b5e4a377c8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExShowBeautyMenu implements IClientOutgoingPacket
+public class ExShowBeautyMenu extends ServerPacket
{
// TODO: Enum
public static final int MODIFY_APPEARANCE = 0;
@@ -39,13 +38,12 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet);
- packet.writeD(_type);
- packet.writeD(_player.getVisualHair());
- packet.writeD(_player.getVisualHairColor());
- packet.writeD(_player.getVisualFace());
- return true;
+ ServerPackets.EX_SHOW_BEAUTY_MENU.writeId(this);
+ writeInt(_type);
+ writeInt(_player.getVisualHair());
+ writeInt(_player.getVisualHairColor());
+ writeInt(_player.getVisualFace());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
index b0d2b90494..ac464f2319 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
@@ -18,18 +18,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.TaxType;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author KenM
*/
-public class ExShowCastleInfo implements IClientOutgoingPacket
+public class ExShowCastleInfo extends ServerPacket
{
public static final ExShowCastleInfo STATIC_PACKET = new ExShowCastleInfo();
@@ -38,35 +37,34 @@ public class ExShowCastleInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet);
+ ServerPackets.EX_SHOW_CASTLE_INFO.writeId(this);
final Collection castles = CastleManager.getInstance().getCastles();
- packet.writeD(castles.size());
+ writeInt(castles.size());
for (Castle castle : castles)
{
- packet.writeD(castle.getResidenceId());
+ writeInt(castle.getResidenceId());
if (castle.getOwnerId() > 0)
{
if (ClanTable.getInstance().getClan(castle.getOwnerId()) != null)
{
- packet.writeS(ClanTable.getInstance().getClan(castle.getOwnerId()).getName());
+ writeString(ClanTable.getInstance().getClan(castle.getOwnerId()).getName());
}
else
{
PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!");
- packet.writeS("");
+ writeString("");
}
}
else
{
- packet.writeS("");
+ writeString("");
}
- packet.writeD(castle.getTaxPercent(TaxType.BUY));
- packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000));
- packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade
- packet.writeC(castle.getSide().ordinal()); // Grand Crusade
+ writeInt(castle.getTaxPercent(TaxType.BUY));
+ writeInt((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000));
+ writeByte(castle.getSiege().isInProgress()); // Grand Crusade
+ writeByte(castle.getSide().ordinal()); // Grand Crusade
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java
index 80c97d1b30..b9ec37ef17 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
@@ -37,12 +36,11 @@ public class ExShowChannelingEffect extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet);
- packet.writeD(_caster.getObjectId());
- packet.writeD(_target.getObjectId());
- packet.writeD(_state);
- return true;
+ ServerPackets.EX_SHOW_CHANNELING_EFFECT.writeId(this);
+ writeInt(_caster.getObjectId());
+ writeInt(_target.getObjectId());
+ writeInt(_state);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
index f9a6ebe0e7..09eab75f93 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid, mrTJO
*/
-public class ExShowContactList implements IClientOutgoingPacket
+public class ExShowContactList extends ServerPacket
{
private final Set _contacts;
@@ -35,11 +34,10 @@ public class ExShowContactList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet);
- packet.writeD(_contacts.size());
- _contacts.forEach(packet::writeS);
- return true;
+ ServerPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(this);
+ writeInt(_contacts.size());
+ _contacts.forEach(this::writeString);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
index 94b989b583..71d004edb8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.CropProcure;
import org.l2jmobius.gameserver.model.Seed;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExShowCropInfo implements IClientOutgoingPacket
+public class ExShowCropInfo extends ServerPacket
{
private final List _crops;
private final int _manorId;
@@ -42,41 +41,40 @@ public class ExShowCropInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet);
- packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button
- packet.writeD(_manorId); // Manor ID
- packet.writeD(0);
+ ServerPackets.EX_SHOW_CROP_INFO.writeId(this);
+ writeByte(_hideButtons); // Hide "Crop Sales" button
+ writeInt(_manorId); // Manor ID
+ writeInt(0);
if (_crops != null)
{
- packet.writeD(_crops.size());
+ writeInt(_crops.size());
for (CropProcure crop : _crops)
{
- packet.writeD(crop.getId()); // Crop id
- packet.writeQ(crop.getAmount()); // Buy residual
- packet.writeQ(crop.getStartAmount()); // Buy
- packet.writeQ(crop.getPrice()); // Buy price
- packet.writeC(crop.getReward()); // Reward
+ writeInt(crop.getId()); // Crop id
+ writeLong(crop.getAmount()); // Buy residual
+ writeLong(crop.getStartAmount()); // Buy
+ writeLong(crop.getPrice()); // Buy price
+ writeByte(crop.getReward()); // Reward
final Seed seed = CastleManorManager.getInstance().getSeedByCrop(crop.getId());
if (seed == null)
{
- packet.writeD(0); // Seed level
- packet.writeC(1); // Reward 1
- packet.writeD(0); // Reward 1 - item id
- packet.writeC(1); // Reward 2
- packet.writeD(0); // Reward 2 - item id
+ writeInt(0); // Seed level
+ writeByte(1); // Reward 1
+ writeInt(0); // Reward 1 - item id
+ writeByte(1); // Reward 2
+ writeInt(0); // Reward 2 - item id
}
else
{
- packet.writeD(seed.getLevel()); // Seed level
- packet.writeC(1); // Reward 1
- packet.writeD(seed.getReward(1)); // Reward 1 - item id
- packet.writeC(1); // Reward 2
- packet.writeD(seed.getReward(2)); // Reward 2 - item id
+ writeInt(seed.getLevel()); // Seed level
+ writeByte(1); // Reward 1
+ writeInt(seed.getReward(1)); // Reward 1 - item id
+ writeByte(1); // Reward 2
+ writeInt(seed.getReward(2)); // Reward 2 - item id
}
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
index 1f01ee7b87..fd3aee239c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
@@ -20,16 +20,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.CropProcure;
import org.l2jmobius.gameserver.model.Seed;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExShowCropSetting implements IClientOutgoingPacket
+public class ExShowCropSetting extends ServerPacket
{
private final int _manorId;
private final Set _seeds;
@@ -59,54 +58,53 @@ public class ExShowCropSetting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet);
- packet.writeD(_manorId); // manor id
- packet.writeD(_seeds.size()); // size
+ ServerPackets.EX_SHOW_CROP_SETTING.writeId(this);
+ writeInt(_manorId); // manor id
+ writeInt(_seeds.size()); // size
for (Seed s : _seeds)
{
- packet.writeD(s.getCropId()); // crop id
- packet.writeD(s.getLevel()); // seed level
- packet.writeC(1);
- packet.writeD(s.getReward(1)); // reward 1 id
- packet.writeC(1);
- packet.writeD(s.getReward(2)); // reward 2 id
- packet.writeD(s.getCropLimit()); // next sale limit
- packet.writeD(0); // ???
- packet.writeD(s.getCropMinPrice()); // min crop price
- packet.writeD(s.getCropMaxPrice()); // max crop price
+ writeInt(s.getCropId()); // crop id
+ writeInt(s.getLevel()); // seed level
+ writeByte(1);
+ writeInt(s.getReward(1)); // reward 1 id
+ writeByte(1);
+ writeInt(s.getReward(2)); // reward 2 id
+ writeInt(s.getCropLimit()); // next sale limit
+ writeInt(0); // ???
+ writeInt(s.getCropMinPrice()); // min crop price
+ writeInt(s.getCropMaxPrice()); // max crop price
// Current period
if (_current.containsKey(s.getCropId()))
{
final CropProcure cp = _current.get(s.getCropId());
- packet.writeQ(cp.getStartAmount()); // buy
- packet.writeQ(cp.getPrice()); // price
- packet.writeC(cp.getReward()); // reward
+ writeLong(cp.getStartAmount()); // buy
+ writeLong(cp.getPrice()); // price
+ writeByte(cp.getReward()); // reward
}
else
{
- packet.writeQ(0);
- packet.writeQ(0);
- packet.writeC(0);
+ writeLong(0);
+ writeLong(0);
+ writeByte(0);
}
// Next period
if (_next.containsKey(s.getCropId()))
{
final CropProcure cp = _next.get(s.getCropId());
- packet.writeQ(cp.getStartAmount()); // buy
- packet.writeQ(cp.getPrice()); // price
- packet.writeC(cp.getReward()); // reward
+ writeLong(cp.getStartAmount()); // buy
+ writeLong(cp.getPrice()); // price
+ writeByte(cp.getReward()); // reward
}
else
{
- packet.writeQ(0);
- packet.writeQ(0);
- packet.writeC(0);
+ writeLong(0);
+ writeLong(0);
+ writeByte(0);
}
}
_next.clear();
_current.clear();
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
index b625a1e4e7..bda5e36d4a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Fort;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExShowFortressInfo implements IClientOutgoingPacket
+public class ExShowFortressInfo extends ServerPacket
{
public static final ExShowFortressInfo STATIC_PACKET = new ExShowFortressInfo();
@@ -36,20 +35,19 @@ public class ExShowFortressInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet);
+ ServerPackets.EX_SHOW_FORTRESS_INFO.writeId(this);
final Collection forts = FortManager.getInstance().getForts();
- packet.writeD(forts.size());
+ writeInt(forts.size());
for (Fort fort : forts)
{
final Clan clan = fort.getOwnerClan();
- packet.writeD(fort.getResidenceId());
- packet.writeS(clan != null ? clan.getName() : "");
- packet.writeD(fort.getSiege().isInProgress() ? 1 : 0);
+ writeInt(fort.getResidenceId());
+ writeString(clan != null ? clan.getName() : "");
+ writeInt(fort.getSiege().isInProgress());
// Time of possession
- packet.writeD(fort.getOwnedTime());
+ writeInt(fort.getOwnedTime());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
index 678ab43e96..3073e5bdfe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
@@ -18,18 +18,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.model.FortSiegeSpawn;
import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.siege.Fort;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* TODO: Rewrite!!!!!!
* @author KenM
*/
-public class ExShowFortressMapInfo implements IClientOutgoingPacket
+public class ExShowFortressMapInfo extends ServerPacket
{
private final Fort _fortress;
@@ -39,12 +38,12 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet);
- packet.writeD(_fortress.getResidenceId());
- packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status
- packet.writeD(_fortress.getFortSize()); // barracks count
+ ServerPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(this);
+ writeInt(_fortress.getResidenceId());
+ writeInt(_fortress.getSiege().isInProgress()); // fortress siege status
+ writeInt(_fortress.getFortSize()); // barracks count
final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress())
{
@@ -56,11 +55,11 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket
{
if (isSpawned(spawn.getId()))
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(1);
+ writeInt(1);
}
}
break;
@@ -73,15 +72,15 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket
count++;
if (count == 4)
{
- packet.writeD(1); // TODO: control room emulated
+ writeInt(1); // TODO: control room emulated
}
if (isSpawned(spawn.getId()))
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(1);
+ writeInt(1);
}
}
break;
@@ -92,10 +91,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket
{
for (int i = 0; i < _fortress.getFortSize(); i++)
{
- packet.writeD(0);
+ writeInt(0);
}
}
- return true;
}
/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
index da186103ae..fd8833c67a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
@@ -18,17 +18,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.model.FortSiegeSpawn;
import org.l2jmobius.gameserver.model.siege.Fort;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* TODO: Rewrite!!!
* @author KenM
*/
-public class ExShowFortressSiegeInfo implements IClientOutgoingPacket
+public class ExShowFortressSiegeInfo extends ServerPacket
{
private final int _fortId;
private final int _size;
@@ -48,11 +47,11 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet);
- packet.writeD(_fortId); // Fortress Id
- packet.writeD(_size); // Total Barracks Count
+ ServerPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(this);
+ writeInt(_fortId); // Fortress Id
+ writeInt(_size); // Total Barracks Count
if (_csize > 0)
{
switch (_csize)
@@ -63,22 +62,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket
{
case 0:
{
- packet.writeD(3);
+ writeInt(3);
break;
}
case 1:
{
- packet.writeD(2);
+ writeInt(2);
break;
}
case 2:
{
- packet.writeD(1);
+ writeInt(1);
break;
}
case 3:
{
- packet.writeD(0);
+ writeInt(0);
break;
}
}
@@ -88,30 +87,30 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket
{
switch (_csize2)
{
- // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room
+ // TODO: once control room supported, update writeInt(0x0x) to support 5th room
case 0:
{
- packet.writeD(5);
+ writeInt(5);
break;
}
case 1:
{
- packet.writeD(4);
+ writeInt(4);
break;
}
case 2:
{
- packet.writeD(3);
+ writeInt(3);
break;
}
case 3:
{
- packet.writeD(2);
+ writeInt(2);
break;
}
case 4:
{
- packet.writeD(1);
+ writeInt(1);
break;
}
}
@@ -123,9 +122,8 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket
{
for (int i = 0; i < _size; i++)
{
- packet.writeD(0);
+ writeInt(0);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
index 912839e242..2cdf16e4d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.Seed;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExShowManorDefaultInfo implements IClientOutgoingPacket
+public class ExShowManorDefaultInfo extends ServerPacket
{
private final List _crops;
private final boolean _hideButtons;
@@ -38,22 +37,21 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet);
- packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons
- packet.writeD(_crops.size());
+ ServerPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(this);
+ writeByte(_hideButtons); // Hide "Seed Purchase" and "Crop Sales" buttons
+ writeInt(_crops.size());
for (Seed crop : _crops)
{
- packet.writeD(crop.getCropId()); // crop Id
- packet.writeD(crop.getLevel()); // level
- packet.writeD(crop.getSeedReferencePrice()); // seed price
- packet.writeD(crop.getCropReferencePrice()); // crop price
- packet.writeC(1); // Reward 1 type
- packet.writeD(crop.getReward(1)); // Reward 1 itemId
- packet.writeC(1); // Reward 2 type
- packet.writeD(crop.getReward(2)); // Reward 2 itemId
+ writeInt(crop.getCropId()); // crop Id
+ writeInt(crop.getLevel()); // level
+ writeInt(crop.getSeedReferencePrice()); // seed price
+ writeInt(crop.getCropReferencePrice()); // crop price
+ writeByte(1); // Reward 1 type
+ writeInt(crop.getReward(1)); // Reward 1 itemId
+ writeByte(1); // Reward 2 type
+ writeInt(crop.getReward(2)); // Reward 2 itemId
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
index d03ce2a5fd..f36f439c60 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
@@ -20,17 +20,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.CropProcure;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExShowProcureCropDetail implements IClientOutgoingPacket
+public class ExShowProcureCropDetail extends ServerPacket
{
private final int _cropId;
private final Map _castleCrops = new HashMap<>();
@@ -49,19 +48,18 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet);
- packet.writeD(_cropId); // crop id
- packet.writeD(_castleCrops.size()); // size
+ ServerPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(this);
+ writeInt(_cropId); // crop id
+ writeInt(_castleCrops.size()); // size
for (Entry entry : _castleCrops.entrySet())
{
final CropProcure crop = entry.getValue();
- packet.writeD(entry.getKey()); // manor name
- packet.writeQ(crop.getAmount()); // buy residual
- packet.writeQ(crop.getPrice()); // buy price
- packet.writeC(crop.getReward()); // reward type
+ writeInt(entry.getKey()); // manor name
+ writeLong(crop.getAmount()); // buy residual
+ writeLong(crop.getPrice()); // buy price
+ writeByte(crop.getReward()); // reward type
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
index f41999329f..ccb14b50df 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Luca Baldi
*/
-public class ExShowQuestInfo implements IClientOutgoingPacket
+public class ExShowQuestInfo extends ServerPacket
{
public static final ExShowQuestInfo STATIC_PACKET = new ExShowQuestInfo();
@@ -31,9 +30,8 @@ public class ExShowQuestInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet);
- return true;
+ ServerPackets.EX_SHOW_QUEST_INFO.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
index 0fa64c401d..068ddc4f2f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Luca Baldi
*/
-public class ExShowQuestMark implements IClientOutgoingPacket
+public class ExShowQuestMark extends ServerPacket
{
private final int _questId;
private final int _questState;
@@ -34,11 +33,10 @@ public class ExShowQuestMark implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet);
- packet.writeD(_questId);
- packet.writeD(_questState);
- return true;
+ ServerPackets.EX_SHOW_QUEST_MARK.writeId(this);
+ writeInt(_questId);
+ writeInt(_questState);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
index 355f61a44a..7ea7b535a7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
@@ -18,17 +18,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.MailType;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @author Migi, DS
*/
-public class ExShowReceivedPostList implements IClientOutgoingPacket
+public class ExShowReceivedPostList extends ServerPacket
{
private static final int MESSAGE_FEE = 100;
private static final int MESSAGE_FEE_PER_SLOT = 1000;
@@ -41,42 +40,41 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet);
- packet.writeD((int) (System.currentTimeMillis() / 1000));
+ ServerPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(this);
+ writeInt((int) (System.currentTimeMillis() / 1000));
if ((_inbox != null) && !_inbox.isEmpty())
{
- packet.writeD(_inbox.size());
+ writeInt(_inbox.size());
for (Message msg : _inbox)
{
- packet.writeD(msg.getMailType().ordinal());
+ writeInt(msg.getMailType().ordinal());
if (msg.getMailType() == MailType.COMMISSION_ITEM_SOLD)
{
- packet.writeD(SystemMessageId.THE_ITEM_YOU_REGISTERED_HAS_BEEN_SOLD.getId());
+ writeInt(SystemMessageId.THE_ITEM_YOU_REGISTERED_HAS_BEEN_SOLD.getId());
}
else if (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)
{
- packet.writeD(SystemMessageId.THE_REGISTRATION_PERIOD_FOR_THE_ITEM_YOU_REGISTERED_HAS_EXPIRED.getId());
+ writeInt(SystemMessageId.THE_REGISTRATION_PERIOD_FOR_THE_ITEM_YOU_REGISTERED_HAS_EXPIRED.getId());
}
- packet.writeD(msg.getId());
- packet.writeS(msg.getSubject());
- packet.writeS(msg.getSenderName());
- packet.writeD(msg.isLocked() ? 1 : 0);
- packet.writeD(msg.getExpirationSeconds());
- packet.writeD(msg.isUnread() ? 1 : 0);
- packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1);
- packet.writeD(msg.hasAttachments() ? 1 : 0);
- packet.writeD(msg.isReturned() ? 1 : 0);
- packet.writeD(0); // SysString in some case it seems
+ writeInt(msg.getId());
+ writeString(msg.getSubject());
+ writeString(msg.getSenderName());
+ writeInt(msg.isLocked());
+ writeInt(msg.getExpirationSeconds());
+ writeInt(msg.isUnread());
+ writeInt(!((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)));
+ writeInt(msg.hasAttachments());
+ writeInt(msg.isReturned());
+ writeInt(0); // SysString in some case it seems
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(MESSAGE_FEE);
- packet.writeD(MESSAGE_FEE_PER_SLOT);
- return true;
+ writeInt(MESSAGE_FEE);
+ writeInt(MESSAGE_FEE_PER_SLOT);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
index deebb99c8f..2b5ee5a313 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
@@ -20,10 +20,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.NpcStringId.NSLocalisation;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation;
@@ -31,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation;
* ExShowScreenMessage server packet implementation.
* @author Kerberos
*/
-public class ExShowScreenMessage implements IClientOutgoingPacket
+public class ExShowScreenMessage extends ServerPacket
{
// Positions
public static final byte TOP_LEFT = 1;
@@ -263,9 +262,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet);
+ ServerPackets.EX_SHOW_SCREEN_MESSAGE.writeId(this);
// Localisation related.
if (_lang != null)
{
@@ -277,19 +276,19 @@ public class ExShowScreenMessage implements IClientOutgoingPacket
final SMLocalisation sml = sm.getLocalisation(_lang);
if (sml != null)
{
- packet.writeD(_type);
- packet.writeD(-1);
- packet.writeD(_position);
- packet.writeD(_unk1);
- packet.writeD(_size);
- packet.writeD(_unk2);
- packet.writeD(_unk3);
- packet.writeD(_effect ? 1 : 0);
- packet.writeD(_time);
- packet.writeD(_fade ? 1 : 0);
- packet.writeD(-1);
- packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList()));
- return true;
+ writeInt(_type);
+ writeInt(-1);
+ writeInt(_position);
+ writeInt(_unk1);
+ writeInt(_size);
+ writeInt(_unk2);
+ writeInt(_unk3);
+ writeInt(_effect);
+ writeInt(_time);
+ writeInt(_fade);
+ writeInt(-1);
+ writeString(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList()));
+ return;
}
}
}
@@ -301,45 +300,45 @@ public class ExShowScreenMessage implements IClientOutgoingPacket
final NSLocalisation nsl = ns.getLocalisation(_lang);
if (nsl != null)
{
- packet.writeD(_type);
- packet.writeD(-1);
- packet.writeD(_position);
- packet.writeD(_unk1);
- packet.writeD(_size);
- packet.writeD(_unk2);
- packet.writeD(_unk3);
- packet.writeD(_effect ? 1 : 0);
- packet.writeD(_time);
- packet.writeD(_fade ? 1 : 0);
- packet.writeD(-1);
- packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList()));
- return true;
+ writeInt(_type);
+ writeInt(-1);
+ writeInt(_position);
+ writeInt(_unk1);
+ writeInt(_size);
+ writeInt(_unk2);
+ writeInt(_unk3);
+ writeInt(_effect);
+ writeInt(_time);
+ writeInt(_fade);
+ writeInt(-1);
+ writeString(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList()));
+ return;
}
}
}
}
- packet.writeD(_type);
- packet.writeD(_sysMessageId);
- packet.writeD(_position);
- packet.writeD(_unk1);
- packet.writeD(_size);
- packet.writeD(_unk2);
- packet.writeD(_unk3);
- packet.writeD(_effect ? 1 : 0);
- packet.writeD(_time);
- packet.writeD(_fade ? 1 : 0);
- packet.writeD(_npcString);
+ writeInt(_type);
+ writeInt(_sysMessageId);
+ writeInt(_position);
+ writeInt(_unk1);
+ writeInt(_size);
+ writeInt(_unk2);
+ writeInt(_unk3);
+ writeInt(_effect);
+ writeInt(_time);
+ writeInt(_fade);
+ writeInt(_npcString);
if (_npcString == -1)
{
- packet.writeS(_text);
+ writeString(_text);
}
else if (_parameters != null)
{
for (String s : _parameters)
{
- packet.writeS(s);
+ writeString(s);
}
}
- return true;
+ return;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
index 6123b08991..f2d741b2df 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.Seed;
import org.l2jmobius.gameserver.model.SeedProduction;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExShowSeedInfo implements IClientOutgoingPacket
+public class ExShowSeedInfo extends ServerPacket
{
private final List _seeds;
private final int _manorId;
@@ -42,42 +41,41 @@ public class ExShowSeedInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet);
- packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button
- packet.writeD(_manorId); // Manor ID
- packet.writeD(0); // Unknown
+ ServerPackets.EX_SHOW_SEED_INFO.writeId(this);
+ writeByte(_hideButtons); // Hide "Seed Purchase" button
+ writeInt(_manorId); // Manor ID
+ writeInt(0); // Unknown
if (_seeds == null)
{
- packet.writeD(0);
- return true;
+ writeInt(0);
+ return;
}
- packet.writeD(_seeds.size());
+ writeInt(_seeds.size());
for (SeedProduction seed : _seeds)
{
- packet.writeD(seed.getId()); // Seed id
- packet.writeQ(seed.getAmount()); // Left to buy
- packet.writeQ(seed.getStartAmount()); // Started amount
- packet.writeQ(seed.getPrice()); // Sell Price
+ writeInt(seed.getId()); // Seed id
+ writeLong(seed.getAmount()); // Left to buy
+ writeLong(seed.getStartAmount()); // Started amount
+ writeLong(seed.getPrice()); // Sell Price
final Seed s = CastleManorManager.getInstance().getSeed(seed.getId());
if (s == null)
{
- packet.writeD(0); // Seed level
- packet.writeC(1); // Reward 1
- packet.writeD(0); // Reward 1 - item id
- packet.writeC(1); // Reward 2
- packet.writeD(0); // Reward 2 - item id
+ writeInt(0); // Seed level
+ writeByte(1); // Reward 1
+ writeInt(0); // Reward 1 - item id
+ writeByte(1); // Reward 2
+ writeInt(0); // Reward 2 - item id
}
else
{
- packet.writeD(s.getLevel()); // Seed level
- packet.writeC(1); // Reward 1
- packet.writeD(s.getReward(1)); // Reward 1 - item id
- packet.writeC(1); // Reward 2
- packet.writeD(s.getReward(2)); // Reward 2 - item id
+ writeInt(s.getLevel()); // Seed level
+ writeByte(1); // Reward 1
+ writeInt(s.getReward(1)); // Reward 1 - item id
+ writeByte(1); // Reward 2
+ writeInt(s.getReward(2)); // Reward 2 - item id
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
index eb6e686e10..a53b932b03 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.GraciaSeedsManager;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExShowSeedMapInfo implements IClientOutgoingPacket
+public class ExShowSeedMapInfo extends ServerPacket
{
public static final ExShowSeedMapInfo STATIC_PACKET = new ExShowSeedMapInfo();
@@ -29,17 +28,16 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet);
- packet.writeD(2); // seed count
+ ServerPackets.EX_SHOW_SEED_MAP_INFO.writeId(this);
+ writeInt(2); // seed count
// Seed of Destruction
- packet.writeD(1); // id 1? Grand Crusade
- packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id
+ writeInt(1); // id 1? Grand Crusade
+ writeInt(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id
// Seed of Infinity
- packet.writeD(2); // id 2? Grand Crusade
+ writeInt(2); // id 2? Grand Crusade
// Manager not implemented yet
- packet.writeD(2766); // sys msg id
- return true;
+ writeInt(2766); // sys msg id
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
index 373c314eba..6f4ef84b5e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
@@ -20,16 +20,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.Seed;
import org.l2jmobius.gameserver.model.SeedProduction;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExShowSeedSetting implements IClientOutgoingPacket
+public class ExShowSeedSetting extends ServerPacket
{
private final int _manorId;
private final Set _seeds;
@@ -59,50 +58,49 @@ public class ExShowSeedSetting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet);
- packet.writeD(_manorId); // manor id
- packet.writeD(_seeds.size()); // size
+ ServerPackets.EX_SHOW_SEED_SETTING.writeId(this);
+ writeInt(_manorId); // manor id
+ writeInt(_seeds.size()); // size
for (Seed s : _seeds)
{
- packet.writeD(s.getSeedId()); // seed id
- packet.writeD(s.getLevel()); // level
- packet.writeC(1);
- packet.writeD(s.getReward(1)); // reward 1 id
- packet.writeC(1);
- packet.writeD(s.getReward(2)); // reward 2 id
- packet.writeD(s.getSeedLimit()); // next sale limit
- packet.writeD(s.getSeedReferencePrice()); // price for castle to produce 1
- packet.writeD(s.getSeedMinPrice()); // min seed price
- packet.writeD(s.getSeedMaxPrice()); // max seed price
+ writeInt(s.getSeedId()); // seed id
+ writeInt(s.getLevel()); // level
+ writeByte(1);
+ writeInt(s.getReward(1)); // reward 1 id
+ writeByte(1);
+ writeInt(s.getReward(2)); // reward 2 id
+ writeInt(s.getSeedLimit()); // next sale limit
+ writeInt(s.getSeedReferencePrice()); // price for castle to produce 1
+ writeInt(s.getSeedMinPrice()); // min seed price
+ writeInt(s.getSeedMaxPrice()); // max seed price
// Current period
if (_current.containsKey(s.getSeedId()))
{
final SeedProduction sp = _current.get(s.getSeedId());
- packet.writeQ(sp.getStartAmount()); // sales
- packet.writeQ(sp.getPrice()); // price
+ writeLong(sp.getStartAmount()); // sales
+ writeLong(sp.getPrice()); // price
}
else
{
- packet.writeQ(0);
- packet.writeQ(0);
+ writeLong(0);
+ writeLong(0);
}
// Next period
if (_next.containsKey(s.getSeedId()))
{
final SeedProduction sp = _next.get(s.getSeedId());
- packet.writeQ(sp.getStartAmount()); // sales
- packet.writeQ(sp.getPrice()); // price
+ writeLong(sp.getStartAmount()); // sales
+ writeLong(sp.getPrice()); // price
}
else
{
- packet.writeQ(0);
- packet.writeQ(0);
+ writeLong(0);
+ writeLong(0);
}
}
_current.clear();
_next.clear();
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
index 269bec5b97..59911bba04 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
@@ -19,18 +19,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.HashMap;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.CropProcure;
import org.l2jmobius.gameserver.model.Seed;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author l3x
*/
-public class ExShowSellCropList implements IClientOutgoingPacket
+public class ExShowSellCropList extends ServerPacket
{
private final int _manorId;
private final Map _cropsItems = new HashMap<>();
@@ -57,38 +56,37 @@ public class ExShowSellCropList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet);
- packet.writeD(_manorId); // manor id
- packet.writeD(_cropsItems.size()); // size
+ ServerPackets.EX_SHOW_SELL_CROP_LIST.writeId(this);
+ writeInt(_manorId); // manor id
+ writeInt(_cropsItems.size()); // size
for (Item item : _cropsItems.values())
{
final Seed seed = CastleManorManager.getInstance().getSeedByCrop(item.getId());
- packet.writeD(item.getObjectId()); // Object id
- packet.writeD(item.getId()); // crop id
- packet.writeD(seed.getLevel()); // seed level
- packet.writeC(1);
- packet.writeD(seed.getReward(1)); // reward 1 id
- packet.writeC(1);
- packet.writeD(seed.getReward(2)); // reward 2 id
+ writeInt(item.getObjectId()); // Object id
+ writeInt(item.getId()); // crop id
+ writeInt(seed.getLevel()); // seed level
+ writeByte(1);
+ writeInt(seed.getReward(1)); // reward 1 id
+ writeByte(1);
+ writeInt(seed.getReward(2)); // reward 2 id
if (_castleCrops.containsKey(item.getId()))
{
final CropProcure crop = _castleCrops.get(item.getId());
- packet.writeD(_manorId); // manor
- packet.writeQ(crop.getAmount()); // buy residual
- packet.writeQ(crop.getPrice()); // buy price
- packet.writeC(crop.getReward()); // reward
+ writeInt(_manorId); // manor
+ writeLong(crop.getAmount()); // buy residual
+ writeLong(crop.getPrice()); // buy price
+ writeByte(crop.getReward()); // reward
}
else
{
- packet.writeD(0xFFFFFFFF); // manor
- packet.writeQ(0); // buy residual
- packet.writeQ(0); // buy price
- packet.writeC(0); // reward
+ writeInt(0xFFFFFFFF); // manor
+ writeLong(0); // buy residual
+ writeLong(0); // buy price
+ writeByte(0); // reward
}
- packet.writeQ(item.getCount()); // my crops
+ writeLong(item.getCount()); // my crops
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
index da5f9f469f..6457a180a0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Migi, DS
*/
-public class ExShowSentPostList implements IClientOutgoingPacket
+public class ExShowSentPostList extends ServerPacket
{
private final List _outbox;
@@ -36,30 +35,29 @@ public class ExShowSentPostList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet);
- packet.writeD((int) (System.currentTimeMillis() / 1000));
+ ServerPackets.EX_SHOW_SENT_POST_LIST.writeId(this);
+ writeInt((int) (System.currentTimeMillis() / 1000));
if ((_outbox != null) && !_outbox.isEmpty())
{
- packet.writeD(_outbox.size());
+ writeInt(_outbox.size());
for (Message msg : _outbox)
{
- packet.writeD(msg.getId());
- packet.writeS(msg.getSubject());
- packet.writeS(msg.getReceiverName());
- packet.writeD(msg.isLocked() ? 1 : 0);
- packet.writeD(msg.getExpirationSeconds());
- packet.writeD(msg.isUnread() ? 1 : 0);
- packet.writeD(1);
- packet.writeD(msg.hasAttachments() ? 1 : 0);
- packet.writeD(0);
+ writeInt(msg.getId());
+ writeString(msg.getSubject());
+ writeString(msg.getReceiverName());
+ writeInt(msg.isLocked());
+ writeInt(msg.getExpirationSeconds());
+ writeInt(msg.isUnread());
+ writeInt(1);
+ writeInt(msg.hasAttachments());
+ writeInt(0);
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
index 0dca57f2f8..e5fa2eba8d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.interfaces.ILocational;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Note: There is known issue with this packet, it cannot be removed unless game client is restarted!
* @author UnAfraid
*/
-public class ExShowTerritory implements IClientOutgoingPacket
+public class ExShowTerritory extends ServerPacket
{
private final int _minZ;
private final int _maxZ;
@@ -45,17 +44,16 @@ public class ExShowTerritory implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet);
- packet.writeD(_vertices.size());
- packet.writeD(_minZ);
- packet.writeD(_maxZ);
+ ServerPackets.EX_SHOW_TERRITORY.writeId(this);
+ writeInt(_vertices.size());
+ writeInt(_minZ);
+ writeInt(_maxZ);
for (ILocational loc : _vertices)
{
- packet.writeD(loc.getX());
- packet.writeD(loc.getY());
+ writeInt(loc.getX());
+ writeInt(loc.getY());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
index 86e1009bbf..608b6f0239 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
@@ -19,16 +19,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.interfaces.ILocational;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* This packet shows the mouse click particle for 30 seconds on every location.
* @author NosBit
*/
-public class ExShowTrace implements IClientOutgoingPacket
+public class ExShowTrace extends ServerPacket
{
private final List _locations = new ArrayList<>();
@@ -43,18 +42,17 @@ public class ExShowTrace implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_TRACE.writeId(packet);
- packet.writeH(0); // type broken in H5
- packet.writeD(0); // time broken in H5
- packet.writeH(_locations.size());
+ ServerPackets.EX_SHOW_TRACE.writeId(this);
+ writeShort(0); // type broken in H5
+ writeInt(0); // time broken in H5
+ writeShort(_locations.size());
for (Location loc : _locations)
{
- packet.writeD(loc.getX());
- packet.writeD(loc.getY());
- packet.writeD(loc.getZ());
+ writeInt(loc.getX());
+ writeInt(loc.getY());
+ writeInt(loc.getZ());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
index 836a5c9624..e7a13bfee7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExShowUsm implements IClientOutgoingPacket
+public class ExShowUsm extends ServerPacket
{
public static final ExShowUsm GOD_INTRO = new ExShowUsm(2);
public static final ExShowUsm SECOND_TRANSFER_QUEST = new ExShowUsm(4);
@@ -41,10 +40,9 @@ public class ExShowUsm implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_USM.writeId(packet);
- packet.writeD(_videoId);
- return true;
+ ServerPackets.EX_SHOW_USM.writeId(this);
+ writeInt(_videoId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
index 1f1a14c31b..86b1f3430f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExShowVariationCancelWindow implements IClientOutgoingPacket
+public class ExShowVariationCancelWindow extends ServerPacket
{
public static final ExShowVariationCancelWindow STATIC_PACKET = new ExShowVariationCancelWindow();
@@ -31,9 +30,8 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet);
- return true;
+ ServerPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
index 9870424e26..cb9a0a91d5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Trigger packet
* @author KenM
*/
-public class ExShowVariationMakeWindow implements IClientOutgoingPacket
+public class ExShowVariationMakeWindow extends ServerPacket
{
public static final ExShowVariationMakeWindow STATIC_PACKET = new ExShowVariationMakeWindow();
@@ -32,9 +31,8 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet);
- return true;
+ ServerPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
index 86211c8d97..68b41a8c87 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExSpawnEmitter implements IClientOutgoingPacket
+public class ExSpawnEmitter extends ServerPacket
{
private final int _playerObjectId;
private final int _npcObjectId;
@@ -41,12 +40,11 @@ public class ExSpawnEmitter implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet);
- packet.writeD(_npcObjectId);
- packet.writeD(_playerObjectId);
- packet.writeD(0); // ?
- return true;
+ ServerPackets.EX_SPAWN_EMITTER.writeId(this);
+ writeInt(_npcObjectId);
+ writeInt(_playerObjectId);
+ writeInt(0); // ?
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
index 534549b4fe..b04b0e9337 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.Movie;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExStartScenePlayer implements IClientOutgoingPacket
+public class ExStartScenePlayer extends ServerPacket
{
private final Movie _movie;
@@ -33,10 +32,9 @@ public class ExStartScenePlayer implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet);
- packet.writeD(_movie.getClientId());
- return true;
+ ServerPackets.EX_START_SCENE_PLAYER.writeId(this);
+ writeInt(_movie.getClientId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
index babac59129..5698391aa2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author kerberos
*/
-public class ExStopMoveAirShip implements IClientOutgoingPacket
+public class ExStopMoveAirShip extends ServerPacket
{
private final int _objectId;
private final int _x;
@@ -41,14 +40,13 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- return true;
+ ServerPackets.EX_STOP_MOVE_AIR_SHIP.writeId(this);
+ writeInt(_objectId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
index d3e67afe99..d5f541b67a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* update 27.8.10
* @author kerberos, JIV
*/
-public class ExStopMoveInAirShip implements IClientOutgoingPacket
+public class ExStopMoveInAirShip extends ServerPacket
{
private final Player _player;
private final int _shipObjId;
@@ -41,15 +40,14 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_shipObjId);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- packet.writeD(_h);
- return true;
+ ServerPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_shipObjId);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeInt(_h);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java
index f5b3e1340f..3e82e2f960 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.Movie;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author St3eT
*/
-public class ExStopScenePlayer implements IClientOutgoingPacket
+public class ExStopScenePlayer extends ServerPacket
{
private final Movie _movie;
@@ -33,10 +32,9 @@ public class ExStopScenePlayer implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet);
- packet.writeD(_movie.getClientId());
- return true;
+ ServerPackets.EX_STOP_SCENE_PLAYER.writeId(this);
+ writeInt(_movie.getClientId());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
index 367ac79be4..c7ca7b8c90 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
@@ -17,15 +17,14 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-, KenM
*/
-public class ExStorageMaxCount implements IClientOutgoingPacket
+public class ExStorageMaxCount extends ServerPacket
{
private Player _player;
private int _inventory;
@@ -58,27 +57,26 @@ public class ExStorageMaxCount implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_player == null)
{
- return false;
+ return;
}
- OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet);
- packet.writeD(_inventory);
- packet.writeD(_warehouse);
- // packet.writeD(_freight); // Removed with 152.
- packet.writeD(_clan);
- packet.writeD(_privateSell);
- packet.writeD(_privateBuy);
- packet.writeD(_receipeD);
- packet.writeD(_recipe);
- packet.writeD(_inventoryExtraSlots); // Belt inventory slots increase count
- packet.writeD(_inventoryQuestItems);
- packet.writeD(40); // TODO: Find me!
- packet.writeD(40); // TODO: Find me!
- packet.writeD(0x64); // Artifact slots (Fixed)
- return true;
+ ServerPackets.EX_STORAGE_MAX_COUNT.writeId(this);
+ writeInt(_inventory);
+ writeInt(_warehouse);
+ // writeInt(_freight); // Removed with 152.
+ writeInt(_clan);
+ writeInt(_privateSell);
+ writeInt(_privateBuy);
+ writeInt(_receipeD);
+ writeInt(_recipe);
+ writeInt(_inventoryExtraSlots); // Belt inventory slots increase count
+ writeInt(_inventoryQuestItems);
+ writeInt(40); // TODO: Find me!
+ writeInt(40); // TODO: Find me!
+ writeInt(0x64); // Artifact slots (Fixed)
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
index 57563ca2f9..74089f22ff 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author VISTALL
*/
-public class ExSubPledgeSkillAdd implements IClientOutgoingPacket
+public class ExSubPledgeSkillAdd extends ServerPacket
{
private final int _type;
private final int _skillId;
@@ -36,12 +35,11 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet);
- packet.writeD(_type);
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- return true;
+ ServerPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(this);
+ writeInt(_type);
+ writeInt(_skillId);
+ writeInt(_skillLevel);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java
index 816d6f16a6..e416b1d302 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.SubclassInfoType;
import org.l2jmobius.gameserver.enums.SubclassType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SubClassHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExSubjobInfo implements IClientOutgoingPacket
+public class ExSubjobInfo extends ServerPacket
{
private final int _currClassId;
private final int _currRace;
@@ -94,20 +93,19 @@ public class ExSubjobInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SUBJOB_INFO.writeId(packet);
- packet.writeC(_type);
- packet.writeD(_currClassId);
- packet.writeD(_currRace);
- packet.writeD(_subs.size());
+ ServerPackets.EX_SUBJOB_INFO.writeId(this);
+ writeByte(_type);
+ writeInt(_currClassId);
+ writeInt(_currRace);
+ writeInt(_subs.size());
for (SubInfo sub : _subs)
{
- packet.writeD(sub.getIndex());
- packet.writeD(sub.getClassId());
- packet.writeD(sub.getLevel());
- packet.writeC(sub.getType());
+ writeInt(sub.getIndex());
+ writeInt(sub.getClassId());
+ writeInt(sub.getLevel());
+ writeByte(sub.getType());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java
index b7a152629d..393f5f6bc9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExTacticalSign implements IClientOutgoingPacket
+public class ExTacticalSign extends ServerPacket
{
private final Creature _target;
private final int _tokenId;
@@ -35,11 +34,10 @@ public class ExTacticalSign implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet);
- packet.writeD(_target.getObjectId());
- packet.writeD(_tokenId);
- return true;
+ ServerPackets.EX_TACTICAL_SIGN.writeId(this);
+ writeInt(_target.getObjectId());
+ writeInt(_tokenId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java
index 9e03a8bd0a..e507fdd785 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExTeleportToLocationActivate implements IClientOutgoingPacket
+public class ExTeleportToLocationActivate extends ServerPacket
{
private final int _objectId;
private final Location _loc;
@@ -36,16 +35,15 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- packet.writeD(0); // Unknown (this isn't instanceId)
- packet.writeD(_loc.getHeading());
- packet.writeD(0); // Unknown
- return true;
+ ServerPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeInt(0); // Unknown (this isn't instanceId)
+ writeInt(_loc.getHeading());
+ writeInt(0); // Unknown
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTutorialShowId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTutorialShowId.java
index dae7d2d3aa..355737fc65 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTutorialShowId.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTutorialShowId.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExTutorialShowId implements IClientOutgoingPacket
+public class ExTutorialShowId extends ServerPacket
{
private final int _id;
@@ -32,10 +31,9 @@ public class ExTutorialShowId implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TUTORIAL_SHOW_ID.writeId(packet);
- packet.writeD(_id);
- return true;
+ ServerPackets.EX_TUTORIAL_SHOW_ID.writeId(this);
+ writeInt(_id);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java
index eff4285a8b..bc1ec9dc61 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExUnReadMailCount implements IClientOutgoingPacket
+public class ExUnReadMailCount extends ServerPacket
{
private final int _mailUnreadCount;
@@ -34,10 +33,9 @@ public class ExUnReadMailCount implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet);
- packet.writeD(_mailUnreadCount);
- return true;
+ ServerPackets.EX_UN_READ_MAIL_COUNT.writeId(this);
+ writeInt(_mailUnreadCount);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
index e59c651371..3b47dc4f03 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExUseSharedGroupItem implements IClientOutgoingPacket
+public class ExUseSharedGroupItem extends ServerPacket
{
private final int _itemId;
private final int _grpId;
@@ -38,13 +37,12 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet);
- packet.writeD(_itemId);
- packet.writeD(_grpId);
- packet.writeD(_remainingTime);
- packet.writeD(_totalTime);
- return true;
+ ServerPackets.EX_USE_SHARED_GROUP_ITEM.writeId(this);
+ writeInt(_itemId);
+ writeInt(_grpId);
+ writeInt(_remainingTime);
+ writeInt(_totalTime);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
index 53f6aa83de..2a57489817 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.BonusExpType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExUserBoostStat implements IClientOutgoingPacket
+public class ExUserBoostStat extends ServerPacket
{
private final Player _player;
private final BonusExpType _type;
@@ -37,9 +36,9 @@ public class ExUserBoostStat implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USER_BOOST_STAT.writeId(packet);
+ ServerPackets.EX_USER_BOOST_STAT.writeId(this);
int count = 0;
int bonus = 0;
switch (_type)
@@ -67,9 +66,8 @@ public class ExUserBoostStat implements IClientOutgoingPacket
break;
}
}
- packet.writeC(_type.getId());
- packet.writeC(count);
- packet.writeH(bonus);
- return true;
+ writeByte(_type.getId());
+ writeByte(count);
+ writeShort(bonus);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java
index f49d451587..317009b01c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket
+public class ExUserInfoAbnormalVisualEffect extends ServerPacket
{
private final Player _player;
@@ -36,22 +35,21 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_player.getTransformationId());
+ ServerPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_player.getTransformationId());
final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects();
final boolean isInvisible = _player.isInvisible();
- packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0));
+ writeInt(abnormalVisualEffects.size() + (isInvisible ? 1 : 0));
for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects)
{
- packet.writeH(abnormalVisualEffect.getClientId());
+ writeShort(abnormalVisualEffect.getClientId());
}
if (isInvisible)
{
- packet.writeH(AbnormalVisualEffect.STEALTH.getClientId());
+ writeShort(AbnormalVisualEffect.STEALTH.getClientId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java
index 1069a64e3e..e008dfbf62 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExUserInfoCubic implements IClientOutgoingPacket
+public class ExUserInfoCubic extends ServerPacket
{
private final Player _player;
@@ -33,13 +32,12 @@ public class ExUserInfoCubic implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeH(_player.getCubics().size());
- _player.getCubics().keySet().forEach(packet::writeH);
- packet.writeD(_player.getAgathionId());
- return true;
+ ServerPackets.EX_USER_INFO_CUBIC.writeId(this);
+ writeInt(_player.getObjectId());
+ writeShort(_player.getCubics().size());
+ _player.getCubics().keySet().forEach(this::writeShort);
+ writeInt(_player.getAgathionId());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java
index 6ef31d6117..945664bf1f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.InventorySlot;
import org.l2jmobius.gameserver.model.VariationInstance;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
@@ -62,26 +61,25 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeH(InventorySlot.values().length); // 152
- packet.writeB(_masks);
+ ServerPackets.EX_USER_INFO_EQUIP_SLOT.writeId(this);
+ writeInt(_player.getObjectId());
+ writeShort(InventorySlot.values().length); // 152
+ writeBytes(_masks);
final PlayerInventory inventory = _player.getInventory();
for (InventorySlot slot : InventorySlot.values())
{
if (containsMask(slot))
{
final VariationInstance augment = inventory.getPaperdollAugmentation(slot.getSlot());
- packet.writeH(22); // 10 + 4 * 3
- packet.writeD(inventory.getPaperdollObjectId(slot.getSlot()));
- packet.writeD(inventory.getPaperdollItemId(slot.getSlot()));
- packet.writeD(augment != null ? augment.getOption1Id() : 0);
- packet.writeD(augment != null ? augment.getOption2Id() : 0);
- packet.writeD(inventory.getPaperdollItemVisualId(slot.getSlot()));
+ writeShort(22); // 10 + 4 * 3
+ writeInt(inventory.getPaperdollObjectId(slot.getSlot()));
+ writeInt(inventory.getPaperdollItemId(slot.getSlot()));
+ writeInt(augment != null ? augment.getOption1Id() : 0);
+ writeInt(augment != null ? augment.getOption2Id() : 0);
+ writeInt(inventory.getPaperdollItemVisualId(slot.getSlot()));
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java
index d655e48843..8dfecd3ac3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExUserInfoInvenWeight implements IClientOutgoingPacket
+public class ExUserInfoInvenWeight extends ServerPacket
{
private final Player _player;
@@ -33,12 +32,11 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_player.getCurrentLoad());
- packet.writeD(_player.getMaxLoad());
- return true;
+ ServerPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_player.getCurrentLoad());
+ writeInt(_player.getMaxLoad());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserViewInfoParameter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserViewInfoParameter.java
index 9715eded4f..d1bbc3ce23 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserViewInfoParameter.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserViewInfoParameter.java
@@ -17,18 +17,17 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ItemGrade;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.stats.TraitType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExUserViewInfoParameter implements IClientOutgoingPacket
+public class ExUserViewInfoParameter extends ServerPacket
{
private final Player _player;
@@ -38,604 +37,602 @@ public class ExUserViewInfoParameter implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USER_VIEW_INFO_PARAMETER.writeId(packet);
+ ServerPackets.EX_USER_VIEW_INFO_PARAMETER.writeId(this);
int index = 0;
// Number of parameters.
- packet.writeD(147);
+ writeInt(147);
// XXX Attack Section
// P. Atk. (%)
- packet.writeH(index++);
- packet.writeD((_player.getPAtk() / Config.MAX_PATK) * 100);
+ writeShort(index++);
+ writeInt((_player.getPAtk() / Config.MAX_PATK) * 100);
// P. Atk. (num.)
- packet.writeH(index++);
- packet.writeD(_player.getPAtk());
+ writeShort(index++);
+ writeInt(_player.getPAtk());
// M. Atk. (%)
- packet.writeH(index++);
- packet.writeD((_player.getMAtk() / Config.MAX_MATK) * 100);
+ writeShort(index++);
+ writeInt((_player.getMAtk() / Config.MAX_MATK) * 100);
// M. Atk. (num)
- packet.writeH(index++);
- packet.writeD(_player.getMAtk());
+ writeShort(index++);
+ writeInt(_player.getMAtk());
// Soulshot Damage - Activation
- packet.writeH(index++);
- packet.writeD((_player.isChargedShot(ShotType.BLESSED_SOULSHOTS) || _player.isChargedShot(ShotType.SOULSHOTS)) ? (10000 + (_player.getActiveRubyJewel() != null ? (int) _player.getActiveRubyJewel().getBonus() * 1000 : 0)) : 0);
+ writeShort(index++);
+ writeInt((_player.isChargedShot(ShotType.BLESSED_SOULSHOTS) || _player.isChargedShot(ShotType.SOULSHOTS)) ? (10000 + (_player.getActiveRubyJewel() != null ? (int) _player.getActiveRubyJewel().getBonus() * 1000 : 0)) : 0);
// Spiritshot Damage - Activation
- packet.writeH(index++);
- packet.writeD((_player.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) || _player.isChargedShot(ShotType.SPIRITSHOTS)) ? (10000 + (_player.getActiveShappireJewel() != null ? (int) _player.getActiveShappireJewel().getBonus() * 1000 : 0)) : 0);
+ writeShort(index++);
+ writeInt((_player.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) || _player.isChargedShot(ShotType.SPIRITSHOTS)) ? (10000 + (_player.getActiveShappireJewel() != null ? (int) _player.getActiveShappireJewel().getBonus() * 1000 : 0)) : 0);
// Soulshot Damage - Enchanted Weapons
- packet.writeH(index++);
- packet.writeD((((_player.getActiveWeaponInstance() != null) && _player.getActiveWeaponInstance().isEnchanted()) ? (int) (_player.getActiveWeaponInstance().getEnchantLevel() * (_player.getActiveWeaponItem().getItemGrade() == ItemGrade.S ? 1.6 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.A ? 1.4 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.B ? 0.7 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.C) ? 0.4 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.D) ? 0.4 : 0) * 100) : 0));
+ writeShort(index++);
+ writeInt((((_player.getActiveWeaponInstance() != null) && _player.getActiveWeaponInstance().isEnchanted()) ? (int) (_player.getActiveWeaponInstance().getEnchantLevel() * (_player.getActiveWeaponItem().getItemGrade() == ItemGrade.S ? 1.6 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.A ? 1.4 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.B ? 0.7 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.C) ? 0.4 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.D) ? 0.4 : 0) * 100) : 0));
// Spiritshot Damage - Enchanted Weapons
- packet.writeH(index++);
- packet.writeD((((_player.getActiveWeaponInstance() != null) && _player.getActiveWeaponInstance().isEnchanted()) ? (int) (_player.getActiveWeaponInstance().getEnchantLevel() * (_player.getActiveWeaponItem().getItemGrade() == ItemGrade.S ? 1.6 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.A ? 1.4 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.B ? 0.7 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.C) ? 0.4 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.D) ? 0.4 : 0) * 100) : 0));
+ writeShort(index++);
+ writeInt((((_player.getActiveWeaponInstance() != null) && _player.getActiveWeaponInstance().isEnchanted()) ? (int) (_player.getActiveWeaponInstance().getEnchantLevel() * (_player.getActiveWeaponItem().getItemGrade() == ItemGrade.S ? 1.6 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.A ? 1.4 : _player.getActiveWeaponItem().getItemGrade() == ItemGrade.B ? 0.7 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.C) ? 0.4 : _player.getActiveWeaponItem().getItemGrade().equals(ItemGrade.D) ? 0.4 : 0) * 100) : 0));
// Soulshot Damage - Misc.
- packet.writeH(index++);
- packet.writeD(_player.getActiveRubyJewel() != null ? (int) _player.getActiveRubyJewel().getBonus() * 1000 : 0);
+ writeShort(index++);
+ writeInt(_player.getActiveRubyJewel() != null ? (int) _player.getActiveRubyJewel().getBonus() * 1000 : 0);
// Spiritshot Damage - Misc.
- packet.writeH(index++);
- packet.writeD(_player.getActiveShappireJewel() != null ? (int) _player.getActiveShappireJewel().getBonus() * 1000 : 0);
+ writeShort(index++);
+ writeInt(_player.getActiveShappireJewel() != null ? (int) _player.getActiveShappireJewel().getBonus() * 1000 : 0);
// P. Skill Power (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Skill Power (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Basic PvP Damage
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVP_PHYSICAL_ATTACK_DAMAGE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVP_PHYSICAL_ATTACK_DAMAGE) * 100);
// P. Skill Damage in PvP
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVP_PHYSICAL_SKILL_DAMAGE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVP_PHYSICAL_SKILL_DAMAGE) * 100);
// M. Skill Damage in PvP
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVP_MAGICAL_SKILL_DAMAGE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVP_MAGICAL_SKILL_DAMAGE) * 100);
// Basic PvE Damage
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVE_PHYSICAL_ATTACK_DAMAGE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVE_PHYSICAL_ATTACK_DAMAGE) * 100);
// P. Skill Damage in PvE
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVE_PHYSICAL_SKILL_DAMAGE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVE_PHYSICAL_SKILL_DAMAGE) * 100);
// M. Skill Damage in PvE
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVE_MAGICAL_SKILL_DAMAGE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVE_MAGICAL_SKILL_DAMAGE) * 100);
// XXX Defense Section
// P. Def. (%)
- packet.writeH(index++);
- packet.writeD((_player.getTemplate().getBasePDef() / _player.getPDef()) * 100);
+ writeShort(index++);
+ writeInt((_player.getTemplate().getBasePDef() / _player.getPDef()) * 100);
// P. Def. (num.)
- packet.writeH(index++);
- packet.writeD(_player.getPDef());
+ writeShort(index++);
+ writeInt(_player.getPDef());
// M. Def. (%)
- packet.writeH(index++);
- packet.writeD((_player.getTemplate().getBaseMDef() / _player.getMDef()) * 100);
+ writeShort(index++);
+ writeInt((_player.getTemplate().getBaseMDef() / _player.getMDef()) * 100);
// M. Def. (num.)
- packet.writeH(index++);
- packet.writeD(_player.getMDef());
+ writeShort(index++);
+ writeInt(_player.getMDef());
// Received PvP Damage
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVP_DAMAGE_TAKEN));
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVP_DAMAGE_TAKEN));
// Received P. Skill Damage in PvP
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Received M. Skill Damage in PvP
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Received PvE Damage
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.PVE_DAMAGE_TAKEN));
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.PVE_DAMAGE_TAKEN));
// Received P. Skill Damage in PvE
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Received M. Skill Damage in PvE
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Shield Defense (%)
- packet.writeH(index++);
- // packet.writeD((_player.getStat().getShldDef() - _player.getShldDef()) / _player.getShldDef());
- packet.writeD(_player.getStat().getShldDef());
+ writeShort(index++);
+ // writeInt((_player.getStat().getShldDef() - _player.getShldDef()) / _player.getShldDef());
+ writeInt(_player.getStat().getShldDef());
// Shield Defence (num.)
- packet.writeH(index++);
- packet.writeD(_player.getShldDef());
+ writeShort(index++);
+ writeInt(_player.getShldDef());
// Shield Defence Rate
- packet.writeH(index++);
- packet.writeD(_player.getStat().getShldDef());
+ writeShort(index++);
+ writeInt(_player.getStat().getShldDef());
// M. Damage Resistance (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Damage Resistance (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Damage Reflection (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Damage Reflection Resistance
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Received Fixed Damage (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Casting Interruption Rate (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Casting Interruption Rate (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// XXX Accuracy Section
// P. Accuracy (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// P. Accuracy (num.)
- packet.writeH(index++);
- packet.writeD(_player.getAccuracy());
+ writeShort(index++);
+ writeInt(_player.getAccuracy());
// M. Accuracy (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Accuracy (num.)
- packet.writeH(index++);
- packet.writeD(_player.getMagicAccuracy());
+ writeShort(index++);
+ writeInt(_player.getMagicAccuracy());
// Vital Point Attack Rate (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Vital Point Attack Rate (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// XXX Evasion Section
// P. Evasion (%)
- packet.writeH(index++);
- packet.writeD(((_player.getEvasionRate() * 100) / Config.MAX_EVASION));
+ writeShort(index++);
+ writeInt(((_player.getEvasionRate() * 100) / Config.MAX_EVASION));
// P. Evasion (num.)
- packet.writeH(index++);
- packet.writeD(_player.getEvasionRate());
+ writeShort(index++);
+ writeInt(_player.getEvasionRate());
// M. Evasion (%)
- packet.writeH(index++);
- packet.writeD(((_player.getMagicEvasionRate() * 100) / Config.MAX_EVASION));
+ writeShort(index++);
+ writeInt(((_player.getMagicEvasionRate() * 100) / Config.MAX_EVASION));
// M. Evasion (num.)
- packet.writeH(index++);
- packet.writeD(_player.getMagicEvasionRate());
+ writeShort(index++);
+ writeInt(_player.getMagicEvasionRate());
// Received Vital Point Attack Rate (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// Received Vital Point Attack Rate (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// P. Skill Evasion (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Skill Evasion (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// XXX Speed Section
// Atk. Spd. (%)
- packet.writeH(index++);
- packet.writeD(((_player.getPAtkSpd() * 100) / Config.MAX_PATK_SPEED));
+ writeShort(index++);
+ writeInt(((_player.getPAtkSpd() * 100) / Config.MAX_PATK_SPEED));
// Atk. Spd. (num.)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getPAtkSpd());
+ writeShort(index++);
+ writeInt(_player.getStat().getPAtkSpd());
// Casting Spd. (%)
- packet.writeH(index++);
- packet.writeD((_player.getMAtkSpd() * 100) / Config.MAX_MATK_SPEED);
+ writeShort(index++);
+ writeInt((_player.getMAtkSpd() * 100) / Config.MAX_MATK_SPEED);
// Casting Spd. (num.)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getMAtkSpd());
+ writeShort(index++);
+ writeInt(_player.getStat().getMAtkSpd());
// Speed (%)
- packet.writeH(index++);
- packet.writeD((int) ((_player.getMoveSpeed() * 100) / Config.MAX_RUN_SPEED));
+ writeShort(index++);
+ writeInt((int) ((_player.getMoveSpeed() * 100) / Config.MAX_RUN_SPEED));
// Speed (num.)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getMoveSpeed());
+ writeShort(index++);
+ writeInt((int) _player.getStat().getMoveSpeed());
// XXX Critical Rate Section
// Basic Critical Rate (%)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getCriticalHit());
+ writeShort(index++);
+ writeInt(_player.getStat().getCriticalHit());
// Basic Critical Rate (num.)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getCriticalHit());
+ writeShort(index++);
+ writeInt(_player.getStat().getCriticalHit());
// P. Skill Critical Rate (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// P. Skill Critical Rate (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Skill Critical Rate (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Skill Critical Rate (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// XXX Critical Damage Section
// Basic Critical Damage (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.CRITICAL_DAMAGE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.CRITICAL_DAMAGE) * 100);
// Basic Critical Damage (num.)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getCriticalDmg(1) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getCriticalDmg(1) * 100);
// P. Skill Critical Damage (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// P. Skill Critical Damage (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Skill Critical Damage (%)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// M. Skill Critical Damage (num.)
- packet.writeH(index++);
- packet.writeD(0);
+ writeShort(index++);
+ writeInt(0);
// XXX Recovery Section
// HP ReCovery Potions' Effect (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_HP) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_HP) * 100);
// HP Recovery Potions' Effect (num.)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_HP) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_HP) * 100);
// MP Recovery Potions' Effect (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_MP) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_MP) * 100);
// MP Recovery Potions' Effect (num.)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_MP) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getValue(Stat.ADDITIONAL_POTION_MP) * 100);
// HP Recovery Rate (%)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getHpRegen());
+ writeShort(index++);
+ writeInt(_player.getStat().getHpRegen());
// HP Recovery Rate (num.)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getHpRegen());
+ writeShort(index++);
+ writeInt(_player.getStat().getHpRegen());
// HP Recovery Rate while standing (%)
- packet.writeH(index++);
- packet.writeD(!_player.isMoving() ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt(!_player.isMoving() ? _player.getStat().getHpRegen() : 0);
// HP Recovery Rate while standing (num.)
- packet.writeH(index++);
- packet.writeD(!_player.isMoving() ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt(!_player.isMoving() ? _player.getStat().getHpRegen() : 0);
// HP Recovery Rate while sitting (%)
- packet.writeH(index++);
- packet.writeD(_player.isSitting() ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isSitting() ? _player.getStat().getHpRegen() : 0);
// HP Recovery Rate while sitting (num.)
- packet.writeH(index++);
- packet.writeD(_player.isSitting() ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isSitting() ? _player.getStat().getHpRegen() : 0);
// HP Recovery Rate while walking (%)
- packet.writeH(index++);
- packet.writeD((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getHpRegen() : 0);
// HP Recovery Rate while walking (num.)
- packet.writeH(index++);
- packet.writeD((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getHpRegen() : 0);
// HP Recovery Rate while running (%)
- packet.writeH(index++);
- packet.writeD(_player.isRunning() ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isRunning() ? _player.getStat().getHpRegen() : 0);
// HP Recovery Rate while running (num.)
- packet.writeH(index++);
- packet.writeD(_player.isRunning() ? _player.getStat().getHpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isRunning() ? _player.getStat().getHpRegen() : 0);
// MP Recovery Rate (%)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getMpRegen());
+ writeShort(index++);
+ writeInt(_player.getStat().getMpRegen());
// MP Recovery Rate (num.)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getMpRegen());
+ writeShort(index++);
+ writeInt(_player.getStat().getMpRegen());
// MP Recovery Rate while standing (%)
- packet.writeH(index++);
- packet.writeD(!_player.isMoving() ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt(!_player.isMoving() ? _player.getStat().getMpRegen() : 0);
// MP Recovery Rate while standing (num.)
- packet.writeH(index++);
- packet.writeD(!_player.isMoving() ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt(!_player.isMoving() ? _player.getStat().getMpRegen() : 0);
// MP Recovery Rate while sitting (%)
- packet.writeH(index++);
- packet.writeD(_player.isSitting() ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isSitting() ? _player.getStat().getMpRegen() : 0);
// MP Recovery Rate while sitting (num.)
- packet.writeH(index++);
- packet.writeD(_player.isSitting() ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isSitting() ? _player.getStat().getMpRegen() : 0);
// MP Recovery Rate while walking (%)
- packet.writeH(index++);
- packet.writeD((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getMpRegen() : 0);
// MP Recovery Rate while walking (num.)
- packet.writeH(index++);
- packet.writeD((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getMpRegen() : 0);
// MP Recovery Rate while running (%)
- packet.writeH(index++);
- packet.writeD(_player.isRunning() ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isRunning() ? _player.getStat().getMpRegen() : 0);
// MP Recovery Rate while running (num.)
- packet.writeH(index++);
- packet.writeD(_player.isRunning() ? _player.getStat().getMpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isRunning() ? _player.getStat().getMpRegen() : 0);
// CP Recovery Rate (%)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getCpRegen());
+ writeShort(index++);
+ writeInt(_player.getStat().getCpRegen());
// CP Recovery Rate (num.)
- packet.writeH(index++);
- packet.writeD(_player.getStat().getCpRegen());
+ writeShort(index++);
+ writeInt(_player.getStat().getCpRegen());
// CP Recovery Rate while standing (%)
- packet.writeH(index++);
- packet.writeD(!_player.isMoving() ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt(!_player.isMoving() ? _player.getStat().getCpRegen() : 0);
// CP Recovery Rate while standing (num.)
- packet.writeH(index++);
- packet.writeD(!_player.isMoving() ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt(!_player.isMoving() ? _player.getStat().getCpRegen() : 0);
// CP Recovery Rate while sitting (%)
- packet.writeH(index++);
- packet.writeD(_player.isSitting() ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isSitting() ? _player.getStat().getCpRegen() : 0);
// CP Recovery Rate while sitting (num.)
- packet.writeH(index++);
- packet.writeD(_player.isSitting() ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isSitting() ? _player.getStat().getCpRegen() : 0);
// CP Recovery Rate while walking (%)
- packet.writeH(index++);
- packet.writeD((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getCpRegen() : 0);
// CP Recovery Rate while walking (num.)
- packet.writeH(index++);
- packet.writeD((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt((_player.isMoving() && !_player.isRunning()) ? _player.getStat().getCpRegen() : 0);
// CP Recovery Rate while running (%)
- packet.writeH(index++);
- packet.writeD(_player.isRunning() ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isRunning() ? _player.getStat().getCpRegen() : 0);
// CP Recovery Rate while running (num.)
- packet.writeH(index++);
- packet.writeD(_player.isRunning() ? _player.getStat().getCpRegen() : 0);
+ writeShort(index++);
+ writeInt(_player.isRunning() ? _player.getStat().getCpRegen() : 0);
// XXX Skill Cooldown Section
// P. Skill Cooldown (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getReuseTypeValue(1) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getReuseTypeValue(1) * 100);
// M. Skill Cooldown (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getReuseTypeValue(2) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getReuseTypeValue(2) * 100);
// Song/ Dance Cooldown (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getReuseTypeValue(3) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getReuseTypeValue(3) * 100);
// XXX MP Consumption Section
// P. Skill MP Consumption Decrease (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getMpConsumeTypeValue(1) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getMpConsumeTypeValue(1) * 100);
// M. Skill MP Consumption Decrease (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getMpConsumeTypeValue(2) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getMpConsumeTypeValue(2) * 100);
// Song/ Dance MP Consumption Decrease (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getMpConsumeTypeValue(3) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getMpConsumeTypeValue(3) * 100);
// P. Skill MP Consumption Decrease (num.)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getMpConsumeTypeValue(1) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getMpConsumeTypeValue(1) * 100);
// M. Skill MP Consumption Decrease (num.)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getMpConsumeTypeValue(2) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getMpConsumeTypeValue(2) * 100);
// Song/ Dance MP Consumption Decrease (num.)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getMpConsumeTypeValue(3) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getMpConsumeTypeValue(3) * 100);
// XXX Anomalies Section
// Paralysis Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.PARALYZE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.PARALYZE) * 100);
// Shock Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.SHOCK) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.SHOCK) * 100);
// Knockback Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.KNOCKBACK) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.KNOCKBACK) * 100);
// Sleep Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.SLEEP) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.SLEEP) * 100);
// Imprisonment Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.IMPRISON) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.IMPRISON) * 100);
// Pull Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.PULL) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.PULL) * 100);
// Fear Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.FEAR) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.FEAR) * 100);
// Silence Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.SILENCE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.SILENCE) * 100);
// Hold Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.HOLD) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.HOLD) * 100);
// Suppression Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.SUPPRESSION) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.SUPPRESSION) * 100);
// Infection Atk. Rate (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getAttackTrait(TraitType.INFECTION) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getAttackTrait(TraitType.INFECTION) * 100);
// Paralysis Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.PARALYZE) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.PARALYZE) * 100);
// Shock Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.SHOCK) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.SHOCK) * 100);
// Knockback Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.KNOCKBACK) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.KNOCKBACK) * 100);
// Sleep Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.SLEEP) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.SLEEP) * 100);
// Imprisonment Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.IMPRISON) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.IMPRISON) * 100);
// Pull Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.PULL) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.PULL) * 100);
// Fear Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.FEAR) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.FEAR) * 100);
// Silence Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.SLEEP) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.SLEEP) * 100);
// Hold Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.HOLD) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.HOLD) * 100);
// Suppresion Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.SUPPRESSION) * 100);
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.SUPPRESSION) * 100);
// Infection Resistance (%)
- packet.writeH(index++);
- packet.writeD((int) _player.getStat().getDefenceTrait(TraitType.INFECTION) * 100);
-
- return true;
+ writeShort(index++);
+ writeInt((int) _player.getStat().getDefenceTrait(TraitType.INFECTION) * 100);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
index 16aa81e9c0..4c5e435b1c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* update 27.8.10
* @author kerberos JIV
*/
-public class ExValidateLocationInAirShip implements IClientOutgoingPacket
+public class ExValidateLocationInAirShip extends ServerPacket
{
private final Player _player;
private final int _shipId;
@@ -41,15 +40,14 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_shipId);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- packet.writeD(_heading);
- return true;
+ ServerPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_shipId);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
index 50cb4025e4..d149a15b1f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExVariationCancelResult implements IClientOutgoingPacket
+public class ExVariationCancelResult extends ServerPacket
{
public static final ExVariationCancelResult STATIC_PACKET_SUCCESS = new ExVariationCancelResult(1);
public static final ExVariationCancelResult STATIC_PACKET_FAILURE = new ExVariationCancelResult(0);
@@ -32,10 +31,9 @@ public class ExVariationCancelResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_VARIATION_CANCEL_RESULT.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
index 4fde190ae2..cdd61dcc23 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
@@ -16,32 +16,30 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Format: (ch)ddd
*/
-public class ExVariationResult implements IClientOutgoingPacket
+public class ExVariationResult extends ServerPacket
{
private final int _option1;
private final int _option2;
- private final int _success;
+ private final boolean _success;
public ExVariationResult(int option1, int option2, boolean success)
{
_option1 = option1;
_option2 = option2;
- _success = success ? 1 : 0;
+ _success = success;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VARIATION_RESULT.writeId(packet);
- packet.writeD(_option1);
- packet.writeD(_option2);
- packet.writeD(_success);
- return true;
+ ServerPackets.EX_VARIATION_RESULT.writeId(this);
+ writeInt(_option1);
+ writeInt(_option2);
+ writeInt(_success);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalExInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalExInfo.java
index 116e5dc718..ca5a06c1e2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalExInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalExInfo.java
@@ -17,14 +17,13 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mode
*/
-public class ExVitalExInfo implements IClientOutgoingPacket
+public class ExVitalExInfo extends ServerPacket
{
private final Player _player;
@@ -34,13 +33,12 @@ public class ExVitalExInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VITAL_EX_INFO.writeId(packet);
- packet.writeD((int) (_player.getLimitedSayhaGraceEndTime() / 1000)); // currentmilis / 1000, when limited sayha ends
- packet.writeD((int) (_player.getSayhaGraceSupportEndTime() / 1000)); // currentmilis / 1000, when sayha grace suport ends
- packet.writeD((int) (Config.RATE_LIMITED_SAYHA_GRACE_EXP_MULTIPLIER * 100)); // Limited sayha bonus
- packet.writeD(0x82); // Limited sayha bonus adena (shown as 130%, actually 30%)
- return true;
+ ServerPackets.EX_VITAL_EX_INFO.writeId(this);
+ writeInt((int) (_player.getLimitedSayhaGraceEndTime() / 1000)); // currentmilis / 1000, when limited sayha ends
+ writeInt((int) (_player.getSayhaGraceSupportEndTime() / 1000)); // currentmilis / 1000, when sayha grace suport ends
+ writeInt((int) (Config.RATE_LIMITED_SAYHA_GRACE_EXP_MULTIPLIER * 100)); // Limited sayha bonus
+ writeInt(0x82); // Limited sayha bonus adena (shown as 130%, actually 30%)
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
index 60fb57c0b3..ff6541ec6f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
@@ -17,14 +17,13 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class ExVitalityEffectInfo implements IClientOutgoingPacket
+public class ExVitalityEffectInfo extends ServerPacket
{
private final int _vitalityBonus;
private final int _vitalityItemsRemaining;
@@ -38,14 +37,13 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet);
- packet.writeD(_points);
- packet.writeD(_vitalityBonus); // Vitality Bonus
- packet.writeH(0); // Vitality additional bonus in %
- packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use
- packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use
- return true;
+ ServerPackets.EX_VITALITY_EFFECT_INFO.writeId(this);
+ writeInt(_points);
+ writeInt(_vitalityBonus); // Vitality Bonus
+ writeShort(0); // Vitality additional bonus in %
+ writeShort(_vitalityItemsRemaining); // How much vitality items remaining for use
+ writeShort(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
index 9a401c2321..a369035786 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author GodKratos
*/
-public class ExVitalityPointInfo implements IClientOutgoingPacket
+public class ExVitalityPointInfo extends ServerPacket
{
private final int _vitalityPoints;
@@ -32,10 +31,9 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet);
- packet.writeD(_vitalityPoints);
- return true;
+ ServerPackets.EX_VITALITY_POINT_INFO.writeId(this);
+ writeInt(_vitalityPoints);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
index c4c5539ca4..86e77148b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* ExVoteSystemInfo packet implementation.
* @author Gnacik
*/
-public class ExVoteSystemInfo implements IClientOutgoingPacket
+public class ExVoteSystemInfo extends ServerPacket
{
private final int _recomLeft;
private final int _recomHave;
@@ -42,14 +41,13 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet);
- packet.writeD(_recomLeft);
- packet.writeD(_recomHave);
- packet.writeD(_bonusTime);
- packet.writeD(_bonusVal);
- packet.writeD(_bonusType);
- return true;
+ ServerPackets.EX_VOTE_SYSTEM_INFO.writeId(this);
+ writeInt(_recomLeft);
+ writeInt(_recomHave);
+ writeInt(_bonusTime);
+ writeInt(_bonusVal);
+ writeInt(_bonusType);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java
index 59c49642af..d454b09c26 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java
@@ -17,14 +17,13 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
*/
-public class ExWorldChatCnt implements IClientOutgoingPacket
+public class ExWorldChatCnt extends ServerPacket
{
private final int _points;
@@ -34,10 +33,9 @@ public class ExWorldChatCnt implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet);
- packet.writeD(_points);
- return true;
+ ServerPackets.EX_WORLD_CHAT_CNT.writeId(this);
+ writeInt(_points);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index dc9c2288f8..a4539909c2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.enums.Sex;
@@ -27,12 +26,12 @@ import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.FakePlayerHolder;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class FakePlayerInfo implements IClientOutgoingPacket
+public class FakePlayerInfo extends ServerPacket
{
private final Npc _npc;
private final int _objId;
@@ -55,6 +54,8 @@ public class FakePlayerInfo implements IClientOutgoingPacket
public FakePlayerInfo(Npc npc)
{
+ super(256);
+
_npc = npc;
_objId = npc.getObjectId();
_x = npc.getX();
@@ -76,130 +77,129 @@ public class FakePlayerInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHAR_INFO.writeId(packet);
- packet.writeC(0); // Grand Crusade
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(0); // vehicleId
- packet.writeD(_objId);
- packet.writeS(_npc.getName());
- packet.writeH(_npc.getRace().ordinal());
- packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0);
- packet.writeD(_fpcHolder.getClassId());
- packet.writeD(0); // Inventory.PAPERDOLL_UNDER
- packet.writeD(_fpcHolder.getEquipHead());
- packet.writeD(_fpcHolder.getEquipRHand());
- packet.writeD(_fpcHolder.getEquipLHand());
- packet.writeD(_fpcHolder.getEquipGloves());
- packet.writeD(_fpcHolder.getEquipChest());
- packet.writeD(_fpcHolder.getEquipLegs());
- packet.writeD(_fpcHolder.getEquipFeet());
- packet.writeD(_fpcHolder.getEquipCloak());
- packet.writeD(_fpcHolder.getEquipRHand()); // dual hand
- packet.writeD(_fpcHolder.getEquipHair());
- packet.writeD(_fpcHolder.getEquipHair2());
+ ServerPackets.CHAR_INFO.writeId(this);
+ writeByte(0); // Grand Crusade
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(0); // vehicleId
+ writeInt(_objId);
+ writeString(_npc.getName());
+ writeShort(_npc.getRace().ordinal());
+ writeByte(_npc.getTemplate().getSex() == Sex.FEMALE);
+ writeInt(_fpcHolder.getClassId());
+ writeInt(0); // Inventory.PAPERDOLL_UNDER
+ writeInt(_fpcHolder.getEquipHead());
+ writeInt(_fpcHolder.getEquipRHand());
+ writeInt(_fpcHolder.getEquipLHand());
+ writeInt(_fpcHolder.getEquipGloves());
+ writeInt(_fpcHolder.getEquipChest());
+ writeInt(_fpcHolder.getEquipLegs());
+ writeInt(_fpcHolder.getEquipFeet());
+ writeInt(_fpcHolder.getEquipCloak());
+ writeInt(_fpcHolder.getEquipRHand()); // dual hand
+ writeInt(_fpcHolder.getEquipHair());
+ writeInt(_fpcHolder.getEquipHair2());
for (@SuppressWarnings("unused")
final int slot : getPaperdollOrderAugument())
{
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
- packet.writeC(_fpcHolder.getArmorEnchantLevel());
+ writeByte(_fpcHolder.getArmorEnchantLevel());
for (@SuppressWarnings("unused")
final int slot : getPaperdollOrderVisualId())
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeC(_npc.getScriptValue()); // getPvpFlag()
- packet.writeD(_npc.getReputation());
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- packet.writeH(_runSpd);
- packet.writeH(_walkSpd);
- packet.writeH(_swimRunSpd);
- packet.writeH(_swimWalkSpd);
- packet.writeH(_flyRunSpd);
- packet.writeH(_flyWalkSpd);
- packet.writeH(_flyRunSpd);
- packet.writeH(_flyWalkSpd);
- packet.writeF(_moveMultiplier);
- packet.writeF(_attackSpeedMultiplier);
- packet.writeF(_npc.getCollisionRadius());
- packet.writeF(_npc.getCollisionHeight());
- packet.writeD(_fpcHolder.getHair());
- packet.writeD(_fpcHolder.getHairColor());
- packet.writeD(_fpcHolder.getFace());
- packet.writeS(_npc.getTemplate().getTitle());
+ writeByte(_npc.getScriptValue()); // getPvpFlag()
+ writeInt(_npc.getReputation());
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeShort(_runSpd);
+ writeShort(_walkSpd);
+ writeShort(_swimRunSpd);
+ writeShort(_swimWalkSpd);
+ writeShort(_flyRunSpd);
+ writeShort(_flyWalkSpd);
+ writeShort(_flyRunSpd);
+ writeShort(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_attackSpeedMultiplier);
+ writeDouble(_npc.getCollisionRadius());
+ writeDouble(_npc.getCollisionHeight());
+ writeInt(_fpcHolder.getHair());
+ writeInt(_fpcHolder.getHairColor());
+ writeInt(_fpcHolder.getFace());
+ writeString(_npc.getTemplate().getTitle());
if (_clan != null)
{
- packet.writeD(_clan.getId());
- packet.writeD(_clan.getCrestId());
- packet.writeD(_clan.getAllyId());
- packet.writeD(_clan.getAllyCrestId());
+ writeInt(_clan.getId());
+ writeInt(_clan.getCrestId());
+ writeInt(_clan.getAllyId());
+ writeInt(_clan.getAllyCrestId());
}
else
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
- packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked)
- packet.writeC(_npc.isRunning() ? 1 : 0);
- packet.writeC(_npc.isInCombat() ? 1 : 0);
- packet.writeC(_npc.isAlikeDead() ? 1 : 0);
- packet.writeC(_npc.isInvisible() ? 1 : 0);
- packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
- packet.writeC(0); // getPrivateStoreType().getId()
- packet.writeH(0); // getCubics().size()
+ writeByte(1); // isSitting() ? 0 : 1 (at some initial tests it worked)
+ writeByte(_npc.isRunning());
+ writeByte(_npc.isInCombat());
+ writeByte(_npc.isAlikeDead());
+ writeByte(_npc.isInvisible());
+ writeByte(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
+ writeByte(0); // getPrivateStoreType().getId()
+ writeShort(0); // getCubics().size()
// getCubics().keySet().forEach(packet::writeH);
- packet.writeC(0);
- packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0);
- packet.writeH(_fpcHolder.getRecommends());
- packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000
- packet.writeD(_fpcHolder.getClassId());
- packet.writeD(0);
- packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel
- packet.writeC(_npc.getTeam().getId());
- packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0);
- packet.writeC(_fpcHolder.getNobleLevel());
- packet.writeC(_fpcHolder.isHero() ? 1 : 0);
- packet.writeC(_fpcHolder.isFishing() ? 1 : 0);
- packet.writeD(_fpcHolder.getBaitLocationX());
- packet.writeD(_fpcHolder.getBaitLocationY());
- packet.writeD(_fpcHolder.getBaitLocationZ());
- packet.writeD(_fpcHolder.getNameColor());
- packet.writeD(_heading);
- packet.writeC(_fpcHolder.getPledgeStatus());
- packet.writeH(0); // getPledgeType()
- packet.writeD(_fpcHolder.getTitleColor());
- packet.writeC(0); // isCursedWeaponEquipped
- packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0
- packet.writeD(0); // getTransformationDisplayId()
- packet.writeD(_fpcHolder.getAgathionId());
- packet.writeC(0);
- packet.writeD(0); // getCurrentCp()
- packet.writeD(_npc.getMaxHp());
- packet.writeD((int) Math.round(_npc.getCurrentHp()));
- packet.writeD(_npc.getMaxMp());
- packet.writeD((int) Math.round(_npc.getCurrentMp()));
- packet.writeC(0);
+ writeByte(0);
+ writeByte(_npc.isInsideZone(ZoneId.WATER));
+ writeShort(_fpcHolder.getRecommends());
+ writeInt(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000
+ writeInt(_fpcHolder.getClassId());
+ writeInt(0);
+ writeByte(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel
+ writeByte(_npc.getTeam().getId());
+ writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
+ writeByte(_fpcHolder.getNobleLevel());
+ writeByte(_fpcHolder.isHero());
+ writeByte(_fpcHolder.isFishing());
+ writeInt(_fpcHolder.getBaitLocationX());
+ writeInt(_fpcHolder.getBaitLocationY());
+ writeInt(_fpcHolder.getBaitLocationZ());
+ writeInt(_fpcHolder.getNameColor());
+ writeInt(_heading);
+ writeByte(_fpcHolder.getPledgeStatus());
+ writeShort(0); // getPledgeType()
+ writeInt(_fpcHolder.getTitleColor());
+ writeByte(0); // isCursedWeaponEquipped
+ writeInt(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0
+ writeInt(0); // getTransformationDisplayId()
+ writeInt(_fpcHolder.getAgathionId());
+ writeByte(0);
+ writeInt(0); // getCurrentCp()
+ writeInt(_npc.getMaxHp());
+ writeInt((int) Math.round(_npc.getCurrentHp()));
+ writeInt(_npc.getMaxMp());
+ writeInt((int) Math.round(_npc.getCurrentMp()));
+ writeByte(0);
final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects();
- packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0));
+ writeInt(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0));
for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects)
{
- packet.writeH(abnormalVisualEffect.getClientId());
+ writeShort(abnormalVisualEffect.getClientId());
}
if (_npc.isInvisible())
{
- packet.writeH(AbnormalVisualEffect.STEALTH.getClientId());
+ writeShort(AbnormalVisualEffect.STEALTH.getClientId());
}
- packet.writeC(0); // cocPlayer.getPosition()
- packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0);
- packet.writeC(0); // Used Ability Points
- return true;
+ writeByte(0); // cocPlayer.getPosition()
+ writeByte((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0));
+ writeByte(0); // Used Ability Points
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
index 7d9dc5e41d..88e73af3ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.FlyType;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.interfaces.ILocational;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class FlyToLocation implements IClientOutgoingPacket
+public class FlyToLocation extends ServerPacket
{
private final int _destX;
private final int _destY;
@@ -85,20 +84,19 @@ public class FlyToLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FLY_TO_LOCATION.writeId(packet);
- packet.writeD(_chaObjId);
- packet.writeD(_destX);
- packet.writeD(_destY);
- packet.writeD(_destZ);
- packet.writeD(_orgX);
- packet.writeD(_orgY);
- packet.writeD(_orgZ);
- packet.writeD(_type.ordinal());
- packet.writeD(_flySpeed);
- packet.writeD(_flyDelay);
- packet.writeD(_animationSpeed);
- return true;
+ ServerPackets.FLY_TO_LOCATION.writeId(this);
+ writeInt(_chaObjId);
+ writeInt(_destX);
+ writeInt(_destY);
+ writeInt(_destZ);
+ writeInt(_orgX);
+ writeInt(_orgY);
+ writeInt(_orgZ);
+ writeInt(_type.ordinal());
+ writeInt(_flySpeed);
+ writeInt(_flyDelay);
+ writeInt(_animationSpeed);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
index 471d70f791..501bd9e3fc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class FriendAddRequest implements IClientOutgoingPacket
+public class FriendAddRequest extends ServerPacket
{
private final String _requestorName;
@@ -32,11 +31,10 @@ public class FriendAddRequest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet);
- packet.writeC(1);
- packet.writeS(_requestorName);
- return true;
+ ServerPackets.FRIEND_ADD_REQUEST.writeId(this);
+ writeByte(1);
+ writeString(_requestorName);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
index 2ee6ffbcd9..9884792662 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.model.stats.BaseStat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* This server packet sends the player's henna information using the Game Master's UI.
* @author KenM, Zoey76
*/
-public class GMHennaInfo implements IClientOutgoingPacket
+public class GMHennaInfo extends ServerPacket
{
private final Player _player;
private final List _hennas = new ArrayList<>();
@@ -47,27 +46,26 @@ public class GMHennaInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GMHENNA_INFO.writeId(packet);
- packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT
- packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR
- packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON
- packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN
- packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX
- packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT
- packet.writeH(0); // equip LUC
- packet.writeH(0); // equip CHA
- packet.writeD(3); // Slots
- packet.writeD(_hennas.size()); // Size
+ ServerPackets.GMHENNA_INFO.writeId(this);
+ writeShort(_player.getHennaValue(BaseStat.INT)); // equip INT
+ writeShort(_player.getHennaValue(BaseStat.STR)); // equip STR
+ writeShort(_player.getHennaValue(BaseStat.CON)); // equip CON
+ writeShort(_player.getHennaValue(BaseStat.MEN)); // equip MEN
+ writeShort(_player.getHennaValue(BaseStat.DEX)); // equip DEX
+ writeShort(_player.getHennaValue(BaseStat.WIT)); // equip WIT
+ writeShort(0); // equip LUC
+ writeShort(0); // equip CHA
+ writeInt(3); // Slots
+ writeInt(_hennas.size()); // Size
for (Henna henna : _hennas)
{
- packet.writeD(henna.getDyeId());
- packet.writeD(1);
+ writeInt(henna.getDyeId());
+ writeInt(1);
}
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- return true;
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java
index 59bf0d9d93..a1b8556c8f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Kerberos
*/
-public class GMHide implements IClientOutgoingPacket
+public class GMHide extends ServerPacket
{
private final int _mode;
@@ -35,10 +34,9 @@ public class GMHide implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_HIDE.writeId(packet);
- packet.writeD(_mode);
- return true;
+ ServerPackets.GM_HIDE.writeId(this);
+ writeInt(_mode);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
index c2f0803303..8d01a0e33e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.ExperienceData;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.model.VariationInstance;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class GMViewCharacterInfo implements IClientOutgoingPacket
+public class GMViewCharacterInfo extends ServerPacket
{
private final Player _player;
private final int _runSpd;
@@ -47,119 +46,118 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet);
- packet.writeD(_player.getX());
- packet.writeD(_player.getY());
- packet.writeD(_player.getZ());
- packet.writeD(_player.getHeading());
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getName());
- packet.writeD(_player.getRace().ordinal());
- packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
- packet.writeD(_player.getClassId().getId());
- packet.writeD(_player.getLevel());
- packet.writeQ(_player.getExp());
- packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); // High Five exp %
- packet.writeD(_player.getSTR());
- packet.writeD(_player.getDEX());
- packet.writeD(_player.getCON());
- packet.writeD(_player.getINT());
- packet.writeD(_player.getWIT());
- packet.writeD(_player.getMEN());
- packet.writeD(0); // LUC
- packet.writeD(0); // CHA
- packet.writeD(_player.getMaxHp());
- packet.writeD((int) _player.getCurrentHp());
- packet.writeD(_player.getMaxMp());
- packet.writeD((int) _player.getCurrentMp());
- packet.writeQ(_player.getSp());
- packet.writeD(_player.getCurrentLoad());
- packet.writeD(_player.getMaxLoad());
- packet.writeD(_player.getPkKills());
+ ServerPackets.GM_VIEW_CHARACTER_INFO.writeId(this);
+ writeInt(_player.getX());
+ writeInt(_player.getY());
+ writeInt(_player.getZ());
+ writeInt(_player.getHeading());
+ writeInt(_player.getObjectId());
+ writeString(_player.getName());
+ writeInt(_player.getRace().ordinal());
+ writeInt(_player.getAppearance().isFemale());
+ writeInt(_player.getClassId().getId());
+ writeInt(_player.getLevel());
+ writeLong(_player.getExp());
+ writeDouble((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); // High Five exp %
+ writeInt(_player.getSTR());
+ writeInt(_player.getDEX());
+ writeInt(_player.getCON());
+ writeInt(_player.getINT());
+ writeInt(_player.getWIT());
+ writeInt(_player.getMEN());
+ writeInt(0); // LUC
+ writeInt(0); // CHA
+ writeInt(_player.getMaxHp());
+ writeInt((int) _player.getCurrentHp());
+ writeInt(_player.getMaxMp());
+ writeInt((int) _player.getCurrentMp());
+ writeLong(_player.getSp());
+ writeInt(_player.getCurrentLoad());
+ writeInt(_player.getMaxLoad());
+ writeInt(_player.getPkKills());
for (int slot : getPaperdollOrder())
{
- packet.writeD(_player.getInventory().getPaperdollObjectId(slot));
+ writeInt(_player.getInventory().getPaperdollObjectId(slot));
}
for (int slot : getPaperdollOrder())
{
- packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot));
+ writeInt(_player.getInventory().getPaperdollItemDisplayId(slot));
}
for (int slot = 0; slot < 11; slot++)
{
final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot);
- packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed
- packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed
+ writeInt(augment != null ? augment.getOption1Id() : 0); // Confirmed
+ writeInt(augment != null ? augment.getOption2Id() : 0); // Confirmed
}
- packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3
- packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3
- packet.writeD(0);
- packet.writeH(0);
- packet.writeD(_player.getPAtk());
- packet.writeD(_player.getPAtkSpd());
- packet.writeD(_player.getPDef());
- packet.writeD(_player.getEvasionRate());
- packet.writeD(_player.getAccuracy());
- packet.writeD(_player.getCriticalHit());
- packet.writeD(_player.getMAtk());
- packet.writeD(_player.getMAtkSpd());
- packet.writeD(_player.getPAtkSpd());
- packet.writeD(_player.getMDef());
- packet.writeD(_player.getMagicEvasionRate());
- packet.writeD(_player.getMagicAccuracy());
- packet.writeD(_player.getMCriticalHit());
- packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name
- packet.writeD(_player.getReputation());
- packet.writeD(_runSpd);
- packet.writeD(_walkSpd);
- packet.writeD(_swimRunSpd);
- packet.writeD(_swimWalkSpd);
- packet.writeD(_flyRunSpd);
- packet.writeD(_flyWalkSpd);
- packet.writeD(_flyRunSpd);
- packet.writeD(_flyWalkSpd);
- packet.writeF(_moveMultiplier);
- packet.writeF(_player.getAttackSpeedMultiplier()); // 2.9); //
- packet.writeF(_player.getCollisionRadius()); // scale
- packet.writeF(_player.getCollisionHeight()); // y offset ??!? fem dwarf 4033
- packet.writeD(_player.getAppearance().getHairStyle());
- packet.writeD(_player.getAppearance().getHairColor());
- packet.writeD(_player.getAppearance().getFace());
- packet.writeD(_player.isGM() ? 1 : 0); // builder level
- packet.writeS(_player.getTitle());
- packet.writeD(_player.getClanId()); // pledge id
- packet.writeD(_player.getClanCrestId()); // pledge crest id
- packet.writeD(_player.getAllyId()); // ally id
- packet.writeC(_player.getMountType().ordinal()); // mount type
- packet.writeC(_player.getPrivateStoreType().getId());
- packet.writeC(_player.hasDwarvenCraft() ? 1 : 0);
- packet.writeD(_player.getPkKills());
- packet.writeD(_player.getPvpKills());
- packet.writeH(_player.getRecomLeft());
- packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue)
- packet.writeD(_player.getClassId().getId());
- packet.writeD(0); // special effects? circles around player...
- packet.writeD(_player.getMaxCp());
- packet.writeD((int) _player.getCurrentCp());
- packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window
- packet.writeC(321);
- packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window
- packet.writeC(_player.isNoble() ? 1 : 0);
- packet.writeC(_player.isHero() ? 1 : 0);
- packet.writeD(_player.getAppearance().getNameColor());
- packet.writeD(_player.getAppearance().getTitleColor());
+ writeByte(_player.getInventory().getTalismanSlots()); // CT2.3
+ writeByte(_player.getInventory().canEquipCloak()); // CT2.3
+ writeInt(0);
+ writeShort(0);
+ writeInt(_player.getPAtk());
+ writeInt(_player.getPAtkSpd());
+ writeInt(_player.getPDef());
+ writeInt(_player.getEvasionRate());
+ writeInt(_player.getAccuracy());
+ writeInt(_player.getCriticalHit());
+ writeInt(_player.getMAtk());
+ writeInt(_player.getMAtkSpd());
+ writeInt(_player.getPAtkSpd());
+ writeInt(_player.getMDef());
+ writeInt(_player.getMagicEvasionRate());
+ writeInt(_player.getMagicAccuracy());
+ writeInt(_player.getMCriticalHit());
+ writeInt(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name
+ writeInt(_player.getReputation());
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_player.getAttackSpeedMultiplier()); // 2.9); //
+ writeDouble(_player.getCollisionRadius()); // scale
+ writeDouble(_player.getCollisionHeight()); // y offset ??!? fem dwarf 4033
+ writeInt(_player.getAppearance().getHairStyle());
+ writeInt(_player.getAppearance().getHairColor());
+ writeInt(_player.getAppearance().getFace());
+ writeInt(_player.isGM()); // builder level
+ writeString(_player.getTitle());
+ writeInt(_player.getClanId()); // pledge id
+ writeInt(_player.getClanCrestId()); // pledge crest id
+ writeInt(_player.getAllyId()); // ally id
+ writeByte(_player.getMountType().ordinal()); // mount type
+ writeByte(_player.getPrivateStoreType().getId());
+ writeByte(_player.hasDwarvenCraft());
+ writeInt(_player.getPkKills());
+ writeInt(_player.getPvpKills());
+ writeShort(_player.getRecomLeft());
+ writeShort(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue)
+ writeInt(_player.getClassId().getId());
+ writeInt(0); // special effects? circles around player...
+ writeInt(_player.getMaxCp());
+ writeInt((int) _player.getCurrentCp());
+ writeByte(_player.isRunning()); // changes the Speed display on Status Window
+ writeByte(321);
+ writeInt(_player.getPledgeClass()); // changes the text above CP on Status Window
+ writeByte(_player.isNoble());
+ writeByte(_player.isHero());
+ writeInt(_player.getAppearance().getNameColor());
+ writeInt(_player.getAppearance().getTitleColor());
final AttributeType attackAttribute = _player.getAttackElement();
- packet.writeH(attackAttribute.getClientId());
- packet.writeH(_player.getAttackElementValue(attackAttribute));
+ writeShort(attackAttribute.getClientId());
+ writeShort(_player.getAttackElementValue(attackAttribute));
for (AttributeType type : AttributeType.ATTRIBUTE_TYPES)
{
- packet.writeH(_player.getDefenseElementValue(type));
+ writeShort(_player.getDefenseElementValue(type));
}
- packet.writeD(_player.getFame());
- packet.writeD(_player.getVitalityPoints());
- packet.writeD(0);
- packet.writeD(0);
- return true;
+ writeInt(_player.getFame());
+ writeInt(_player.getVitalityPoints());
+ writeInt(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
index b65005003d..ed4fcfc677 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
@@ -19,11 +19,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class GMViewItemList extends AbstractItemPacket
{
@@ -55,24 +54,23 @@ public class GMViewItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.GM_VIEW_ITEM_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_items.size());
+ writeInt(_items.size());
}
else
{
- packet.writeS(_playerName);
- packet.writeD(_limit); // inventory limit
+ writeString(_playerName);
+ writeInt(_limit); // inventory limit
}
- packet.writeD(_items.size());
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
+ writeItem(item);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
index 552b6e6168..0be8feaf2c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class GMViewPledgeInfo implements IClientOutgoingPacket
+public class GMViewPledgeInfo extends ServerPacket
{
private final Clan _clan;
private final Player _player;
@@ -34,44 +33,43 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet);
- packet.writeD(0);
- packet.writeS(_player.getName());
- packet.writeD(_clan.getId());
- packet.writeD(0);
- packet.writeS(_clan.getName());
- packet.writeS(_clan.getLeaderName());
- packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game
- packet.writeD(_clan.getLevel());
- packet.writeD(_clan.getCastleId());
- packet.writeD(_clan.getHideoutId());
- packet.writeD(_clan.getFortId());
- packet.writeD(_clan.getRank());
- packet.writeD(_clan.getReputationScore());
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(_clan.getAllyId()); // c2
- packet.writeS(_clan.getAllyName()); // c2
- packet.writeD(_clan.getAllyCrestId()); // c2
- packet.writeD(_clan.isAtWar() ? 1 : 0); // c3
- packet.writeD(0); // T3 Unknown
- packet.writeD(_clan.getMembers().size());
+ ServerPackets.GM_VIEW_PLEDGE_INFO.writeId(this);
+ writeInt(0);
+ writeString(_player.getName());
+ writeInt(_clan.getId());
+ writeInt(0);
+ writeString(_clan.getName());
+ writeString(_clan.getLeaderName());
+ writeInt(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game
+ writeInt(_clan.getLevel());
+ writeInt(_clan.getCastleId());
+ writeInt(_clan.getHideoutId());
+ writeInt(_clan.getFortId());
+ writeInt(_clan.getRank());
+ writeInt(_clan.getReputationScore());
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(_clan.getAllyId()); // c2
+ writeString(_clan.getAllyName()); // c2
+ writeInt(_clan.getAllyCrestId()); // c2
+ writeInt(_clan.isAtWar()); // c3
+ writeInt(0); // T3 Unknown
+ writeInt(_clan.getMembers().size());
for (ClanMember member : _clan.getMembers())
{
if (member != null)
{
- packet.writeS(member.getName());
- packet.writeD(member.getLevel());
- packet.writeD(member.getClassId());
- packet.writeD(member.getSex() ? 1 : 0);
- packet.writeD(member.getRaceOrdinal());
- packet.writeD(member.isOnline() ? member.getObjectId() : 0);
- packet.writeD(member.getSponsor() != 0 ? 1 : 0);
+ writeString(member.getName());
+ writeInt(member.getLevel());
+ writeInt(member.getClassId());
+ writeInt(member.getSex());
+ writeInt(member.getRaceOrdinal());
+ writeInt(member.isOnline() ? member.getObjectId() : 0);
+ writeInt(member.getSponsor() != 0);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
index 3c155ff816..adfef54421 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
@@ -18,12 +18,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class GMViewSkillInfo implements IClientOutgoingPacket
+public class GMViewSkillInfo extends ServerPacket
{
private final Player _player;
private final Collection _skills;
@@ -35,22 +34,21 @@ public class GMViewSkillInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet);
- packet.writeS(_player.getName());
- packet.writeD(_skills.size());
+ ServerPackets.GM_VIEW_SKILL_INFO.writeId(this);
+ writeString(_player.getName());
+ writeInt(_skills.size());
final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0);
for (Skill skill : _skills)
{
- packet.writeD(skill.isPassive() ? 1 : 0);
- packet.writeH(skill.getDisplayLevel());
- packet.writeH(skill.getSubLevel());
- packet.writeD(skill.getDisplayId());
- packet.writeD(0);
- packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0);
- packet.writeC(skill.isEnchantable() ? 1 : 0);
+ writeInt(skill.isPassive());
+ writeShort(skill.getDisplayLevel());
+ writeShort(skill.getSubLevel());
+ writeInt(skill.getDisplayId());
+ writeInt(0);
+ writeByte(isDisabled && skill.isClanSkill());
+ writeByte(skill.isEnchantable());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
index c909d5e6e1..8fe5d1f013 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class GMViewWarehouseWithdrawList extends AbstractItemPacket
{
@@ -48,26 +47,25 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_items.size());
- packet.writeD(_items.size());
+ writeInt(_items.size());
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
}
else
{
- packet.writeS(_playerName);
- packet.writeQ(_money);
- packet.writeD(_items.size());
+ writeString(_playerName);
+ writeLong(_money);
+ writeInt(_items.size());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
index 449271993b..1fb55b8874 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Lets drink to code!
* @author zabbix
*/
-public class GameGuardQuery implements IClientOutgoingPacket
+public class GameGuardQuery extends ServerPacket
{
public static final GameGuardQuery STATIC_PACKET = new GameGuardQuery();
@@ -32,13 +31,12 @@ public class GameGuardQuery implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GAME_GUARD_QUERY.writeId(packet);
- packet.writeD(0x27533DD9);
- packet.writeD(0x2E72A51D);
- packet.writeD(0x2017038B);
- packet.writeD(0xC35B1EA3);
- return true;
+ ServerPackets.GAME_GUARD_QUERY.writeId(this);
+ writeInt(0x27533DD9);
+ writeInt(0x2E72A51D);
+ writeInt(0x2017038B);
+ writeInt(0xC35B1EA3);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java
index 037b2e6b6b..b95d15eb8a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class GetItem implements IClientOutgoingPacket
+public class GetItem extends ServerPacket
{
private final Item _item;
private final int _playerId;
@@ -32,14 +31,13 @@ public class GetItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GET_ITEM.writeId(packet);
- packet.writeD(_playerId);
- packet.writeD(_item.getObjectId());
- packet.writeD(_item.getX());
- packet.writeD(_item.getY());
- packet.writeD(_item.getZ());
- return true;
+ ServerPackets.GET_ITEM.writeId(this);
+ writeInt(_playerId);
+ writeInt(_item.getObjectId());
+ writeInt(_item.getX());
+ writeInt(_item.getY());
+ writeInt(_item.getZ());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
index 5f4d7bf3ca..f6ec7ea5c0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Maktakien
*/
-public class GetOffVehicle implements IClientOutgoingPacket
+public class GetOffVehicle extends ServerPacket
{
private final int _objectId;
private final int _boatObjId;
@@ -47,14 +46,13 @@ public class GetOffVehicle implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GET_OFF_VEHICLE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_boatObjId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.GET_OFF_VEHICLE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_boatObjId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
index 77d1e6ba28..ad424462b9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Maktakien
*/
-public class GetOnVehicle implements IClientOutgoingPacket
+public class GetOnVehicle extends ServerPacket
{
private final int _objectId;
private final int _boatObjId;
@@ -42,14 +41,13 @@ public class GetOnVehicle implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GET_ON_VEHICLE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_boatObjId);
- packet.writeD(_pos.getX());
- packet.writeD(_pos.getY());
- packet.writeD(_pos.getZ());
- return true;
+ ServerPackets.GET_ON_VEHICLE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_boatObjId);
+ writeInt(_pos.getX());
+ writeInt(_pos.getY());
+ writeInt(_pos.getZ());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
index b1f5b588f9..b2eb41630f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.quest.QuestState;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Tempy
*/
-public class GmViewQuestInfo implements IClientOutgoingPacket
+public class GmViewQuestInfo extends ServerPacket
{
private final Player _player;
private final List _questList;
@@ -39,19 +38,18 @@ public class GmViewQuestInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet);
- packet.writeS(_player.getName());
- packet.writeH(_questList.size()); // quest count
+ ServerPackets.GM_VIEW_QUEST_INFO.writeId(this);
+ writeString(_player.getName());
+ writeShort(_questList.size()); // quest count
for (Quest quest : _questList)
{
final QuestState qs = _player.getQuestState(quest.getName());
- packet.writeD(quest.getId());
- packet.writeD(qs == null ? 0 : qs.getCond());
+ writeInt(quest.getId());
+ writeInt(qs == null ? 0 : qs.getCond());
}
- packet.writeH(0); // some size
+ writeShort(0); // some size
// for size; ddQQ
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
index 3283ac802a..c815e5ab7b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Zoey76
*/
-public class HennaEquipList implements IClientOutgoingPacket
+public class HennaEquipList extends ServerPacket
{
private final Player _player;
private final List _hennaEquipList;
@@ -45,26 +44,25 @@ public class HennaEquipList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.HENNA_EQUIP_LIST.writeId(packet);
- packet.writeQ(_player.getAdena()); // activeChar current amount of Adena
- packet.writeD(3); // available equip slot
- packet.writeD(_hennaEquipList.size());
+ ServerPackets.HENNA_EQUIP_LIST.writeId(this);
+ writeLong(_player.getAdena()); // activeChar current amount of Adena
+ writeInt(3); // available equip slot
+ writeInt(_hennaEquipList.size());
for (Henna henna : _hennaEquipList)
{
// Player must have at least one dye in inventory
// to be able to see the Henna that can be applied with it.
if ((_player.getInventory().getItemByItemId(henna.getDyeItemId())) != null)
{
- packet.writeD(henna.getDyeId()); // dye Id
- packet.writeD(henna.getDyeItemId()); // item Id of the dye
- packet.writeQ(henna.getWearCount()); // amount of dyes required
- packet.writeQ(henna.getWearFee()); // amount of Adena required
- packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not
- // packet.writeD(0); // Does not exist in Classic.
+ writeInt(henna.getDyeId()); // dye Id
+ writeInt(henna.getDyeItemId()); // item Id of the dye
+ writeLong(henna.getWearCount()); // amount of dyes required
+ writeLong(henna.getWearFee()); // amount of Adena required
+ writeInt(henna.isAllowedClass(_player.getClassId())); // meet the requirement or not
+ // writeInt(0); // Does not exist in Classic.
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
index 23364ad722..4c41a77856 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.model.stats.BaseStat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* This server packet sends the player's henna information.
* @author Zoey76
*/
-public class HennaInfo implements IClientOutgoingPacket
+public class HennaInfo extends ServerPacket
{
private final Player _player;
private final List _hennas = new ArrayList<>();
@@ -47,27 +46,26 @@ public class HennaInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.HENNA_INFO.writeId(packet);
- packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT
- packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR
- packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON
- packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN
- packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX
- packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT
- packet.writeH(0); // equip LUC
- packet.writeH(0); // equip CHA
- packet.writeD(3 - _player.getHennaEmptySlots()); // Slots
- packet.writeD(_hennas.size()); // Size
+ ServerPackets.HENNA_INFO.writeId(this);
+ writeShort(_player.getHennaValue(BaseStat.INT)); // equip INT
+ writeShort(_player.getHennaValue(BaseStat.STR)); // equip STR
+ writeShort(_player.getHennaValue(BaseStat.CON)); // equip CON
+ writeShort(_player.getHennaValue(BaseStat.MEN)); // equip MEN
+ writeShort(_player.getHennaValue(BaseStat.DEX)); // equip DEX
+ writeShort(_player.getHennaValue(BaseStat.WIT)); // equip WIT
+ writeShort(0); // equip LUC
+ writeShort(0); // equip CHA
+ writeInt(3 - _player.getHennaEmptySlots()); // Slots
+ writeInt(_hennas.size()); // Size
for (Henna henna : _hennas)
{
- packet.writeD(henna.getDyeId());
- packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0);
+ writeInt(henna.getDyeId());
+ writeInt(henna.isAllowedClass(_player.getClassId()));
}
- packet.writeD(0); // Premium Slot Dye ID
- packet.writeD(0); // Premium Slot Dye Time Left
- packet.writeD(0); // Premium Slot Dye ID isValid
- return true;
+ writeInt(0); // Premium Slot Dye ID
+ writeInt(0); // Premium Slot Dye Time Left
+ writeInt(0); // Premium Slot Dye ID isValid
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
index 9a22f0a564..9a0c7bbef7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.model.stats.BaseStat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Zoey76
*/
-public class HennaItemDrawInfo implements IClientOutgoingPacket
+public class HennaItemDrawInfo extends ServerPacket
{
private final Player _player;
private final Henna _henna;
@@ -37,28 +36,27 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.HENNA_ITEM_INFO.writeId(packet);
- packet.writeD(_henna.getDyeId()); // symbol Id
- packet.writeD(_henna.getDyeItemId()); // item id of dye
- packet.writeQ(_henna.getWearCount()); // total amount of dye require
- packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol
- packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true
- packet.writeQ(_player.getAdena());
- packet.writeD(_player.getINT()); // current INT
- packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT
- packet.writeD(_player.getSTR()); // current STR
- packet.writeH(_player.getSTR() + _player.getHennaValue(BaseStat.STR)); // equip STR
- packet.writeD(_player.getCON()); // current CON
- packet.writeH(_player.getCON() + _player.getHennaValue(BaseStat.CON)); // equip CON
- packet.writeD(_player.getMEN()); // current MEN
- packet.writeH(_player.getMEN() + _player.getHennaValue(BaseStat.MEN)); // equip MEN
- packet.writeD(_player.getDEX()); // current DEX
- packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX
- packet.writeD(_player.getWIT()); // current WIT
- packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT
- packet.writeD(0); // TODO: Find me!
- return true;
+ ServerPackets.HENNA_ITEM_INFO.writeId(this);
+ writeInt(_henna.getDyeId()); // symbol Id
+ writeInt(_henna.getDyeItemId()); // item id of dye
+ writeLong(_henna.getWearCount()); // total amount of dye require
+ writeLong(_henna.getWearFee()); // total amount of Adena require to draw symbol
+ writeInt(_henna.isAllowedClass(_player.getClassId())); // able to draw or not 0 is false and 1 is true
+ writeLong(_player.getAdena());
+ writeInt(_player.getINT()); // current INT
+ writeShort(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT
+ writeInt(_player.getSTR()); // current STR
+ writeShort(_player.getSTR() + _player.getHennaValue(BaseStat.STR)); // equip STR
+ writeInt(_player.getCON()); // current CON
+ writeShort(_player.getCON() + _player.getHennaValue(BaseStat.CON)); // equip CON
+ writeInt(_player.getMEN()); // current MEN
+ writeShort(_player.getMEN() + _player.getHennaValue(BaseStat.MEN)); // equip MEN
+ writeInt(_player.getDEX()); // current DEX
+ writeShort(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX
+ writeInt(_player.getWIT()); // current WIT
+ writeShort(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT
+ writeInt(0); // TODO: Find me!
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
index 162812f30b..1e9dc1dae7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.model.stats.BaseStat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Zoey76
*/
-public class HennaItemRemoveInfo implements IClientOutgoingPacket
+public class HennaItemRemoveInfo extends ServerPacket
{
private final Player _player;
private final Henna _henna;
@@ -37,32 +36,31 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet);
- packet.writeD(_henna.getDyeId()); // symbol Id
- packet.writeD(_henna.getDyeItemId()); // item id of dye
- packet.writeQ(_henna.getCancelCount()); // total amount of dye require
- packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol
- packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not
- packet.writeQ(_player.getAdena());
- packet.writeD(_player.getINT()); // current INT
- packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT
- packet.writeD(_player.getSTR()); // current STR
- packet.writeH(_player.getSTR() - _player.getHennaValue(BaseStat.STR)); // equip STR
- packet.writeD(_player.getCON()); // current CON
- packet.writeH(_player.getCON() - _player.getHennaValue(BaseStat.CON)); // equip CON
- packet.writeD(_player.getMEN()); // current MEN
- packet.writeH(_player.getMEN() - _player.getHennaValue(BaseStat.MEN)); // equip MEN
- packet.writeD(_player.getDEX()); // current DEX
- packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX
- packet.writeD(_player.getWIT()); // current WIT
- packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT
- packet.writeD(0); // current LUC
- packet.writeH(0); // equip LUC
- packet.writeD(0); // current CHA
- packet.writeH(0); // equip CHA
- packet.writeD(0);
- return true;
+ ServerPackets.HENNA_UNEQUIP_INFO.writeId(this);
+ writeInt(_henna.getDyeId()); // symbol Id
+ writeInt(_henna.getDyeItemId()); // item id of dye
+ writeLong(_henna.getCancelCount()); // total amount of dye require
+ writeLong(_henna.getCancelFee()); // total amount of Adena require to remove symbol
+ writeInt(_henna.isAllowedClass(_player.getClassId())); // able to remove or not
+ writeLong(_player.getAdena());
+ writeInt(_player.getINT()); // current INT
+ writeShort(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT
+ writeInt(_player.getSTR()); // current STR
+ writeShort(_player.getSTR() - _player.getHennaValue(BaseStat.STR)); // equip STR
+ writeInt(_player.getCON()); // current CON
+ writeShort(_player.getCON() - _player.getHennaValue(BaseStat.CON)); // equip CON
+ writeInt(_player.getMEN()); // current MEN
+ writeShort(_player.getMEN() - _player.getHennaValue(BaseStat.MEN)); // equip MEN
+ writeInt(_player.getDEX()); // current DEX
+ writeShort(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX
+ writeInt(_player.getWIT()); // current WIT
+ writeShort(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT
+ writeInt(0); // current LUC
+ writeShort(0); // equip LUC
+ writeInt(0); // current CHA
+ writeShort(0); // equip CHA
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
index d9f092b327..8bcbd6e49f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Zoey76
*/
-public class HennaRemoveList implements IClientOutgoingPacket
+public class HennaRemoveList extends ServerPacket
{
private final Player _player;
@@ -34,23 +33,22 @@ public class HennaRemoveList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet);
- packet.writeQ(_player.getAdena());
- packet.writeD(3); // seems to be max size
- packet.writeD(3 - _player.getHennaEmptySlots());
+ ServerPackets.HENNA_UNEQUIP_LIST.writeId(this);
+ writeLong(_player.getAdena());
+ writeInt(3); // seems to be max size
+ writeInt(3 - _player.getHennaEmptySlots());
for (Henna henna : _player.getHennaList())
{
if (henna != null)
{
- packet.writeD(henna.getDyeId());
- packet.writeD(henna.getDyeItemId());
- packet.writeQ(henna.getCancelCount());
- packet.writeQ(henna.getCancelFee());
- packet.writeD(0);
+ writeInt(henna.getDyeId());
+ writeInt(henna.getDyeItemId());
+ writeLong(henna.getCancelCount());
+ writeLong(henna.getCancelFee());
+ writeInt(0);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
index 3378827f34..1f349f8bf9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
@@ -18,10 +18,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Advi, UnAfraid
@@ -43,10 +42,9 @@ public class InventoryUpdate extends AbstractInventoryUpdate
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.INVENTORY_UPDATE.writeId(packet);
- writeItems(packet);
- return true;
+ ServerPackets.INVENTORY_UPDATE.writeId(this);
+ writeItems();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
index 6ed675188b..70602bda14 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
@@ -19,36 +19,33 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Index, Mobius
*/
-public class ItemDeletionInfo implements IClientOutgoingPacket
+public class ItemDeletionInfo extends ServerPacket
{
public ItemDeletionInfo()
{
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
+ ServerPackets.EX_ITEM_DELETION_INFO.writeId(this);
// Items.
final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
- packet.writeD(itemDates.size());
+ writeInt(itemDates.size());
for (Entry info : itemDates.entrySet())
{
- packet.writeD(info.getKey()); // item
- packet.writeD(info.getValue()); // date
+ writeInt(info.getKey()); // item
+ writeInt(info.getValue()); // date
}
// Skills.
- packet.writeD(0);
-
- return true;
+ writeInt(0);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java
index cef69ecb6f..8efc3140cf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java
@@ -19,10 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class ItemList extends AbstractItemPacket
{
@@ -44,26 +43,25 @@ public class ItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ITEM_LIST.writeId(packet);
+ ServerPackets.ITEM_LIST.writeId(this);
if (_sendType == 2)
{
- packet.writeC(_sendType);
- packet.writeD(_items.size());
- packet.writeD(_items.size());
+ writeByte(_sendType);
+ writeInt(_items.size());
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
+ writeItem(item);
}
}
else
{
- packet.writeC(1); // _showWindow ? 1 : 0
- packet.writeD(0);
- packet.writeD(_items.size());
+ writeByte(1); // _showWindow
+ writeInt(0);
+ writeInt(_items.size());
}
- writeInventoryBlock(packet, _player.getInventory());
- return true;
+ writeInventoryBlock(_player.getInventory());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java
index ad16842291..bfdccc2927 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class JoinParty implements IClientOutgoingPacket
+public class JoinParty extends ServerPacket
{
private final int _response;
private final int _type;
@@ -32,16 +31,15 @@ public class JoinParty implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.JOIN_PARTY.writeId(packet);
- packet.writeD(_response);
- packet.writeD(_type);
+ ServerPackets.JOIN_PARTY.writeId(this);
+ writeInt(_response);
+ writeInt(_type);
if (_type != 0)
{
- packet.writeD(0); // TODO: Find me!
- packet.writeD(0); // TODO: Find me!
+ writeInt(0); // TODO: Find me!
+ writeInt(0); // TODO: Find me!
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
index f347f7efcd..240003b4ad 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class JoinPledge implements IClientOutgoingPacket
+public class JoinPledge extends ServerPacket
{
private final int _pledgeId;
@@ -29,10 +28,9 @@ public class JoinPledge implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.JOIN_PLEDGE.writeId(packet);
- packet.writeD(_pledgeId);
- return true;
+ ServerPackets.JOIN_PLEDGE.writeId(this);
+ writeInt(_pledgeId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
index 407e46a895..cd1a97d9fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
@@ -17,10 +17,9 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class KeyPacket implements IClientOutgoingPacket
+public class KeyPacket extends ServerPacket
{
private final byte[] _key;
private final int _result;
@@ -32,19 +31,18 @@ public class KeyPacket implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VERSION_CHECK.writeId(packet);
- packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok
+ ServerPackets.VERSION_CHECK.writeId(this);
+ writeByte(_result); // 0 - wrong protocol, 1 - protocol ok
for (int i = 0; i < 8; i++)
{
- packet.writeC(_key[i]); // key
+ writeByte(_key[i]); // key
}
- packet.writeD(1);
- packet.writeD(Config.SERVER_ID); // server id
- packet.writeC(1);
- packet.writeD(0); // obfuscation key
- packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 4 : 0); // isClassic
- return true;
+ writeInt(Config.PACKET_ENCRYPTION); // use blowfish encryption
+ writeInt(Config.SERVER_ID); // server id
+ writeByte(1);
+ writeInt(0); // obfuscation key
+ writeByte((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 4 : 0); // isClassic
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
index 62424fd03a..6dffae77c8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Send Private (Friend) Message
* @author Tempy
*/
-public class L2FriendSay implements IClientOutgoingPacket
+public class L2FriendSay extends ServerPacket
{
private final String _sender;
private final String _receiver;
@@ -37,13 +36,12 @@ public class L2FriendSay implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.L2_FRIEND_SAY.writeId(packet);
- packet.writeD(0); // ??
- packet.writeS(_receiver);
- packet.writeS(_sender);
- packet.writeS(_message);
- return true;
+ ServerPackets.L2_FRIEND_SAY.writeId(this);
+ writeInt(0); // ??
+ writeString(_receiver);
+ writeString(_sender);
+ writeString(_message);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
index 14eb7fbe10..4efda950e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class LeaveWorld implements IClientOutgoingPacket
+public class LeaveWorld extends ServerPacket
{
public static final LeaveWorld STATIC_PACKET = new LeaveWorld();
@@ -28,9 +27,8 @@ public class LeaveWorld implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.LOG_OUT_OK.writeId(packet);
- return true;
+ ServerPackets.LOG_OUT_OK.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java
index 790d599b5b..c8773e0d0e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java
@@ -19,18 +19,17 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.PartyMatchingRoomLevelType;
import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.matching.MatchingRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ListPartyWaiting implements IClientOutgoingPacket
+public class ListPartyWaiting extends ServerPacket
{
private static final int NUM_PER_PAGE = 64;
@@ -54,29 +53,28 @@ public class ListPartyWaiting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.LIST_PARTY_WATING.writeId(packet);
- packet.writeD(_size);
- packet.writeD(_rooms.size());
+ ServerPackets.LIST_PARTY_WATING.writeId(this);
+ writeInt(_size);
+ writeInt(_rooms.size());
for (MatchingRoom room : _rooms)
{
- packet.writeD(room.getId());
- packet.writeS(room.getTitle());
- packet.writeD(room.getLocation());
- packet.writeD(room.getMinLevel());
- packet.writeD(room.getMaxLevel());
- packet.writeD(room.getMaxMembers());
- packet.writeS(room.getLeader().getName());
- packet.writeD(room.getMembersCount());
+ writeInt(room.getId());
+ writeString(room.getTitle());
+ writeInt(room.getLocation());
+ writeInt(room.getMinLevel());
+ writeInt(room.getMaxLevel());
+ writeInt(room.getMaxMembers());
+ writeString(room.getLeader().getName());
+ writeInt(room.getMembersCount());
for (Player member : room.getMembers())
{
- packet.writeD(member.getClassId().getId());
- packet.writeS(member.getName());
+ writeInt(member.getClassId().getId());
+ writeString(member.getName());
}
}
- packet.writeD(World.getInstance().getPartyCount()); // Helios
- packet.writeD(World.getInstance().getPartyMemberCount()); // Helios
- return true;
+ writeInt(World.getInstance().getPartyCount()); // Helios
+ writeInt(World.getInstance().getPartyMemberCount()); // Helios
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java
index bb0ac61dbd..a74e1d3b57 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class LoginFail implements IClientOutgoingPacket
+public class LoginFail extends ServerPacket
{
public static final int NO_TEXT = 0;
public static final int SYSTEM_ERROR_LOGIN_LATER = 1;
@@ -51,11 +50,10 @@ public class LoginFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.LOGIN_FAIL.writeId(packet);
- packet.writeD(_success);
- packet.writeD(_reason);
- return true;
+ ServerPackets.LOGIN_FAIL.writeId(this);
+ writeInt(_success);
+ writeInt(_reason);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
index 6743e3e66f..7b0e850189 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class MagicSkillCanceld implements IClientOutgoingPacket
+public class MagicSkillCanceld extends ServerPacket
{
private final int _objectId;
@@ -29,10 +28,9 @@ public class MagicSkillCanceld implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet);
- packet.writeD(_objectId);
- return true;
+ ServerPackets.MAGIC_SKILL_CANCELED.writeId(this);
+ writeInt(_objectId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 7ab29cc1a8..30561b956e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -20,17 +20,16 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.SkillCastingType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* MagicSkillLaunched server packet implementation.
* @author UnAfraid
*/
-public class MagicSkillLaunched implements IClientOutgoingPacket
+public class MagicSkillLaunched extends ServerPacket
{
private final int _objectId;
private final int _skillId;
@@ -63,18 +62,17 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet);
- packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType
- packet.writeD(_objectId);
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- packet.writeD(_targets.size());
+ ServerPackets.MAGIC_SKILL_LAUNCHED.writeId(this);
+ writeInt(_castingType.getClientBarId()); // MagicSkillUse castingType
+ writeInt(_objectId);
+ writeInt(_skillId);
+ writeInt(_skillLevel);
+ writeInt(_targets.size());
for (WorldObject target : _targets)
{
- packet.writeD(target.getObjectId());
+ writeInt(target.getObjectId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
index 37ad6bd5cc..635e169ed7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
@@ -20,20 +20,19 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IPositionable;
import org.l2jmobius.gameserver.model.skill.SkillCastingType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* MagicSkillUse server packet implementation.
* @author UnAfraid, NosBit
*/
-public class MagicSkillUse implements IClientOutgoingPacket
+public class MagicSkillUse extends ServerPacket
{
private final int _skillId;
private final int _skillLevel;
@@ -49,6 +48,7 @@ public class MagicSkillUse implements IClientOutgoingPacket
public MagicSkillUse(Creature creature, WorldObject target, int skillId, int skillLevel, int hitTime, int reuseDelay, int reuseGroup, int actionId, SkillCastingType castingType)
{
+ super(75);
_creature = creature;
_target = target;
_skillId = skillId;
@@ -81,38 +81,37 @@ public class MagicSkillUse implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_SKILL_USE.writeId(packet);
- packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red.
- packet.writeD(_creature.getObjectId());
- packet.writeD(_target.getObjectId());
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- packet.writeD(_hitTime);
- packet.writeD(_reuseGroup);
- packet.writeD(_reuseDelay);
- packet.writeD(_creature.getX());
- packet.writeD(_creature.getY());
- packet.writeD(_creature.getZ());
- packet.writeH(_unknown.size()); // TODO: Implement me!
+ ServerPackets.MAGIC_SKILL_USE.writeId(this);
+ writeInt(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red.
+ writeInt(_creature.getObjectId());
+ writeInt(_target.getObjectId());
+ writeInt(_skillId);
+ writeInt(_skillLevel);
+ writeInt(_hitTime);
+ writeInt(_reuseGroup);
+ writeInt(_reuseDelay);
+ writeInt(_creature.getX());
+ writeInt(_creature.getY());
+ writeInt(_creature.getZ());
+ writeShort(_unknown.size()); // TODO: Implement me!
for (int unknown : _unknown)
{
- packet.writeH(unknown);
+ writeShort(unknown);
}
- packet.writeH(_groundLocations.size());
+ writeShort(_groundLocations.size());
for (IPositionable target : _groundLocations)
{
- packet.writeD(target.getX());
- packet.writeD(target.getY());
- packet.writeD(target.getZ());
+ writeInt(target.getX());
+ writeInt(target.getY());
+ writeInt(target.getZ());
}
- packet.writeD(_target.getX());
- packet.writeD(_target.getY());
- packet.writeD(_target.getZ());
- packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used
- packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills.
- packet.writeD(-1); // 306
- return true;
+ writeInt(_target.getX());
+ writeInt(_target.getY());
+ writeInt(_target.getZ());
+ writeInt(_actionId >= 0); // 1 when ID from RequestActionUse is used
+ writeInt(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills.
+ writeInt(-1); // 306
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
index 12e2488f24..f0775ffb1a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ManagePledgePower implements IClientOutgoingPacket
+public class ManagePledgePower extends ServerPacket
{
private final int _action;
private final Clan _clan;
@@ -34,12 +33,11 @@ public class ManagePledgePower implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet);
- packet.writeD(_rank);
- packet.writeD(_action);
- packet.writeD(_clan.getRankPrivs(_rank).getBitmask());
- return true;
+ ServerPackets.MANAGE_PLEDGE_POWER.writeId(this);
+ writeInt(_rank);
+ writeInt(_action);
+ writeInt(_clan.getRankPrivs(_rank).getBitmask());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
index 4e2ab3f00b..6b651ecfe8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class MonRaceInfo implements IClientOutgoingPacket
+public class MonRaceInfo extends ServerPacket
{
private final int _unknown1;
private final int _unknown2;
@@ -39,37 +38,36 @@ public class MonRaceInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MON_RACE_INFO.writeId(packet);
- packet.writeD(_unknown1);
- packet.writeD(_unknown2);
- packet.writeD(8);
+ ServerPackets.MON_RACE_INFO.writeId(this);
+ writeInt(_unknown1);
+ writeInt(_unknown2);
+ writeInt(8);
for (int i = 0; i < 8; i++)
{
- packet.writeD(_monsters[i].getObjectId()); // npcObjectID
- packet.writeD(_monsters[i].getTemplate().getDisplayId() + 1000000); // npcID
- packet.writeD(14107); // origin X
- packet.writeD(181875 + (58 * (7 - i))); // origin Y
- packet.writeD(-3566); // origin Z
- packet.writeD(12080); // end X
- packet.writeD(181875 + (58 * (7 - i))); // end Y
- packet.writeD(-3566); // end Z
- packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height
- packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius
- packet.writeD(120); // ?? unknown
+ writeInt(_monsters[i].getObjectId()); // npcObjectID
+ writeInt(_monsters[i].getTemplate().getDisplayId() + 1000000); // npcID
+ writeInt(14107); // origin X
+ writeInt(181875 + (58 * (7 - i))); // origin Y
+ writeInt(-3566); // origin Z
+ writeInt(12080); // end X
+ writeInt(181875 + (58 * (7 - i))); // end Y
+ writeInt(-3566); // end Z
+ writeDouble(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height
+ writeDouble(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius
+ writeInt(120); // ?? unknown
for (int j = 0; j < 20; j++)
{
if (_unknown1 == 0)
{
- packet.writeC(_speeds[i][j]);
+ writeByte(_speeds[i][j]);
}
else
{
- packet.writeC(0);
+ writeByte(0);
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
index e6386921ff..f2587795b3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class MoveToLocation implements IClientOutgoingPacket
+public class MoveToLocation extends ServerPacket
{
private final int _objectId;
private final int _x;
@@ -42,16 +41,15 @@ public class MoveToLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MOVE_TO_LOCATION.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_xDst);
- packet.writeD(_yDst);
- packet.writeD(_zDst);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.MOVE_TO_LOCATION.writeId(this);
+ writeInt(_objectId);
+ writeInt(_xDst);
+ writeInt(_yDst);
+ writeInt(_zDst);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
index 59103c6c4c..69654c8613 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Maktakien
*/
-public class MoveToLocationInVehicle implements IClientOutgoingPacket
+public class MoveToLocationInVehicle extends ServerPacket
{
private final int _objectId;
private final int _boatId;
@@ -45,17 +44,16 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_boatId);
- packet.writeD(_destination.getX());
- packet.writeD(_destination.getY());
- packet.writeD(_destination.getZ());
- packet.writeD(_origin.getX());
- packet.writeD(_origin.getY());
- packet.writeD(_origin.getZ());
- return true;
+ ServerPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_boatId);
+ writeInt(_destination.getX());
+ writeInt(_destination.getY());
+ writeInt(_destination.getZ());
+ writeInt(_origin.getX());
+ writeInt(_origin.getY());
+ writeInt(_origin.getZ());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
index aa261f924f..dc82629f8e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class MoveToPawn implements IClientOutgoingPacket
+public class MoveToPawn extends ServerPacket
{
private final int _objectId;
private final int _targetId;
@@ -47,18 +46,17 @@ public class MoveToPawn implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MOVE_TO_PAWN.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_targetId);
- packet.writeD(_distance);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_tx);
- packet.writeD(_ty);
- packet.writeD(_tz);
- return true;
+ ServerPackets.MOVE_TO_PAWN.writeId(this);
+ writeInt(_objectId);
+ writeInt(_targetId);
+ writeInt(_distance);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_tx);
+ writeInt(_ty);
+ writeInt(_tz);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index f94917d93d..4690fe94de 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import static org.l2jmobius.gameserver.data.xml.MultisellData.PAGE_SIZE;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -27,7 +26,7 @@ import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder;
import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class MultiSellList extends AbstractItemPacket
{
@@ -55,19 +54,19 @@ public class MultiSellList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MULTI_SELL_LIST.writeId(packet);
- packet.writeC(0); // Helios
- packet.writeD(_list.getId()); // list id
- packet.writeC(0); // GOD Unknown
- packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1
- packet.writeD(_finished ? 1 : 0); // finished
- packet.writeD(PAGE_SIZE); // size of pages
- packet.writeD(_size); // list length
- packet.writeC(0); // Grand Crusade
- packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window
- packet.writeD(32); // Helios - Always 32
+ ServerPackets.MULTI_SELL_LIST.writeId(this);
+ writeByte(0); // Helios
+ writeInt(_list.getId()); // list id
+ writeByte(0); // GOD Unknown
+ writeInt(1 + (_index / PAGE_SIZE)); // page started from 1
+ writeInt(_finished); // finished
+ writeInt(PAGE_SIZE); // size of pages
+ writeInt(_size); // list length
+ writeByte(0); // Grand Crusade
+ writeByte(_list.isChanceMultisell()); // new multisell window
+ writeInt(32); // Helios - Always 32
while (_size-- > 0)
{
ItemInfo itemEnchantment = _list.getItemEnchantment(_index);
@@ -84,39 +83,39 @@ public class MultiSellList extends AbstractItemPacket
}
}
}
- packet.writeD(_index); // Entry ID. Start from 1.
- packet.writeC(entry.isStackable() ? 1 : 0);
+ writeInt(_index); // Entry ID. Start from 1.
+ writeByte(entry.isStackable());
// Those values will be passed down to MultiSellChoose packet.
- packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level
- writeItemAugment(packet, itemEnchantment);
- writeItemElemental(packet, itemEnchantment);
- writeItemEnsoulOptions(packet, itemEnchantment);
- packet.writeC(0); // 286
- packet.writeH(entry.getProducts().size());
- packet.writeH(entry.getIngredients().size());
+ writeShort(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level
+ writeItemAugment(itemEnchantment);
+ writeItemElemental(itemEnchantment);
+ writeItemEnsoulOptions(itemEnchantment);
+ writeByte(0); // 286
+ writeShort(entry.getProducts().size());
+ writeShort(entry.getIngredients().size());
for (ItemChanceHolder product : entry.getProducts())
{
final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId());
final ItemInfo displayItemEnchantment = _list.isMaintainEnchantment() && (itemEnchantment != null) && (template != null) && template.getClass().equals(itemEnchantment.getItem().getClass()) ? itemEnchantment : null;
if (template != null)
{
- packet.writeD(template.getDisplayId());
- packet.writeQ(template.getBodyPart());
- packet.writeH(template.getType2());
+ writeInt(template.getDisplayId());
+ writeLong(template.getBodyPart());
+ writeShort(template.getType2());
}
else
{
- packet.writeD(product.getId());
- packet.writeQ(0);
- packet.writeH(65535);
+ writeInt(product.getId());
+ writeLong(0);
+ writeShort(65535);
}
- packet.writeQ(_list.getProductCount(product));
- packet.writeH(product.getEnchantmentLevel() > 0 ? product.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
- packet.writeD((int) Math.ceil(product.getChance())); // chance
- writeItemAugment(packet, displayItemEnchantment);
- writeItemElemental(packet, displayItemEnchantment);
- writeItemEnsoulOptions(packet, displayItemEnchantment);
- packet.writeC(0); // 286
+ writeLong(_list.getProductCount(product));
+ writeShort(product.getEnchantmentLevel() > 0 ? product.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
+ writeInt((int) Math.ceil(product.getChance())); // chance
+ writeItemAugment(displayItemEnchantment);
+ writeItemElemental(displayItemEnchantment);
+ writeItemEnsoulOptions(displayItemEnchantment);
+ writeByte(0); // 286
}
for (ItemChanceHolder ingredient : entry.getIngredients())
{
@@ -124,22 +123,21 @@ public class MultiSellList extends AbstractItemPacket
final ItemInfo displayItemEnchantment = (itemEnchantment != null) && (template != null) && template.getClass().equals(itemEnchantment.getItem().getClass()) ? itemEnchantment : null;
if (template != null)
{
- packet.writeD(template.getDisplayId());
- packet.writeH(template.getType2());
+ writeInt(template.getDisplayId());
+ writeShort(template.getType2());
}
else
{
- packet.writeD(ingredient.getId());
- packet.writeH(65535);
+ writeInt(ingredient.getId());
+ writeShort(65535);
}
- packet.writeQ(_list.getIngredientCount(ingredient));
- packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
- writeItemAugment(packet, displayItemEnchantment);
- writeItemElemental(packet, displayItemEnchantment);
- writeItemEnsoulOptions(packet, displayItemEnchantment);
- packet.writeC(0); // 286
+ writeLong(_list.getIngredientCount(ingredient));
+ writeShort(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
+ writeItemAugment(displayItemEnchantment);
+ writeItemElemental(displayItemEnchantment);
+ writeItemEnsoulOptions(displayItemEnchantment);
+ writeByte(0); // 286
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
index cd46aac3aa..6d153026b9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* MyTargetSelected server packet implementation.
* @author UnAfraid
*/
-public class MyTargetSelected implements IClientOutgoingPacket
+public class MyTargetSelected extends ServerPacket
{
private final int _objectId;
private final int _color;
@@ -42,13 +41,12 @@ public class MyTargetSelected implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MY_TARGET_SELECTED.writeId(packet);
- packet.writeD(1); // Grand Crusade
- packet.writeD(_objectId);
- packet.writeH(_color);
- packet.writeD(0);
- return true;
+ ServerPackets.MY_TARGET_SELECTED.writeId(this);
+ writeInt(1); // Grand Crusade
+ writeInt(_objectId);
+ writeShort(_color);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
index 166c5c1e00..6980d61cd7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
@@ -19,11 +19,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class NewCharacterSuccess implements IClientOutgoingPacket
+public class NewCharacterSuccess extends ServerPacket
{
private final List _chars = new ArrayList<>();
@@ -33,10 +32,10 @@ public class NewCharacterSuccess implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet);
- packet.writeD(_chars.size());
+ ServerPackets.NEW_CHARACTER_SUCCESS.writeId(this);
+ writeInt(_chars.size());
for (PlayerTemplate chr : _chars)
{
if (chr == null)
@@ -44,27 +43,26 @@ public class NewCharacterSuccess implements IClientOutgoingPacket
continue;
}
// TODO: Unhardcode these
- packet.writeD(chr.getRace().ordinal());
- packet.writeD(chr.getClassId().getId());
- packet.writeD(99);
- packet.writeD(chr.getBaseSTR());
- packet.writeD(1);
- packet.writeD(99);
- packet.writeD(chr.getBaseDEX());
- packet.writeD(1);
- packet.writeD(99);
- packet.writeD(chr.getBaseCON());
- packet.writeD(1);
- packet.writeD(99);
- packet.writeD(chr.getBaseINT());
- packet.writeD(1);
- packet.writeD(99);
- packet.writeD(chr.getBaseWIT());
- packet.writeD(1);
- packet.writeD(99);
- packet.writeD(chr.getBaseMEN());
- packet.writeD(1);
+ writeInt(chr.getRace().ordinal());
+ writeInt(chr.getClassId().getId());
+ writeInt(99);
+ writeInt(chr.getBaseSTR());
+ writeInt(1);
+ writeInt(99);
+ writeInt(chr.getBaseDEX());
+ writeInt(1);
+ writeInt(99);
+ writeInt(chr.getBaseCON());
+ writeInt(1);
+ writeInt(99);
+ writeInt(chr.getBaseINT());
+ writeInt(1);
+ writeInt(99);
+ writeInt(chr.getBaseWIT());
+ writeInt(1);
+ writeInt(99);
+ writeInt(chr.getBaseMEN());
+ writeInt(1);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
index 6061ea26ef..0e2947b0f1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author devScarlet
*/
-public class NicknameChanged implements IClientOutgoingPacket
+public class NicknameChanged extends ServerPacket
{
private final String _title;
private final int _objectId;
@@ -35,11 +34,10 @@ public class NicknameChanged implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NICK_NAME_CHANGED.writeId(packet);
- packet.writeD(_objectId);
- packet.writeS(_title);
- return true;
+ ServerPackets.NICK_NAME_CHANGED.writeId(this);
+ writeInt(_objectId);
+ writeString(_title);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
index 920d3e7c70..0bed9f5387 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class NormalCamera implements IClientOutgoingPacket
+public class NormalCamera extends ServerPacket
{
public static final NormalCamera STATIC_PACKET = new NormalCamera();
@@ -28,9 +27,8 @@ public class NormalCamera implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NORMAL_CAMERA.writeId(packet);
- return true;
+ ServerPackets.NORMAL_CAMERA.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
index a158a53472..f4709efe1f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.HtmlActionScope;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* NpcHtmlMessage server packet implementation.
@@ -96,15 +95,14 @@ public class NpcHtmlMessage extends AbstractHtmlPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet);
- packet.writeD(getNpcObjId());
- packet.writeS(getHtml());
- packet.writeD(_itemId);
- packet.writeD(0); // play sound - 0 = enabled, 1 = disabled
- packet.writeC(_size);
- return true;
+ ServerPackets.NPC_HTML_MESSAGE.writeId(this);
+ writeInt(getNpcObjId());
+ writeString(getHtml());
+ writeInt(_itemId);
+ writeInt(0); // play sound - 0 = enabled, 1 = disabled
+ writeByte(_size);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index ce56e727f2..fb043062f3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.xml.NpcData;
import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData;
@@ -31,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.NpcStringId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author UnAfraid
@@ -264,22 +263,22 @@ public class NpcInfo extends AbstractMaskPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_INFO.writeId(packet);
- packet.writeD(_npc.getObjectId());
- packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned
- packet.writeH(37); // mask_bits_37
- packet.writeB(_masks);
+ ServerPackets.NPC_INFO.writeId(this);
+ writeInt(_npc.getObjectId());
+ writeByte(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned
+ writeShort(37); // mask_bits_37
+ writeBytes(_masks);
// Block 1
- packet.writeC(_initSize);
+ writeByte(_initSize);
if (containsMask(NpcInfoType.ATTACKABLE))
{
- packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0);
+ writeByte(_npc.isAttackable() && !(_npc instanceof Guard));
}
if (containsMask(NpcInfoType.RELATIONS))
{
- packet.writeQ(0);
+ writeLong(0);
}
if (containsMask(NpcInfoType.TITLE))
{
@@ -296,155 +295,154 @@ public class NpcInfo extends AbstractMaskPacket
title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]);
}
}
- packet.writeS(title);
+ writeString(title);
}
// Block 2
- packet.writeH(_blockSize);
+ writeShort(_blockSize);
if (containsMask(NpcInfoType.ID))
{
- packet.writeD(_npc.getTemplate().getDisplayId() + 1000000);
+ writeInt(_npc.getTemplate().getDisplayId() + 1000000);
}
if (containsMask(NpcInfoType.POSITION))
{
- packet.writeD(_npc.getX());
- packet.writeD(_npc.getY());
- packet.writeD(_npc.getZ());
+ writeInt(_npc.getX());
+ writeInt(_npc.getY());
+ writeInt(_npc.getZ());
}
if (containsMask(NpcInfoType.HEADING))
{
- packet.writeD(_npc.getHeading());
+ writeInt(_npc.getHeading());
}
if (containsMask(NpcInfoType.UNKNOWN2))
{
- packet.writeD(0); // Unknown
+ writeInt(0); // Unknown
}
if (containsMask(NpcInfoType.ATK_CAST_SPEED))
{
- packet.writeD(_npc.getPAtkSpd());
- packet.writeD(_npc.getMAtkSpd());
+ writeInt(_npc.getPAtkSpd());
+ writeInt(_npc.getMAtkSpd());
}
if (containsMask(NpcInfoType.SPEED_MULTIPLIER))
{
- packet.writeE((float) _npc.getStat().getMovementSpeedMultiplier());
- packet.writeE((float) _npc.getStat().getAttackSpeedMultiplier());
+ writeFloat((float) _npc.getStat().getMovementSpeedMultiplier());
+ writeFloat((float) _npc.getStat().getAttackSpeedMultiplier());
}
if (containsMask(NpcInfoType.EQUIPPED))
{
- packet.writeD(_npc.getRightHandItem());
- packet.writeD(0); // Armor id?
- packet.writeD(_npc.getLeftHandItem());
+ writeInt(_npc.getRightHandItem());
+ writeInt(0); // Armor id?
+ writeInt(_npc.getLeftHandItem());
}
if (containsMask(NpcInfoType.ALIVE))
{
- packet.writeC(_npc.isDead() ? 0 : 1);
+ writeByte(!_npc.isDead());
}
if (containsMask(NpcInfoType.RUNNING))
{
- packet.writeC(_npc.isRunning() ? 1 : 0);
+ writeByte(_npc.isRunning());
}
if (containsMask(NpcInfoType.SWIM_OR_FLY))
{
- packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0);
+ writeByte(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0);
}
if (containsMask(NpcInfoType.TEAM))
{
- packet.writeC(_npc.getTeam().getId());
+ writeByte(_npc.getTeam().getId());
}
if (containsMask(NpcInfoType.ENCHANT))
{
- packet.writeD(_npc.getEnchantEffect());
+ writeInt(_npc.getEnchantEffect());
}
if (containsMask(NpcInfoType.FLYING))
{
- packet.writeD(_npc.isFlying() ? 1 : 0);
+ writeInt(_npc.isFlying());
}
if (containsMask(NpcInfoType.CLONE))
{
- packet.writeD(_npc.getCloneObjId()); // Player ObjectId with Decoy
+ writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
}
if (containsMask(NpcInfoType.COLOR_EFFECT))
{
- packet.writeD(_npc.getColorEffect()); // Color effect
+ writeInt(_npc.getColorEffect()); // Color effect
}
if (containsMask(NpcInfoType.DISPLAY_EFFECT))
{
- packet.writeD(_npc.getDisplayEffect());
+ writeInt(_npc.getDisplayEffect());
}
if (containsMask(NpcInfoType.TRANSFORMATION))
{
- packet.writeD(_npc.getTransformationDisplayId()); // Transformation ID
+ writeInt(_npc.getTransformationDisplayId()); // Transformation ID
}
if (containsMask(NpcInfoType.CURRENT_HP))
{
- packet.writeD((int) _npc.getCurrentHp());
+ writeInt((int) _npc.getCurrentHp());
}
if (containsMask(NpcInfoType.CURRENT_MP))
{
- packet.writeD((int) _npc.getCurrentMp());
+ writeInt((int) _npc.getCurrentMp());
}
if (containsMask(NpcInfoType.MAX_HP))
{
- packet.writeD(_npc.getMaxHp());
+ writeInt(_npc.getMaxHp());
}
if (containsMask(NpcInfoType.MAX_MP))
{
- packet.writeD(_npc.getMaxMp());
+ writeInt(_npc.getMaxMp());
}
if (containsMask(NpcInfoType.SUMMONED))
{
- packet.writeC(0); // 2 - do some animation on spawn
+ writeByte(0); // 2 - do some animation on spawn
}
if (containsMask(NpcInfoType.UNKNOWN12))
{
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
if (containsMask(NpcInfoType.NAME))
{
- packet.writeS(_localisation != null ? _localisation[0] : _npc.getName());
+ writeString(_localisation != null ? _localisation[0] : _npc.getName());
}
if (containsMask(NpcInfoType.NAME_NPCSTRINGID))
{
final NpcStringId nameString = _npc.getNameString();
- packet.writeD(nameString != null ? nameString.getId() : -1); // NPCStringId for name
+ writeInt(nameString != null ? nameString.getId() : -1); // NPCStringId for name
}
if (containsMask(NpcInfoType.TITLE_NPCSTRINGID))
{
final NpcStringId titleString = _npc.getTitleString();
- packet.writeD(titleString != null ? titleString.getId() : -1); // NPCStringId for title
+ writeInt(titleString != null ? titleString.getId() : -1); // NPCStringId for title
}
if (containsMask(NpcInfoType.PVP_FLAG))
{
- packet.writeC(_npc.getPvpFlag()); // PVP flag
+ writeByte(_npc.getPvpFlag()); // PVP flag
}
if (containsMask(NpcInfoType.REPUTATION))
{
- packet.writeD(_npc.getReputation()); // Reputation
+ writeInt(_npc.getReputation()); // Reputation
}
if (containsMask(NpcInfoType.CLAN))
{
- packet.writeD(_clanId);
- packet.writeD(_clanCrest);
- packet.writeD(_clanLargeCrest);
- packet.writeD(_allyId);
- packet.writeD(_allyCrest);
+ writeInt(_clanId);
+ writeInt(_clanCrest);
+ writeInt(_clanLargeCrest);
+ writeInt(_allyId);
+ writeInt(_allyCrest);
}
if (containsMask(NpcInfoType.VISUAL_STATE))
{
- packet.writeC(_statusMask);
+ writeByte(_statusMask);
}
if (containsMask(NpcInfoType.ABNORMALS))
{
- packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0));
+ writeShort(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0));
for (AbnormalVisualEffect abnormalVisualEffect : _abnormalVisualEffects)
{
- packet.writeH(abnormalVisualEffect.getClientId());
+ writeShort(abnormalVisualEffect.getClientId());
}
if (_npc.isInvisible())
{
- packet.writeH(AbnormalVisualEffect.STEALTH.getClientId());
+ writeShort(AbnormalVisualEffect.STEALTH.getClientId());
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java
index 923e9cebad..b5b91ca39b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
*/
-public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket
+public class NpcInfoAbnormalVisualEffect extends ServerPacket
{
private final Npc _npc;
@@ -36,17 +35,16 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet);
- packet.writeD(_npc.getObjectId());
- packet.writeD(_npc.getTransformationDisplayId());
+ ServerPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(this);
+ writeInt(_npc.getObjectId());
+ writeInt(_npc.getTransformationDisplayId());
final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects();
- packet.writeD(abnormalVisualEffects.size());
+ writeInt(abnormalVisualEffects.size());
for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects)
{
- packet.writeH(abnormalVisualEffect.getClientId());
+ writeShort(abnormalVisualEffect.getClientId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
index 2a0ba41eeb..d8abc6b50e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.HtmlActionScope;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* NpcQuestHtmlMessage server packet implementation.
@@ -35,13 +34,12 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet);
- packet.writeD(getNpcObjId());
- packet.writeS(getHtml());
- packet.writeD(_questId);
- return true;
+ ServerPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(this);
+ writeInt(getNpcObjId());
+ writeString(getHtml());
+ writeInt(_questId);
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java
index fc6d0d4a3a..290e7f2a87 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java
@@ -20,17 +20,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.NpcStringId.NSLocalisation;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Kerberos
*/
-public class NpcSay implements IClientOutgoingPacket
+public class NpcSay extends ServerPacket
{
private final int _objectId;
private final ChatType _textType;
@@ -123,12 +122,12 @@ public class NpcSay implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_SAY.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_textType.getClientId());
- packet.writeD(_npcId);
+ ServerPackets.NPC_SAY.writeId(this);
+ writeInt(_objectId);
+ writeInt(_textType.getClientId());
+ writeInt(_npcId);
// Localisation related.
if (_lang != null)
{
@@ -138,24 +137,23 @@ public class NpcSay implements IClientOutgoingPacket
final NSLocalisation nsl = ns.getLocalisation(_lang);
if (nsl != null)
{
- packet.writeD(-1);
- packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList()));
- return true;
+ writeInt(-1);
+ writeString(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList()));
+ return;
}
}
}
- packet.writeD(_npcString);
+ writeInt(_npcString);
if (_npcString == -1)
{
- packet.writeS(_text);
+ writeString(_text);
}
else if (_parameters != null)
{
for (String s : _parameters)
{
- packet.writeS(s);
+ writeString(s);
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
index ac61f9d247..5ff4f2c7f0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ObservationMode implements IClientOutgoingPacket
+public class ObservationMode extends ServerPacket
{
private final Location _loc;
@@ -30,14 +29,13 @@ public class ObservationMode implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.OBSERVER_START.writeId(packet);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- packet.writeD(0); // TODO: Find me
- packet.writeD(0xc0); // TODO: Find me
- return true;
+ ServerPackets.OBSERVER_START.writeId(this);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeInt(0); // TODO: Find me
+ writeInt(0xc0); // TODO: Find me
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
index 896ccea02b..25d7104df4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ObservationReturn implements IClientOutgoingPacket
+public class ObservationReturn extends ServerPacket
{
private final Location _loc;
@@ -30,12 +29,11 @@ public class ObservationReturn implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.OBSERVER_END.writeId(packet);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- return true;
+ ServerPackets.OBSERVER_END.writeId(this);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
index 173772c870..babbd104eb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
@@ -16,29 +16,27 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik, UnAfraid
*/
-public class OnEventTrigger implements IClientOutgoingPacket
+public class OnEventTrigger extends ServerPacket
{
private final int _emitterId;
- private final int _enabled;
+ private final boolean _enabled;
public OnEventTrigger(int emitterId, boolean enabled)
{
_emitterId = emitterId;
- _enabled = enabled ? 1 : 0;
+ _enabled = enabled;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EVENT_TRIGGER.writeId(packet);
- packet.writeD(_emitterId);
- packet.writeC(_enabled);
- return true;
+ ServerPackets.EVENT_TRIGGER.writeId(this);
+ writeInt(_emitterId);
+ writeByte(_enabled);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
index 37d4fea9cf..27f98bac47 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
@@ -18,10 +18,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
@@ -42,26 +41,25 @@ public class PackageSendableList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.PACKAGE_SENDABLE_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_items.size());
- packet.writeD(_items.size());
+ writeInt(_items.size());
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
}
else
{
- packet.writeD(_objectId);
- packet.writeQ(_adena);
- packet.writeD(_items.size());
+ writeInt(_objectId);
+ writeLong(_adena);
+ writeInt(_items.size());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java
index e24d63f717..54c7da587e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java
@@ -19,14 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
* @author UnAfraid, mrTJO
*/
-public class PackageToList implements IClientOutgoingPacket
+public class PackageToList extends ServerPacket
{
private final Map _players;
@@ -36,15 +35,14 @@ public class PackageToList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PACKAGE_TO_LIST.writeId(packet);
- packet.writeD(_players.size());
+ ServerPackets.PACKAGE_TO_LIST.writeId(this);
+ writeInt(_players.size());
for (Entry entry : _players.entrySet())
{
- packet.writeD(entry.getKey());
- packet.writeS(entry.getValue());
+ writeInt(entry.getKey());
+ writeString(entry.getValue());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
index 44b23b37f4..b46688dfd3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
@@ -20,16 +20,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author zabbix
*/
-public class PartyMemberPosition implements IClientOutgoingPacket
+public class PartyMemberPosition extends ServerPacket
{
private final Map locations = new HashMap<>();
@@ -52,18 +51,17 @@ public class PartyMemberPosition implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet);
- packet.writeD(locations.size());
+ ServerPackets.PARTY_MEMBER_POSITION.writeId(this);
+ writeInt(locations.size());
for (Entry entry : locations.entrySet())
{
final Location loc = entry.getValue();
- packet.writeD(entry.getKey());
- packet.writeD(loc.getX());
- packet.writeD(loc.getY());
- packet.writeD(loc.getZ());
+ writeInt(entry.getKey());
+ writeInt(loc.getX());
+ writeInt(loc.getY());
+ writeInt(loc.getZ());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java
index c9d3595037..ef247202c8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.matching.PartyMatchingRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class PartyRoomInfo implements IClientOutgoingPacket
+public class PartyRoomInfo extends ServerPacket
{
private final PartyMatchingRoom _room;
@@ -33,16 +32,15 @@ public class PartyRoomInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_ROOM_INFO.writeId(packet);
- packet.writeD(_room.getId());
- packet.writeD(_room.getMaxMembers());
- packet.writeD(_room.getMinLevel());
- packet.writeD(_room.getMaxLevel());
- packet.writeD(_room.getLootType());
- packet.writeD(_room.getLocation());
- packet.writeS(_room.getTitle());
- return true;
+ ServerPackets.PARTY_ROOM_INFO.writeId(this);
+ writeInt(_room.getId());
+ writeInt(_room.getMaxMembers());
+ writeInt(_room.getMinLevel());
+ writeInt(_room.getMaxLevel());
+ writeInt(_room.getLootType());
+ writeInt(_room.getLocation());
+ writeString(_room.getTitle());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
index 76c4555d3b..3e1e32e3ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PartySmallWindowAdd implements IClientOutgoingPacket
+public class PartySmallWindowAdd extends ServerPacket
{
private final Player _member;
private final Party _party;
@@ -33,25 +32,24 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet);
- packet.writeD(_party.getLeaderObjectId()); // c3
- packet.writeD(_party.getDistributionType().getId()); // c3
- packet.writeD(_member.getObjectId());
- packet.writeS(_member.getName());
- packet.writeD((int) _member.getCurrentCp()); // c4
- packet.writeD(_member.getMaxCp()); // c4
- packet.writeD((int) _member.getCurrentHp());
- packet.writeD(_member.getMaxHp());
- packet.writeD((int) _member.getCurrentMp());
- packet.writeD(_member.getMaxMp());
- packet.writeD(_member.getVitalityPoints());
- packet.writeC(_member.getLevel());
- packet.writeH(_member.getClassId().getId());
- packet.writeC(0);
- packet.writeH(_member.getRace().ordinal());
- packet.writeD(0); // 228
- return true;
+ ServerPackets.PARTY_SMALL_WINDOW_ADD.writeId(this);
+ writeInt(_party.getLeaderObjectId()); // c3
+ writeInt(_party.getDistributionType().getId()); // c3
+ writeInt(_member.getObjectId());
+ writeString(_member.getName());
+ writeInt((int) _member.getCurrentCp()); // c4
+ writeInt(_member.getMaxCp()); // c4
+ writeInt((int) _member.getCurrentHp());
+ writeInt(_member.getMaxHp());
+ writeInt((int) _member.getCurrentMp());
+ writeInt(_member.getMaxMp());
+ writeInt(_member.getVitalityPoints());
+ writeByte(_member.getLevel());
+ writeShort(_member.getClassId().getId());
+ writeByte(0);
+ writeShort(_member.getRace().ordinal());
+ writeInt(0); // 228
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
index 3a47801de1..3b8160fd51 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PartySmallWindowAll implements IClientOutgoingPacket
+public class PartySmallWindowAll extends ServerPacket
{
private final Party _party;
private final Player _exclude;
@@ -34,58 +33,57 @@ public class PartySmallWindowAll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet);
- packet.writeD(_party.getLeaderObjectId());
- packet.writeC(_party.getDistributionType().getId());
- packet.writeC(_party.getMemberCount() - 1);
+ ServerPackets.PARTY_SMALL_WINDOW_ALL.writeId(this);
+ writeInt(_party.getLeaderObjectId());
+ writeByte(_party.getDistributionType().getId());
+ writeByte(_party.getMemberCount() - 1);
for (Player member : _party.getMembers())
{
if ((member != null) && (member != _exclude))
{
- packet.writeD(member.getObjectId());
- packet.writeS(member.getName());
- packet.writeD((int) member.getCurrentCp()); // c4
- packet.writeD(member.getMaxCp()); // c4
- packet.writeD((int) member.getCurrentHp());
- packet.writeD(member.getMaxHp());
- packet.writeD((int) member.getCurrentMp());
- packet.writeD(member.getMaxMp());
- packet.writeD(member.getVitalityPoints());
- packet.writeC(member.getLevel());
- packet.writeH(member.getClassId().getId());
- packet.writeC(1); // Unk
- packet.writeH(member.getRace().ordinal());
- packet.writeD(0); // 228
+ writeInt(member.getObjectId());
+ writeString(member.getName());
+ writeInt((int) member.getCurrentCp()); // c4
+ writeInt(member.getMaxCp()); // c4
+ writeInt((int) member.getCurrentHp());
+ writeInt(member.getMaxHp());
+ writeInt((int) member.getCurrentMp());
+ writeInt(member.getMaxMp());
+ writeInt(member.getVitalityPoints());
+ writeByte(member.getLevel());
+ writeShort(member.getClassId().getId());
+ writeByte(1); // Unk
+ writeShort(member.getRace().ordinal());
+ writeInt(0); // 228
final Summon pet = member.getPet();
- packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm
+ writeInt(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm
if (pet != null)
{
- packet.writeD(pet.getObjectId());
- packet.writeD(pet.getId() + 1000000);
- packet.writeC(pet.getSummonType());
- packet.writeS(pet.getName());
- packet.writeD((int) pet.getCurrentHp());
- packet.writeD(pet.getMaxHp());
- packet.writeD((int) pet.getCurrentMp());
- packet.writeD(pet.getMaxMp());
- packet.writeC(pet.getLevel());
+ writeInt(pet.getObjectId());
+ writeInt(pet.getId() + 1000000);
+ writeByte(pet.getSummonType());
+ writeString(pet.getName());
+ writeInt((int) pet.getCurrentHp());
+ writeInt(pet.getMaxHp());
+ writeInt((int) pet.getCurrentMp());
+ writeInt(pet.getMaxMp());
+ writeByte(pet.getLevel());
}
member.getServitors().values().forEach(s ->
{
- packet.writeD(s.getObjectId());
- packet.writeD(s.getId() + 1000000);
- packet.writeC(s.getSummonType());
- packet.writeS(s.getName());
- packet.writeD((int) s.getCurrentHp());
- packet.writeD(s.getMaxHp());
- packet.writeD((int) s.getCurrentMp());
- packet.writeD(s.getMaxMp());
- packet.writeC(s.getLevel());
+ writeInt(s.getObjectId());
+ writeInt(s.getId() + 1000000);
+ writeByte(s.getSummonType());
+ writeString(s.getName());
+ writeInt((int) s.getCurrentHp());
+ writeInt(s.getMaxHp());
+ writeInt((int) s.getCurrentMp());
+ writeInt(s.getMaxMp());
+ writeByte(s.getLevel());
});
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
index 09ce132af4..2784d3a3d1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PartySmallWindowDelete implements IClientOutgoingPacket
+public class PartySmallWindowDelete extends ServerPacket
{
private final Player _member;
@@ -30,11 +29,10 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet);
- packet.writeD(_member.getObjectId());
- packet.writeS(_member.getName());
- return true;
+ ServerPackets.PARTY_SMALL_WINDOW_DELETE.writeId(this);
+ writeInt(_member.getObjectId());
+ writeString(_member.getName());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
index 11f803350c..3c7d5da53d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PartySmallWindowDeleteAll implements IClientOutgoingPacket
+public class PartySmallWindowDeleteAll extends ServerPacket
{
public static final PartySmallWindowDeleteAll STATIC_PACKET = new PartySmallWindowDeleteAll();
@@ -28,9 +27,8 @@ public class PartySmallWindowDeleteAll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SMALL_WINDOW_DELETE_ALL.writeId(packet);
- return true;
+ ServerPackets.PARTY_SMALL_WINDOW_DELETE_ALL.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
index e9ea2efbbe..6ace133e60 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.PartySmallWindowUpdateType;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class PartySmallWindowUpdate extends AbstractMaskPacket
{
@@ -39,52 +38,51 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _effects = new ArrayList<>();
private final List _effects2 = new ArrayList<>();
@@ -47,32 +46,31 @@ public class PartySpelled implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SPELLED.writeId(packet);
- packet.writeD(_creature.isServitor() ? 2 : _creature.isPet() ? 1 : 0);
- packet.writeD(_creature.getObjectId());
- packet.writeD(_effects.size() + _effects2.size());
+ ServerPackets.PARTY_SPELLED.writeId(this);
+ writeInt(_creature.isServitor() ? 2 : _creature.isPet() ? 1 : 0);
+ writeInt(_creature.getObjectId());
+ writeInt(_effects.size() + _effects2.size());
for (BuffInfo info : _effects)
{
if ((info != null) && info.isInUse())
{
- packet.writeD(info.getSkill().getDisplayId());
- packet.writeH(info.getSkill().getDisplayLevel());
- packet.writeD(info.getSkill().getAbnormalType().getClientId());
- writeOptionalD(packet, info.getTime());
+ writeInt(info.getSkill().getDisplayId());
+ writeShort(info.getSkill().getDisplayLevel());
+ writeInt(info.getSkill().getAbnormalType().getClientId());
+ writeOptionalInt(info.getTime());
}
}
for (Skill skill : _effects2)
{
if (skill != null)
{
- packet.writeD(skill.getDisplayId());
- packet.writeH(skill.getDisplayLevel());
- packet.writeD(skill.getAbnormalType().getClientId());
- packet.writeH(-1);
+ writeInt(skill.getDisplayId());
+ writeShort(skill.getDisplayLevel());
+ writeInt(skill.getAbnormalType().getClientId());
+ writeShort(-1);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
index c9d5d59e8b..253891329d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Plim
*/
-public class PetitionVotePacket implements IClientOutgoingPacket
+public class PetitionVotePacket extends ServerPacket
{
public static final PetitionVotePacket STATIC_PACKET = new PetitionVotePacket();
@@ -31,9 +30,8 @@ public class PetitionVotePacket implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PETITION_VOTE.writeId(packet);
- return true;
+ ServerPackets.PETITION_VOTE.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java
index 0898b01f67..10099fec1f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PlaySound implements IClientOutgoingPacket
+public class PlaySound extends ServerPacket
{
private final int _unknown1;
private final String _soundFile;
@@ -60,17 +59,16 @@ public class PlaySound implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLAY_SOUND.writeId(packet);
- packet.writeD(_unknown1); // unknown 0 for quest and ship;
- packet.writeS(_soundFile);
- packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship;
- packet.writeD(_unknown4); // 0 for quest; objectId of ship
- packet.writeD(_unknown5); // x
- packet.writeD(_unknown6); // y
- packet.writeD(_unknown7); // z
- packet.writeD(_unknown8);
- return true;
+ ServerPackets.PLAY_SOUND.writeId(this);
+ writeInt(_unknown1); // unknown 0 for quest and ship;
+ writeString(_soundFile);
+ writeInt(_unknown3); // unknown 0 for quest; 1 for ship;
+ writeInt(_unknown4); // 0 for quest; objectId of ship
+ writeInt(_unknown5); // x
+ writeInt(_unknown6); // y
+ writeInt(_unknown7); // z
+ writeInt(_unknown8);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
index 5108fe7e1b..1d86ccdf6a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
@@ -17,12 +17,11 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.model.Crest;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeCrest implements IClientOutgoingPacket
+public class PledgeCrest extends ServerPacket
{
private final int _crestId;
private final byte[] _data;
@@ -41,20 +40,19 @@ public class PledgeCrest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_CREST.writeId(packet);
- packet.writeD(Config.SERVER_ID);
- packet.writeD(_crestId);
+ ServerPackets.PLEDGE_CREST.writeId(this);
+ writeInt(Config.SERVER_ID);
+ writeInt(_crestId);
if (_data != null)
{
- packet.writeD(_data.length);
- packet.writeB(_data);
+ writeInt(_data.length);
+ writeBytes(_data);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
index 6805f64d7c..62115644b1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
@@ -17,11 +17,10 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeInfo implements IClientOutgoingPacket
+public class PledgeInfo extends ServerPacket
{
private final Clan _clan;
@@ -31,13 +30,12 @@ public class PledgeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_INFO.writeId(packet);
- packet.writeD(Config.SERVER_ID);
- packet.writeD(_clan.getId());
- packet.writeS(_clan.getName());
- packet.writeS(_clan.getAllyName());
- return true;
+ ServerPackets.PLEDGE_INFO.writeId(this);
+ writeInt(Config.SERVER_ID);
+ writeInt(_clan.getId());
+ writeString(_clan.getName());
+ writeString(_clan.getAllyName());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
index fce9f86d25..cbe96513f9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgePowerGradeList implements IClientOutgoingPacket
+public class PledgePowerGradeList extends ServerPacket
{
private final Collection _privs;
@@ -32,15 +31,14 @@ public class PledgePowerGradeList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet);
- packet.writeD(_privs.size());
+ ServerPackets.PLEDGE_POWER_GRADE_LIST.writeId(this);
+ writeInt(_privs.size());
for (RankPrivs temp : _privs)
{
- packet.writeD(temp.getRank());
- packet.writeD(temp.getParty());
+ writeInt(temp.getRank());
+ writeInt(temp.getParty());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
index 193ee17589..824ffefd3d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeReceiveMemberInfo implements IClientOutgoingPacket
+public class PledgeReceiveMemberInfo extends ServerPacket
{
private final ClanMember _member;
@@ -33,23 +32,22 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet);
- packet.writeD(_member.getPledgeType());
- packet.writeS(_member.getName());
- packet.writeS(_member.getTitle()); // title
- packet.writeD(_member.getPowerGrade()); // power
+ ServerPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(this);
+ writeInt(_member.getPledgeType());
+ writeString(_member.getName());
+ writeString(_member.getTitle()); // title
+ writeInt(_member.getPowerGrade()); // power
// clan or subpledge name
if (_member.getPledgeType() != 0)
{
- packet.writeS((_member.getClan().getSubPledge(_member.getPledgeType())).getName());
+ writeString((_member.getClan().getSubPledge(_member.getPledgeType())).getName());
}
else
{
- packet.writeS(_member.getClan().getName());
+ writeString(_member.getClan().getName());
}
- packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor
- return true;
+ writeString(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
index 6aa5067c8f..bb5e0fd8fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeReceivePowerInfo implements IClientOutgoingPacket
+public class PledgeReceivePowerInfo extends ServerPacket
{
private final ClanMember _member;
@@ -33,12 +32,11 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet);
- packet.writeD(_member.getPowerGrade()); // power grade
- packet.writeS(_member.getName());
- packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges
- return true;
+ ServerPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(this);
+ writeInt(_member.getPowerGrade()); // power grade
+ writeString(_member.getName());
+ writeInt(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
index 01f71eea17..f1c5ac25e8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.Clan.SubPledge;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author -Wooden-
*/
-public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket
+public class PledgeReceiveSubPledgeCreated extends ServerPacket
{
private final SubPledge _subPledge;
private final Clan _clan;
@@ -37,14 +36,13 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet);
- packet.writeD(1);
- packet.writeD(_subPledge.getId());
- packet.writeS(_subPledge.getName());
- packet.writeS(getLeaderName());
- return true;
+ ServerPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(this);
+ writeInt(1);
+ writeInt(_subPledge.getId());
+ writeString(_subPledge.getName());
+ writeString(getLeaderName());
}
private String getLeaderName()
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
index 7649947064..118825f6ec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanWar;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeReceiveWarList implements IClientOutgoingPacket
+public class PledgeReceiveWarList extends ServerPacket
{
private final Clan _clan;
private final int _tab;
@@ -40,11 +39,11 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet);
- packet.writeD(_tab); // page
- packet.writeD(_clanList.size());
+ ServerPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(this);
+ writeInt(_tab); // page
+ writeInt(_clanList.size());
for (ClanWar clanWar : _clanList)
{
final Clan clan = clanWar.getOpposingClan(_clan);
@@ -52,13 +51,12 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket
{
continue;
}
- packet.writeS(clan.getName());
- packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error
- packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining
- packet.writeD(clanWar.getKillDifference(_clan)); // Score
- packet.writeD(0); // @TODO: Recent change in points
- packet.writeD(clanWar.getKillToStart()); // Friends to start war left
+ writeString(clan.getName());
+ writeInt(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error
+ writeInt(clanWar.getRemainingTime()); // Time if friends to start remaining
+ writeInt(clanWar.getKillDifference(_clan)); // Score
+ writeInt(0); // @TODO: Recent change in points
+ writeInt(clanWar.getKillToStart()); // Friends to start war left
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
index 80d10fcb66..c7b6ad46fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
@@ -17,11 +17,10 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeShowInfoUpdate implements IClientOutgoingPacket
+public class PledgeShowInfoUpdate extends ServerPacket
{
private final Clan _clan;
@@ -31,28 +30,27 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet);
+ ServerPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(this);
// sending empty data so client will ask all the info in response ;)
- packet.writeD(_clan.getId());
- packet.writeD(Config.SERVER_ID);
- packet.writeD(_clan.getCrestId());
- packet.writeD(_clan.getLevel()); // clan level
- packet.writeD(_clan.getCastleId());
- packet.writeD(0); // castle state ?
- packet.writeD(_clan.getHideoutId());
- packet.writeD(_clan.getFortId());
- packet.writeD(_clan.getRank());
- packet.writeD(_clan.getReputationScore()); // clan reputation score
- packet.writeD(0); // ?
- packet.writeD(0); // ?
- packet.writeD(_clan.getAllyId());
- packet.writeS(_clan.getAllyName()); // c5
- packet.writeD(_clan.getAllyCrestId()); // c5
- packet.writeD(_clan.isAtWar() ? 1 : 0); // c5
- packet.writeD(0); // TODO: Find me!
- packet.writeD(0); // TODO: Find me!
- return true;
+ writeInt(_clan.getId());
+ writeInt(Config.SERVER_ID);
+ writeInt(_clan.getCrestId());
+ writeInt(_clan.getLevel()); // clan level
+ writeInt(_clan.getCastleId());
+ writeInt(0); // castle state ?
+ writeInt(_clan.getHideoutId());
+ writeInt(_clan.getFortId());
+ writeInt(_clan.getRank());
+ writeInt(_clan.getReputationScore()); // clan reputation score
+ writeInt(0); // ?
+ writeInt(0); // ?
+ writeInt(_clan.getAllyId());
+ writeString(_clan.getAllyName()); // c5
+ writeInt(_clan.getAllyCrestId()); // c5
+ writeInt(_clan.isAtWar()); // c5
+ writeInt(0); // TODO: Find me!
+ writeInt(0); // TODO: Find me!
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
index 2fa9f26d4a..e74bba06ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeShowMemberListAdd implements IClientOutgoingPacket
+public class PledgeShowMemberListAdd extends ServerPacket
{
private final String _name;
private final int _level;
@@ -48,16 +47,15 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet);
- packet.writeS(_name);
- packet.writeD(_level);
- packet.writeD(_classId);
- packet.writeD(0);
- packet.writeD(1);
- packet.writeD(_isOnline); // 1 = online 0 = offline
- packet.writeD(_pledgeType);
- return true;
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(this);
+ writeString(_name);
+ writeInt(_level);
+ writeInt(_classId);
+ writeInt(0);
+ writeInt(1);
+ writeInt(_isOnline); // 1 = online 0 = offline
+ writeInt(_pledgeType);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
index a1be315cf4..d8a805ac63 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.Clan.SubPledge;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeShowMemberListAll implements IClientOutgoingPacket
+public class PledgeShowMemberListAll extends ServerPacket
{
private final Clan _clan;
private final SubPledge _pledge;
@@ -62,55 +61,54 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet);
- packet.writeD(_isSubPledge ? 0 : 1);
- packet.writeD(_clan.getId());
- packet.writeD(Config.SERVER_ID);
- packet.writeD(_pledgeId);
- packet.writeS(_name);
- packet.writeS(_leaderName);
- packet.writeD(_clan.getCrestId()); // crest id .. is used again
- packet.writeD(_clan.getLevel());
- packet.writeD(_clan.getCastleId());
- packet.writeD(0);
- packet.writeD(_clan.getHideoutId());
- packet.writeD(_clan.getFortId());
- packet.writeD(_clan.getRank());
- packet.writeD(_clan.getReputationScore());
- packet.writeD(0); // 0
- packet.writeD(0); // 0
- packet.writeD(_clan.getAllyId());
- packet.writeS(_clan.getAllyName());
- packet.writeD(_clan.getAllyCrestId());
- packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3
- packet.writeD(0); // Territory castle ID
- packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId));
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(this);
+ writeInt(!_isSubPledge);
+ writeInt(_clan.getId());
+ writeInt(Config.SERVER_ID);
+ writeInt(_pledgeId);
+ writeString(_name);
+ writeString(_leaderName);
+ writeInt(_clan.getCrestId()); // crest id .. is used again
+ writeInt(_clan.getLevel());
+ writeInt(_clan.getCastleId());
+ writeInt(0);
+ writeInt(_clan.getHideoutId());
+ writeInt(_clan.getFortId());
+ writeInt(_clan.getRank());
+ writeInt(_clan.getReputationScore());
+ writeInt(0); // 0
+ writeInt(0); // 0
+ writeInt(_clan.getAllyId());
+ writeString(_clan.getAllyName());
+ writeInt(_clan.getAllyCrestId());
+ writeInt(_clan.isAtWar()); // new c3
+ writeInt(0); // Territory castle ID
+ writeInt(_clan.getSubPledgeMembersCount(_pledgeId));
for (ClanMember m : _members)
{
if (m.getPledgeType() != _pledgeId)
{
continue;
}
- packet.writeS(m.getName());
- packet.writeD(m.getLevel());
- packet.writeD(m.getClassId());
+ writeString(m.getName());
+ writeInt(m.getLevel());
+ writeInt(m.getClassId());
final Player player = m.getPlayer();
if (player != null)
{
- packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect
- packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
+ writeInt(player.getAppearance().isFemale()); // no visible effect
+ writeInt(player.getRace().ordinal()); // writeInt(1);
}
else
{
- packet.writeD(1); // no visible effect
- packet.writeD(1); // packet.writeD(1);
+ writeInt(1); // no visible effect
+ writeInt(1); // writeInt(1);
}
- packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline
- packet.writeD(m.getSponsor() != 0 ? 1 : 0);
- packet.writeC(m.getOnlineStatus());
+ writeInt(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline
+ writeInt(m.getSponsor() != 0);
+ writeByte(m.getOnlineStatus());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
index 154bcc610d..11a8076a81 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeShowMemberListDelete implements IClientOutgoingPacket
+public class PledgeShowMemberListDelete extends ServerPacket
{
private final String _player;
@@ -29,10 +28,9 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet);
- packet.writeS(_player);
- return true;
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(this);
+ writeString(_player);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
index 55415b6d4d..a648a72816 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeShowMemberListDeleteAll implements IClientOutgoingPacket
+public class PledgeShowMemberListDeleteAll extends ServerPacket
{
public static final PledgeShowMemberListDeleteAll STATIC_PACKET = new PledgeShowMemberListDeleteAll();
@@ -28,9 +27,8 @@ public class PledgeShowMemberListDeleteAll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE_ALL.writeId(packet);
- return true;
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE_ALL.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
index 7b8c7c516b..a072db6f1d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -16,26 +16,25 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
+public class PledgeShowMemberListUpdate extends ServerPacket
{
private final int _pledgeType;
- private int _hasSponsor;
+ private boolean _hasSponsor;
private final String _name;
private final int _level;
private final int _classId;
private final int _objectId;
private final int _onlineStatus;
private final int _race;
- private final int _sex;
+ private final boolean _sex;
public PledgeShowMemberListUpdate(Player player)
{
@@ -50,40 +49,39 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_objectId = member.getObjectId();
_pledgeType = member.getPledgeType();
_race = member.getRaceOrdinal();
- _sex = member.getSex() ? 1 : 0;
+ _sex = member.getSex();
_onlineStatus = member.getOnlineStatus();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
- _hasSponsor = member.getSponsor() != 0 ? 1 : 0;
+ _hasSponsor = member.getSponsor() != 0;
}
else
{
- _hasSponsor = 0;
+ _hasSponsor = false;
}
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet);
- packet.writeS(_name);
- packet.writeD(_level);
- packet.writeD(_classId);
- packet.writeD(_sex);
- packet.writeD(_race);
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(this);
+ writeString(_name);
+ writeInt(_level);
+ writeInt(_classId);
+ writeInt(_sex);
+ writeInt(_race);
if (_onlineStatus > 0)
{
- packet.writeD(_objectId);
- packet.writeD(_pledgeType);
+ writeInt(_objectId);
+ writeInt(_pledgeType);
}
else
{
// when going offline send as 0
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
- packet.writeD(_hasSponsor);
- packet.writeC(_onlineStatus);
- return true;
+ writeInt(_hasSponsor);
+ writeByte(_onlineStatus);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
index 09f70ea024..f7e0f48777 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeSkillList implements IClientOutgoingPacket
+public class PledgeSkillList extends ServerPacket
{
private final Collection _skills;
private final List _subSkills;
@@ -53,24 +52,23 @@ public class PledgeSkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet);
- packet.writeD(_skills.size());
- packet.writeD(_subSkills.size()); // Squad skill length
+ ServerPackets.PLEDGE_SKILL_LIST.writeId(this);
+ writeInt(_skills.size());
+ writeInt(_subSkills.size()); // Squad skill length
for (Skill sk : _skills)
{
- packet.writeD(sk.getDisplayId());
- packet.writeH(sk.getDisplayLevel());
- packet.writeH(0); // Sub level
+ writeInt(sk.getDisplayId());
+ writeShort(sk.getDisplayLevel());
+ writeShort(0); // Sub level
}
for (SubPledgeSkill sk : _subSkills)
{
- packet.writeD(sk._subType); // Clan Sub-unit types
- packet.writeD(sk._skillId);
- packet.writeH(sk._skillLevel);
- packet.writeH(0); // Sub level
+ writeInt(sk._subType); // Clan Sub-unit types
+ writeInt(sk._skillId);
+ writeShort(sk._skillLevel);
+ writeShort(0); // Sub level
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
index a94601294f..f27dab88ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeSkillListAdd implements IClientOutgoingPacket
+public class PledgeSkillListAdd extends ServerPacket
{
private final int _id;
private final int _level;
@@ -34,11 +33,10 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet);
- packet.writeD(_id);
- packet.writeD(_level);
- return true;
+ ServerPackets.PLEDGE_SKILL_LIST_ADD.writeId(this);
+ writeInt(_id);
+ writeInt(_level);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
index 5f32f2bf54..db0d4ed43d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeStatusChanged implements IClientOutgoingPacket
+public class PledgeStatusChanged extends ServerPacket
{
private final Clan _clan;
@@ -30,17 +29,16 @@ public class PledgeStatusChanged implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet);
- packet.writeD(0);
- packet.writeD(_clan.getLeaderId());
- packet.writeD(_clan.getId());
- packet.writeD(_clan.getCrestId());
- packet.writeD(_clan.getAllyId());
- packet.writeD(_clan.getAllyCrestId());
- packet.writeD(_clan.getCrestLargeId());
- packet.writeD(0); // pledge type ?
- return true;
+ ServerPackets.PLEDGE_STATUS_CHANGED.writeId(this);
+ writeInt(0);
+ writeInt(_clan.getLeaderId());
+ writeInt(_clan.getId());
+ writeInt(_clan.getCrestId());
+ writeInt(_clan.getAllyId());
+ writeInt(_clan.getAllyCrestId());
+ writeInt(_clan.getCrestLargeId());
+ writeInt(0); // pledge type ?
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
index 41d0f9f7d8..5c10dc2fcd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
@@ -18,10 +18,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @version $Revision: 1.7.2.2.2.3 $ $Date: 2005/03/27 15:29:39 $
@@ -41,23 +40,22 @@ public class PrivateStoreListBuy extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet);
- packet.writeD(_objId);
- packet.writeQ(_playerAdena);
- packet.writeD(0); // Viewer's item count?
- packet.writeD(_items.size());
+ ServerPackets.PRIVATE_STORE_BUY_LIST.writeId(this);
+ writeInt(_objId);
+ writeLong(_playerAdena);
+ writeInt(0); // Viewer's item count?
+ writeInt(_items.size());
int slotNumber = 0;
for (TradeItem item : _items)
{
slotNumber++;
- writeItem(packet, item);
- packet.writeD(slotNumber); // Slot in shop
- packet.writeQ(item.getPrice());
- packet.writeQ(item.getItem().getReferencePrice() * 2);
- packet.writeQ(item.getStoreCount());
+ writeItem(item);
+ writeInt(slotNumber); // Slot in shop
+ writeLong(item.getPrice());
+ writeLong(item.getItem().getReferencePrice() * 2);
+ writeLong(item.getStoreCount());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
index d72050283e..a378895317 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class PrivateStoreListSell extends AbstractItemPacket
{
@@ -34,7 +33,7 @@ public class PrivateStoreListSell extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_seller.isSellingBuffs())
{
@@ -42,19 +41,18 @@ public class PrivateStoreListSell extends AbstractItemPacket
}
else
{
- OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet);
- packet.writeD(_seller.getObjectId());
- packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0);
- packet.writeQ(_player.getAdena());
- packet.writeD(0);
- packet.writeD(_seller.getSellList().getItems().size());
+ ServerPackets.PRIVATE_STORE_LIST.writeId(this);
+ writeInt(_seller.getObjectId());
+ writeInt(_seller.getSellList().isPackaged());
+ writeLong(_player.getAdena());
+ writeInt(0);
+ writeInt(_seller.getSellList().getItems().size());
for (TradeItem item : _seller.getSellList().getItems())
{
- writeItem(packet, item);
- packet.writeQ(item.getPrice());
- packet.writeQ(item.getItem().getReferencePrice() * 2);
+ writeItem(item);
+ writeLong(item.getPrice());
+ writeLong(item.getItem().getReferencePrice() * 2);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
index f5ff1f56db..97e9584f99 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class PrivateStoreManageListBuy extends AbstractItemPacket
{
@@ -42,39 +41,38 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_itemList.size());
- packet.writeD(_itemList.size());
+ writeInt(_itemList.size());
+ writeInt(_itemList.size());
for (Item item : _itemList)
{
- writeItem(packet, item);
- packet.writeQ(item.getTemplate().getReferencePrice() * 2);
+ writeItem(item);
+ writeLong(item.getTemplate().getReferencePrice() * 2);
}
}
else
{
- packet.writeD(_objId);
- packet.writeQ(_playerAdena);
- packet.writeD(0);
+ writeInt(_objId);
+ writeLong(_playerAdena);
+ writeInt(0);
for (Item item : _itemList)
{
- writeItem(packet, item);
- packet.writeQ(item.getTemplate().getReferencePrice() * 2);
+ writeItem(item);
+ writeLong(item.getTemplate().getReferencePrice() * 2);
}
- packet.writeD(0);
+ writeInt(0);
for (TradeItem item2 : _buyList)
{
- writeItem(packet, item2);
- packet.writeQ(item2.getPrice());
- packet.writeQ(item2.getItem().getReferencePrice() * 2);
- packet.writeQ(item2.getCount());
+ writeItem(item2);
+ writeLong(item2.getPrice());
+ writeLong(item2.getItem().getReferencePrice() * 2);
+ writeLong(item2.getCount());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
index 6bbabb282b..b7ecd6e289 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
@@ -18,10 +18,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class PrivateStoreManageListSell extends AbstractItemPacket
{
@@ -44,39 +43,38 @@ public class PrivateStoreManageListSell extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.PRIVATE_STORE_MANAGE_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_itemList.size());
- packet.writeD(_itemList.size());
+ writeInt(_itemList.size());
+ writeInt(_itemList.size());
for (TradeItem item : _itemList)
{
- writeItem(packet, item);
- packet.writeQ(item.getItem().getReferencePrice() * 2);
+ writeItem(item);
+ writeLong(item.getItem().getReferencePrice() * 2);
}
}
else
{
- packet.writeD(_objId);
- packet.writeD(_packageSale ? 1 : 0);
- packet.writeQ(_playerAdena);
- packet.writeD(0);
+ writeInt(_objId);
+ writeInt(_packageSale);
+ writeLong(_playerAdena);
+ writeInt(0);
for (TradeItem item : _itemList)
{
- writeItem(packet, item);
- packet.writeQ(item.getItem().getReferencePrice() * 2);
+ writeItem(item);
+ writeLong(item.getItem().getReferencePrice() * 2);
}
- packet.writeD(0);
+ writeInt(0);
for (TradeItem item2 : _sellList)
{
- writeItem(packet, item2);
- packet.writeQ(item2.getPrice());
- packet.writeQ(item2.getItem().getReferencePrice() * 2);
+ writeItem(item2);
+ writeLong(item2.getPrice());
+ writeLong(item2.getItem().getReferencePrice() * 2);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
index 0d7bcbea16..35bbaadecf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PrivateStoreMsgBuy implements IClientOutgoingPacket
+public class PrivateStoreMsgBuy extends ServerPacket
{
private final int _objId;
private String _storeMsg;
@@ -35,11 +34,10 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet);
- packet.writeD(_objId);
- packet.writeS(_storeMsg);
- return true;
+ ServerPackets.PRIVATE_STORE_BUY_MSG.writeId(this);
+ writeInt(_objId);
+ writeString(_storeMsg);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
index 8fdb5701b8..83ca90fc6c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PrivateStoreMsgSell implements IClientOutgoingPacket
+public class PrivateStoreMsgSell extends ServerPacket
{
private final int _objId;
private String _storeMsg;
@@ -35,11 +34,10 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet);
- packet.writeD(_objId);
- packet.writeS(_storeMsg);
- return true;
+ ServerPackets.PRIVATE_STORE_MSG.writeId(this);
+ writeInt(_objId);
+ writeString(_storeMsg);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java
index 5d84e6471a..ffd6ae9648 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java
@@ -19,33 +19,31 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.time.LocalDateTime;
import java.time.ZoneId;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PvpBookList implements IClientOutgoingPacket
+public class PvpBookList extends ServerPacket
{
public PvpBookList()
{
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PVPBOOK_LIST.writeId(packet);
+ ServerPackets.EX_PVPBOOK_LIST.writeId(this);
final int size = 1;
- packet.writeD(4); // show killer's location count
- packet.writeD(5); // teleport count
- packet.writeD(size); // killer count
+ writeInt(4); // show killer's location count
+ writeInt(5); // teleport count
+ writeInt(size); // killer count
for (int i = 0; i < size; i++)
{
- packet.writeString("killer" + i); // killer name
- packet.writeString("clanKiller" + i); // killer clan name
- packet.writeD(15); // killer level
- packet.writeD(2); // killer race
- packet.writeD(10); // killer class
- packet.writeD((int) LocalDateTime.now().atZone(ZoneId.systemDefault()).toEpochSecond()); // kill time
- packet.writeC(1); // is online
+ writeSizedString("killer" + i); // killer name
+ writeSizedString("clanKiller" + i); // killer clan name
+ writeInt(15); // killer level
+ writeInt(2); // killer race
+ writeInt(10); // killer class
+ writeInt((int) LocalDateTime.now().atZone(ZoneId.systemDefault()).toEpochSecond()); // kill time
+ writeByte(1); // is online
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
index 40728247fd..ae18444935 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
@@ -19,12 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.QuestState;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class QuestList implements IClientOutgoingPacket
+public class QuestList extends ServerPacket
{
private final List _activeQuests;
private final byte[] _oneTimeQuestMask;
@@ -51,16 +50,15 @@ public class QuestList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.QUEST_LIST.writeId(packet);
- packet.writeH(_activeQuests.size());
+ ServerPackets.QUEST_LIST.writeId(this);
+ writeShort(_activeQuests.size());
for (QuestState qs : _activeQuests)
{
- packet.writeD(qs.getQuest().getId());
- packet.writeD(qs.getCondBitSet());
+ writeInt(qs.getQuest().getId());
+ writeInt(qs.getCondBitSet());
}
- packet.writeB(_oneTimeQuestMask);
- return true;
+ writeBytes(_oneTimeQuestMask);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java
index 5ddaa46ba0..679a15e9fd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RadarControl implements IClientOutgoingPacket
+public class RadarControl extends ServerPacket
{
private final int _showRadar;
private final int _type;
@@ -37,14 +36,13 @@ public class RadarControl implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RADAR_CONTROL.writeId(packet);
- packet.writeD(_showRadar);
- packet.writeD(_type); // maybe type
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.RADAR_CONTROL.writeId(this);
+ writeInt(_showRadar);
+ writeInt(_type); // maybe type
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
index 5d67413b6f..ccf642d71a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.RecipeList;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RecipeBookItemList implements IClientOutgoingPacket
+public class RecipeBookItemList extends ServerPacket
{
private Collection _recipes;
private final boolean _isDwarvenCraft;
@@ -40,26 +39,24 @@ public class RecipeBookItemList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet);
- packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common
- packet.writeD(_maxMp);
+ ServerPackets.RECIPE_BOOK_ITEM_LIST.writeId(this);
+ writeInt(!_isDwarvenCraft); // 0 = Dwarven - 1 = Common
+ writeInt(_maxMp);
if (_recipes == null)
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(_recipes.size()); // number of items in recipe book
- int count = 0;
+ writeInt(_recipes.size()); // number of items in recipe book
+ int count = 1;
for (RecipeList recipe : _recipes)
{
- count++;
- packet.writeD(recipe.getId());
- packet.writeD(count);
+ writeInt(recipe.getId());
+ writeInt(count++);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
index 77ca54a47d..6ad367324e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.RecipeData;
import org.l2jmobius.gameserver.model.RecipeList;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RecipeItemMakeInfo implements IClientOutgoingPacket
+public class RecipeItemMakeInfo extends ServerPacket
{
private final int _id;
private final Player _player;
@@ -51,26 +50,26 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final RecipeList recipe = RecipeData.getInstance().getRecipeList(_id);
- if (recipe != null)
+ if (recipe == null)
{
- OutgoingPackets.RECIPE_ITEM_MAKE_INFO.writeId(packet);
- packet.writeD(_id);
- packet.writeD(recipe.isDwarvenRecipe() ? 0 : 1); // 0 = Dwarven - 1 = Common
- packet.writeD((int) _player.getCurrentMp());
- packet.writeD(_player.getMaxMp());
- packet.writeD(_success ? 1 : 0); // item creation none/success/failed
- packet.writeC(0); // Show offering window.
- packet.writeQ(0); // Adena worth of items for maximum offering.
- packet.writeF(Math.min(_craftRate, 100.0));
- packet.writeC(_craftCritical > 0 ? 1 : 0);
- packet.writeF(Math.min(_craftCritical, 100.0));
- packet.writeC(0); // find me
- return true;
+ PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id);
+ return;
}
- PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id);
- return false;
+
+ ServerPackets.RECIPE_ITEM_MAKE_INFO.writeId(this);
+ writeInt(_id);
+ writeInt(!recipe.isDwarvenRecipe()); // 0 = Dwarven - 1 = Common
+ writeInt((int) _player.getCurrentMp());
+ writeInt(_player.getMaxMp());
+ writeInt(_success); // item creation none/success/failed
+ writeByte(0); // Show offering window.
+ writeLong(0); // Adena worth of items for maximum offering.
+ writeDouble(Math.min(_craftRate, 100.0));
+ writeByte(_craftCritical > 0);
+ writeDouble(Math.min(_craftCritical, 100.0));
+ writeByte(0); // find me
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
index 51078e66f7..fdedec7c3f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RecipeShopItemInfo implements IClientOutgoingPacket
+public class RecipeShopItemInfo extends ServerPacket
{
private final Player _player;
private final int _recipeId;
@@ -37,21 +36,20 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_recipeId);
- packet.writeD((int) _player.getCurrentMp());
- packet.writeD(_player.getMaxMp());
- packet.writeD(0xffffffff); // item creation none/success/failed
- packet.writeQ(0); // manufacturePrice
- packet.writeC(0); // Trigger offering window if 1
- packet.writeQ(0); // Adena worth of items for maximum offering.
- packet.writeF(Math.min(_craftRate, 100.0));
- packet.writeC(_craftCritical > 0 ? 1 : 0);
- packet.writeF(Math.min(_craftCritical, 100.0));
- packet.writeC(0); // find me
- return true;
+ ServerPackets.RECIPE_SHOP_ITEM_INFO.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_recipeId);
+ writeInt((int) _player.getCurrentMp());
+ writeInt(_player.getMaxMp());
+ writeInt(0xffffffff); // item creation none/success/failed
+ writeLong(0); // manufacturePrice
+ writeByte(0); // Trigger offering window if 1
+ writeLong(0); // Adena worth of items for maximum offering.
+ writeDouble(Math.min(_craftRate, 100.0));
+ writeByte(_craftCritical > 0);
+ writeDouble(Math.min(_craftCritical, 100.0));
+ writeByte(0); // find me
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
index 38b0b8ea4e..4020886af5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
@@ -19,13 +19,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import java.util.Iterator;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.RecipeList;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RecipeShopManageList implements IClientOutgoingPacket
+public class RecipeShopManageList extends ServerPacket
{
private final Player _seller;
private final boolean _isDwarven;
@@ -59,41 +58,39 @@ public class RecipeShopManageList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet);
- packet.writeD(_seller.getObjectId());
- packet.writeD((int) _seller.getAdena());
- packet.writeD(_isDwarven ? 0 : 1);
+ ServerPackets.RECIPE_SHOP_MANAGE_LIST.writeId(this);
+ writeInt(_seller.getObjectId());
+ writeInt((int) _seller.getAdena());
+ writeInt(!_isDwarven);
if (_recipes == null)
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(_recipes.size()); // number of items in recipe book
- int count = 0;
+ writeInt(_recipes.size()); // number of items in recipe book
+ int count = 1;
for (RecipeList recipe : _recipes)
{
- count++;
- packet.writeD(recipe.getId());
- packet.writeD(count);
+ writeInt(recipe.getId());
+ writeInt(count++);
}
}
if (!_seller.hasManufactureShop())
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(_seller.getManufactureItems().size());
+ writeInt(_seller.getManufactureItems().size());
for (ManufactureItem item : _seller.getManufactureItems().values())
{
- packet.writeD(item.getRecipeId());
- packet.writeD(0);
- packet.writeQ(item.getCost());
+ writeInt(item.getRecipeId());
+ writeInt(0);
+ writeLong(item.getCost());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
index 2b9bc5b6e7..5813c246b3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RecipeShopMsg implements IClientOutgoingPacket
+public class RecipeShopMsg extends ServerPacket
{
private final Player _player;
@@ -30,11 +29,10 @@ public class RecipeShopMsg implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getStoreName());
- return true;
+ ServerPackets.RECIPE_SHOP_MSG.writeId(this);
+ writeInt(_player.getObjectId());
+ writeString(_player.getStoreName());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
index 5511efb237..da087ec304 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RecipeShopSellList implements IClientOutgoingPacket
+public class RecipeShopSellList extends ServerPacket
{
private final Player _buyer;
private final Player _manufacturer;
@@ -38,30 +37,29 @@ public class RecipeShopSellList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet);
- packet.writeD(_manufacturer.getObjectId());
- packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP
- packet.writeD(_manufacturer.getMaxMp()); // Creator's MP
- packet.writeQ(_buyer.getAdena()); // Buyer Adena
+ ServerPackets.RECIPE_SHOP_SELL_LIST.writeId(this);
+ writeInt(_manufacturer.getObjectId());
+ writeInt((int) _manufacturer.getCurrentMp()); // Creator's MP
+ writeInt(_manufacturer.getMaxMp()); // Creator's MP
+ writeLong(_buyer.getAdena()); // Buyer Adena
if (!_manufacturer.hasManufactureShop())
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(_manufacturer.getManufactureItems().size());
- for (ManufactureItem temp : _manufacturer.getManufactureItems().values())
+ writeInt(_manufacturer.getManufactureItems().size());
+ for (ManufactureItem item : _manufacturer.getManufactureItems().values())
{
- packet.writeD(temp.getRecipeId());
- packet.writeD(0); // CanCreate?
- packet.writeQ(temp.getCost());
- packet.writeF(Math.min(_craftRate, 100.0));
- packet.writeC(_craftCritical > 0 ? 1 : 0);
- packet.writeF(Math.min(_craftCritical, 100.0));
+ writeInt(item.getRecipeId());
+ writeInt(0); // CanCreate?
+ writeLong(item.getCost());
+ writeDouble(Math.min(_craftRate, 100.0));
+ writeByte(_craftCritical > 0);
+ writeDouble(Math.min(_craftCritical, 100.0));
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
index cfcc530b59..facc54c705 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
@@ -19,14 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Playable;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Luca Baldi
*/
-public class RelationChanged implements IClientOutgoingPacket
+public class RelationChanged extends ServerPacket
{
public static final int RELATION_PARTY1 = 1; // party member
public static final int RELATION_PARTY2 = 2; // party member
@@ -54,7 +53,7 @@ public class RelationChanged implements IClientOutgoingPacket
{
int _objId;
long _relation;
- int _autoAttackable;
+ boolean _autoAttackable;
int _reputation;
int _pvpFlag;
}
@@ -69,7 +68,7 @@ public class RelationChanged implements IClientOutgoingPacket
_singled = new Relation();
_singled._objId = activeChar.getObjectId();
_singled._relation = relation;
- _singled._autoAttackable = autoattackable ? 1 : 0;
+ _singled._autoAttackable = autoattackable;
_singled._reputation = activeChar.getReputation();
_singled._pvpFlag = activeChar.getPvpFlag();
_multi = null;
@@ -90,41 +89,40 @@ public class RelationChanged implements IClientOutgoingPacket
final Relation r = new Relation();
r._objId = activeChar.getObjectId();
r._relation = relation;
- r._autoAttackable = autoattackable ? 1 : 0;
+ r._autoAttackable = autoattackable;
r._reputation = activeChar.getReputation();
r._pvpFlag = activeChar.getPvpFlag();
_multi.add(r);
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RELATION_CHANGED.writeId(packet);
- packet.writeC(_mask);
+ ServerPackets.RELATION_CHANGED.writeId(this);
+ writeByte(_mask);
if (_multi == null)
{
- writeRelation(packet, _singled);
+ writeRelation(_singled);
}
else
{
- packet.writeH(_multi.size());
+ writeShort(_multi.size());
for (Relation r : _multi)
{
- writeRelation(packet, r);
+ writeRelation(r);
}
}
- return true;
}
- private void writeRelation(PacketWriter packet, Relation relation)
+ private void writeRelation(Relation relation)
{
- packet.writeD(relation._objId);
+ writeInt(relation._objId);
if ((_mask & SEND_DEFAULT) != SEND_DEFAULT)
{
- packet.writeQ(relation._relation);
- packet.writeC(relation._autoAttackable);
- packet.writeD(relation._reputation);
- packet.writeC(relation._pvpFlag);
+ writeLong(relation._relation);
+ writeByte(relation._autoAttackable);
+ writeInt(relation._reputation);
+ writeByte(relation._pvpFlag);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
index 4477cfb705..40c01fe832 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author nBd
*/
-public class RequestEnchant implements IClientOutgoingPacket
+public class RequestEnchant extends ServerPacket
{
private final int _result;
@@ -32,10 +31,9 @@ public class RequestEnchant implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
index 784d942b27..cc83dce4fb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class RestartResponse implements IClientOutgoingPacket
+public class RestartResponse extends ServerPacket
{
public static final RestartResponse TRUE = new RestartResponse(true);
public static final RestartResponse FALSE = new RestartResponse(false);
@@ -32,10 +31,9 @@ public class RestartResponse implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RESTART_RESPONSE.writeId(packet);
- packet.writeD(_result ? 1 : 0);
- return true;
+ ServerPackets.RESTART_RESPONSE.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
index 7a0a6cbe58..24b97e4d67 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class Revive implements IClientOutgoingPacket
+public class Revive extends ServerPacket
{
private final int _objectId;
@@ -30,10 +29,9 @@ public class Revive implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.REVIVE.writeId(packet);
- packet.writeD(_objectId);
- return true;
+ ServerPackets.REVIVE.writeId(this);
+ writeInt(_objectId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java
index b9ddf7733f..c5a8ddd759 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class Ride implements IClientOutgoingPacket
+public class Ride extends ServerPacket
{
private final int _objectId;
- private final int _mounted;
+ private final boolean _mounted;
private final int _rideType;
private final int _rideNpcId;
private final Location _loc;
@@ -32,23 +31,22 @@ public class Ride implements IClientOutgoingPacket
public Ride(Player player)
{
_objectId = player.getObjectId();
- _mounted = player.isMounted() ? 1 : 0;
+ _mounted = player.isMounted();
_rideType = player.getMountType().ordinal();
_rideNpcId = player.getMountNpcId() + 1000000;
_loc = player.getLocation();
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RIDE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_mounted);
- packet.writeD(_rideType);
- packet.writeD(_rideNpcId);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- return true;
+ ServerPackets.RIDE.writeId(this);
+ writeInt(_objectId);
+ writeByte(_mounted);
+ writeInt(_rideType);
+ writeInt(_rideNpcId);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
index ba507d82d3..fe440c99c4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
@@ -20,14 +20,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.CropProcure;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SellListProcure implements IClientOutgoingPacket
+public class SellListProcure extends ServerPacket
{
private final long _money;
private final Map _sellList = new HashMap<>();
@@ -46,23 +45,22 @@ public class SellListProcure implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SELL_LIST_PROCURE.writeId(packet);
- packet.writeQ(_money); // money
- packet.writeD(0); // lease ?
- packet.writeH(_sellList.size()); // list size
+ ServerPackets.SELL_LIST_PROCURE.writeId(this);
+ writeLong(_money); // money
+ writeInt(0); // lease ?
+ writeShort(_sellList.size()); // list size
for (Entry entry : _sellList.entrySet())
{
final Item item = entry.getKey();
- packet.writeH(item.getTemplate().getType1());
- packet.writeD(item.getObjectId());
- packet.writeD(item.getDisplayId());
- packet.writeQ(entry.getValue()); // count
- packet.writeH(item.getTemplate().getType2());
- packet.writeH(0); // unknown
- packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials
+ writeShort(item.getTemplate().getType1());
+ writeInt(item.getObjectId());
+ writeInt(item.getDisplayId());
+ writeLong(entry.getValue()); // count
+ writeShort(item.getTemplate().getType2());
+ writeShort(0); // unknown
+ writeLong(0); // price, you shouldnt get any adena for crops, only raw materials
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
index 75b5b07854..0331c7bb5f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.MacroUpdateType;
import org.l2jmobius.gameserver.model.Macro;
import org.l2jmobius.gameserver.model.MacroCmd;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SendMacroList implements IClientOutgoingPacket
+public class SendMacroList extends ServerPacket
{
private final int _count;
private final Macro _macro;
@@ -36,31 +35,30 @@ public class SendMacroList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MACRO_LIST.writeId(packet);
- packet.writeC(_updateType.getId());
- packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id
- packet.writeC(_count); // count of Macros
- packet.writeC(_macro != null ? 1 : 0); // unknown
+ ServerPackets.MACRO_LIST.writeId(this);
+ writeByte(_updateType.getId());
+ writeInt(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id
+ writeByte(_count); // count of Macros
+ writeByte(_macro != null); // unknown
if ((_macro != null) && (_updateType != MacroUpdateType.DELETE))
{
- packet.writeD(_macro.getId()); // Macro ID
- packet.writeS(_macro.getName()); // Macro Name
- packet.writeS(_macro.getDescr()); // Desc
- packet.writeS(_macro.getAcronym()); // acronym
- packet.writeD(_macro.getIcon()); // icon
- packet.writeC(_macro.getCommands().size()); // count
+ writeInt(_macro.getId()); // Macro ID
+ writeString(_macro.getName()); // Macro Name
+ writeString(_macro.getDescr()); // Desc
+ writeString(_macro.getAcronym()); // acronym
+ writeInt(_macro.getIcon()); // icon
+ writeByte(_macro.getCommands().size()); // count
int i = 1;
for (MacroCmd cmd : _macro.getCommands())
{
- packet.writeC(i++); // command count
- packet.writeC(cmd.getType().ordinal()); // type 1 = skill, 3 = action, 4 = shortcut
- packet.writeD(cmd.getD1()); // skill id
- packet.writeC(cmd.getD2()); // shortcut id
- packet.writeS(cmd.getCmd()); // command name
+ writeByte(i++); // command count
+ writeByte(cmd.getType().ordinal()); // type 1 = skill, 3 = action, 4 = shortcut
+ writeInt(cmd.getD1()); // skill id
+ writeByte(cmd.getD2()); // shortcut id
+ writeString(cmd.getCmd()); // command name
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
index 21622b5f19..e676bfec70 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SendTradeRequest implements IClientOutgoingPacket
+public class SendTradeRequest extends ServerPacket
{
private final int _senderId;
@@ -29,10 +28,9 @@ public class SendTradeRequest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_REQUEST.writeId(packet);
- packet.writeD(_senderId);
- return true;
+ ServerPackets.TRADE_REQUEST.writeId(this);
+ writeInt(_senderId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java
index 89826ca11f..fe04a4eecf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author devScarlet, mrTJO
*/
-public class ServerClose implements IClientOutgoingPacket
+public class ServerClose extends ServerPacket
{
public static final ServerClose STATIC_PACKET = new ServerClose();
@@ -31,9 +30,8 @@ public class ServerClose implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SEVER_CLOSE.writeId(packet);
- return true;
+ ServerPackets.SEVER_CLOSE.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
index 1513a0e3d1..1bd4eecbb2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author devScarlet, mrTJO
*/
-public class ServerObjectInfo implements IClientOutgoingPacket
+public class ServerObjectInfo extends ServerPacket
{
private final Npc _activeChar;
private final int _x;
@@ -52,25 +51,24 @@ public class ServerObjectInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet);
- packet.writeD(_activeChar.getObjectId());
- packet.writeD(_displayId + 1000000);
- packet.writeS(_name); // name
- packet.writeD(_isAttackable ? 1 : 0);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- packet.writeF(1.0); // movement multiplier
- packet.writeF(1.0); // attack speed multiplier
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0));
- packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0);
- packet.writeD(1); // object type
- packet.writeD(0); // special effects
- return true;
+ ServerPackets.SERVER_OBJECT_INFO.writeId(this);
+ writeInt(_activeChar.getObjectId());
+ writeInt(_displayId + 1000000);
+ writeString(_name); // name
+ writeInt(_isAttackable);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
+ writeDouble(1.0); // movement multiplier
+ writeDouble(1.0); // attack speed multiplier
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt((int) (_isAttackable ? _activeChar.getCurrentHp() : 0));
+ writeInt(_isAttackable ? _activeChar.getMaxHp() : 0);
+ writeInt(1); // object type
+ writeInt(0); // special effects
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
similarity index 75%
rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
index f2a9cf1822..9280f924bc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
/**
- * @author KenM
+ * @author Mobius
*/
-public interface IClientOutgoingPacket extends IOutgoingPacket
+public abstract class ServerPacket extends WritablePacket
{
- int[] PAPERDOLL_ORDER = new int[]
+ protected static final int[] PAPERDOLL_ORDER =
{
Inventory.PAPERDOLL_UNDER,
Inventory.PAPERDOLL_REAR,
@@ -89,13 +88,13 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
Inventory.PAPERDOLL_ARTIFACT20,
Inventory.PAPERDOLL_ARTIFACT21,
};
- int[] PAPERDOLL_ORDER_AUGMENT = new int[]
+ protected static final int[] PAPERDOLL_ORDER_AUGMENT =
{
Inventory.PAPERDOLL_RHAND,
Inventory.PAPERDOLL_LHAND,
Inventory.PAPERDOLL_RHAND
};
- int[] PAPERDOLL_ORDER_VISUAL_ID = new int[]
+ protected static final int[] PAPERDOLL_ORDER_VISUAL_ID =
{
Inventory.PAPERDOLL_RHAND,
Inventory.PAPERDOLL_LHAND,
@@ -108,35 +107,56 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
Inventory.PAPERDOLL_HAIR2
};
- default int[] getPaperdollOrder()
+ protected int[] getPaperdollOrder()
{
return PAPERDOLL_ORDER;
}
- default int[] getPaperdollOrderAugument()
+ protected int[] getPaperdollOrderAugument()
{
return PAPERDOLL_ORDER_AUGMENT;
}
- default int[] getPaperdollOrderVisualId()
+ protected int[] getPaperdollOrderVisualId()
{
return PAPERDOLL_ORDER_VISUAL_ID;
}
- default void runImpl(Player player)
+ /**
+ * Construct a ServerPacket with an initial data size of 32 bytes.
+ */
+ protected ServerPacket()
+ {
+ super(32);
+ }
+
+ /**
+ * Construct a ServerPacket with a given initial data size.
+ * @param initialSize
+ */
+ protected ServerPacket(int initialSize)
+ {
+ super(initialSize);
+ }
+
+ /**
+ * Method that runs after packet is sent.
+ * @param player
+ */
+ public void run(Player player)
{
}
- default void writeOptionalD(PacketWriter packet, int value)
+ protected void writeOptionalInt(int value)
{
if (value >= Short.MAX_VALUE)
{
- packet.writeH(Short.MAX_VALUE);
- packet.writeD(value);
+ writeShort(Short.MAX_VALUE);
+ writeInt(value);
}
else
{
- packet.writeH(value);
+ writeShort(value);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
index 0164e5c4a2..a89f88c45a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SetSummonRemainTime implements IClientOutgoingPacket
+public class SetSummonRemainTime extends ServerPacket
{
private final int _maxTime;
private final int _remainingTime;
@@ -31,11 +30,10 @@ public class SetSummonRemainTime implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet);
- packet.writeD(_maxTime);
- packet.writeD(_remainingTime);
- return true;
+ ServerPackets.SET_SUMMON_REMAIN_TIME.writeId(this);
+ writeInt(_maxTime);
+ writeInt(_remainingTime);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
index 2d26f437ed..2c1fa1dcec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SetupGauge implements IClientOutgoingPacket
+public class SetupGauge extends ServerPacket
{
public static final int BLUE = 0;
public static final int RED = 1;
@@ -47,13 +46,12 @@ public class SetupGauge implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SETUP_GAUGE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_dat1);
- packet.writeD(_time);
- packet.writeD(_time2);
- return true;
+ ServerPackets.SETUP_GAUGE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_dat1);
+ writeInt(_time);
+ writeInt(_time2);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
index 016f5a0c9a..63dfee6ddb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
** @author Gnacik
*/
-public class ShopPreviewInfo implements IClientOutgoingPacket
+public class ShopPreviewInfo extends ServerPacket
{
private final Map _itemlist;
@@ -35,31 +34,30 @@ public class ShopPreviewInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet);
- packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS);
+ ServerPackets.SHOP_PREVIEW_INFO.writeId(this);
+ writeInt(Inventory.PAPERDOLL_TOTALSLOTS);
// Slots
- packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER));
- packet.writeD(getFromList(Inventory.PAPERDOLL_REAR));
- packet.writeD(getFromList(Inventory.PAPERDOLL_LEAR));
- packet.writeD(getFromList(Inventory.PAPERDOLL_NECK));
- packet.writeD(getFromList(Inventory.PAPERDOLL_RFINGER));
- packet.writeD(getFromList(Inventory.PAPERDOLL_LFINGER));
- packet.writeD(getFromList(Inventory.PAPERDOLL_HEAD));
- packet.writeD(getFromList(Inventory.PAPERDOLL_RHAND));
- packet.writeD(getFromList(Inventory.PAPERDOLL_LHAND));
- packet.writeD(getFromList(Inventory.PAPERDOLL_GLOVES));
- packet.writeD(getFromList(Inventory.PAPERDOLL_CHEST));
- packet.writeD(getFromList(Inventory.PAPERDOLL_LEGS));
- packet.writeD(getFromList(Inventory.PAPERDOLL_FEET));
- packet.writeD(getFromList(Inventory.PAPERDOLL_CLOAK));
- packet.writeD(getFromList(Inventory.PAPERDOLL_RHAND));
- packet.writeD(getFromList(Inventory.PAPERDOLL_HAIR));
- packet.writeD(getFromList(Inventory.PAPERDOLL_HAIR2));
- packet.writeD(getFromList(Inventory.PAPERDOLL_RBRACELET));
- packet.writeD(getFromList(Inventory.PAPERDOLL_LBRACELET));
- return true;
+ writeInt(getFromList(Inventory.PAPERDOLL_UNDER));
+ writeInt(getFromList(Inventory.PAPERDOLL_REAR));
+ writeInt(getFromList(Inventory.PAPERDOLL_LEAR));
+ writeInt(getFromList(Inventory.PAPERDOLL_NECK));
+ writeInt(getFromList(Inventory.PAPERDOLL_RFINGER));
+ writeInt(getFromList(Inventory.PAPERDOLL_LFINGER));
+ writeInt(getFromList(Inventory.PAPERDOLL_HEAD));
+ writeInt(getFromList(Inventory.PAPERDOLL_RHAND));
+ writeInt(getFromList(Inventory.PAPERDOLL_LHAND));
+ writeInt(getFromList(Inventory.PAPERDOLL_GLOVES));
+ writeInt(getFromList(Inventory.PAPERDOLL_CHEST));
+ writeInt(getFromList(Inventory.PAPERDOLL_LEGS));
+ writeInt(getFromList(Inventory.PAPERDOLL_FEET));
+ writeInt(getFromList(Inventory.PAPERDOLL_CLOAK));
+ writeInt(getFromList(Inventory.PAPERDOLL_RHAND));
+ writeInt(getFromList(Inventory.PAPERDOLL_HAIR));
+ writeInt(getFromList(Inventory.PAPERDOLL_HAIR2));
+ writeInt(getFromList(Inventory.PAPERDOLL_RBRACELET));
+ writeInt(getFromList(Inventory.PAPERDOLL_LBRACELET));
}
private int getFromList(int key)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
index 3e7efda220..9b94abb89b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
@@ -19,13 +19,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.buylist.Product;
import org.l2jmobius.gameserver.model.buylist.ProductList;
import org.l2jmobius.gameserver.model.item.ItemTemplate;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShopPreviewList implements IClientOutgoingPacket
+public class ShopPreviewList extends ServerPacket
{
private final int _listId;
private final Collection _list;
@@ -46,12 +45,12 @@ public class ShopPreviewList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet);
- packet.writeD(5056);
- packet.writeQ(_money); // current money
- packet.writeD(_listId);
+ ServerPackets.SHOP_PREVIEW_LIST.writeId(this);
+ writeInt(5056);
+ writeLong(_money); // current money
+ writeInt(_listId);
int newlength = 0;
for (Product product : _list)
{
@@ -60,24 +59,23 @@ public class ShopPreviewList implements IClientOutgoingPacket
newlength++;
}
}
- packet.writeH(newlength);
+ writeShort(newlength);
for (Product product : _list)
{
if (product.getItem().isEquipable())
{
- packet.writeD(product.getItemId());
- packet.writeH(product.getItem().getType2()); // item type2
+ writeInt(product.getItemId());
+ writeShort(product.getItem().getType2()); // item type2
if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA)
{
- packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
+ writeLong(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
}
else
{
- packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
+ writeLong(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
}
- packet.writeQ(Config.WEAR_PRICE);
+ writeLong(Config.WEAR_PRICE);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
index b13080ff28..b042796706 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShortBuffStatusUpdate implements IClientOutgoingPacket
+public class ShortBuffStatusUpdate extends ServerPacket
{
public static final ShortBuffStatusUpdate RESET_SHORT_BUFF = new ShortBuffStatusUpdate(0, 0, 0, 0);
@@ -37,13 +36,12 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet);
- packet.writeD(_skillId);
- packet.writeH(_skillLevel);
- packet.writeH(_skillSubLevel);
- packet.writeD(_duration);
- return true;
+ ServerPackets.SHORT_BUFF_STATUS_UPDATE.writeId(this);
+ writeInt(_skillId);
+ writeShort(_skillLevel);
+ writeShort(_skillSubLevel);
+ writeInt(_duration);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index be5e1fadab..05aaedf2c5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -18,12 +18,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShortCutInit implements IClientOutgoingPacket
+public class ShortCutInit extends ServerPacket
{
private Collection _shortCuts;
@@ -37,36 +36,36 @@ public class ShortCutInit implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHORT_CUT_INIT.writeId(packet);
- packet.writeD(_shortCuts.size());
+ ServerPackets.SHORT_CUT_INIT.writeId(this);
+ writeInt(_shortCuts.size());
for (Shortcut sc : _shortCuts)
{
- packet.writeD(sc.getType().ordinal());
- packet.writeD(sc.getSlot() + (sc.getPage() * 12));
- packet.writeC(0); // 228
+ writeInt(sc.getType().ordinal());
+ writeInt(sc.getSlot() + (sc.getPage() * 12));
+ writeByte(0); // 228
switch (sc.getType())
{
case ITEM:
{
- packet.writeD(sc.getId());
- packet.writeD(1); // Enabled or not
- packet.writeD(sc.getSharedReuseGroup());
- packet.writeD(0);
- packet.writeD(0);
- packet.writeQ(0); // Augment id
- packet.writeD(0); // Visual id
+ writeInt(sc.getId());
+ writeInt(1); // Enabled or not
+ writeInt(sc.getSharedReuseGroup());
+ writeInt(0);
+ writeInt(0);
+ writeLong(0); // Augment id
+ writeInt(0); // Visual id
break;
}
case SKILL:
{
- packet.writeD(sc.getId());
- packet.writeH(sc.getLevel());
- packet.writeH(sc.getSubLevel());
- packet.writeD(sc.getSharedReuseGroup());
- packet.writeC(0); // C5
- packet.writeD(1); // C6
+ writeInt(sc.getId());
+ writeShort(sc.getLevel());
+ writeShort(sc.getSubLevel());
+ writeInt(sc.getSharedReuseGroup());
+ writeByte(0); // C5
+ writeInt(1); // C6
break;
}
case ACTION:
@@ -74,11 +73,10 @@ public class ShortCutInit implements IClientOutgoingPacket
case RECIPE:
case BOOKMARK:
{
- packet.writeD(sc.getId());
- packet.writeD(1); // C6
+ writeInt(sc.getId());
+ writeInt(1); // C6
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index f85ada83c7..9c1fbbcab8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Shortcut;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShortCutRegister implements IClientOutgoingPacket
+public class ShortCutRegister extends ServerPacket
{
private final Shortcut _shortcut;
@@ -34,35 +33,35 @@ public class ShortCutRegister implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet);
- packet.writeD(_shortcut.getType().ordinal());
- packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client
- packet.writeC(0); // 228
+ ServerPackets.SHORT_CUT_REGISTER.writeId(this);
+ writeInt(_shortcut.getType().ordinal());
+ writeInt(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client
+ writeByte(0); // 228
switch (_shortcut.getType())
{
case ITEM:
{
- packet.writeD(_shortcut.getId());
- packet.writeD(_shortcut.getCharacterType());
- packet.writeD(_shortcut.getSharedReuseGroup());
- packet.writeD(0); // unknown
- packet.writeD(0); // unknown
- packet.writeD(0); // item augment id
- packet.writeD(0); // TODO: Find me, item visual id ?
+ writeInt(_shortcut.getId());
+ writeInt(_shortcut.getCharacterType());
+ writeInt(_shortcut.getSharedReuseGroup());
+ writeInt(0); // unknown
+ writeInt(0); // unknown
+ writeInt(0); // item augment id
+ writeInt(0); // TODO: Find me, item visual id ?
break;
}
case SKILL:
{
- packet.writeD(_shortcut.getId());
- packet.writeH(_shortcut.getLevel());
- packet.writeH(_shortcut.getSubLevel());
- packet.writeD(_shortcut.getSharedReuseGroup());
- packet.writeC(0); // C5
- packet.writeD(_shortcut.getCharacterType());
- packet.writeD(0); // TODO: Find me
- packet.writeD(0); // TODO: Find me
+ writeInt(_shortcut.getId());
+ writeShort(_shortcut.getLevel());
+ writeShort(_shortcut.getSubLevel());
+ writeInt(_shortcut.getSharedReuseGroup());
+ writeByte(0); // C5
+ writeInt(_shortcut.getCharacterType());
+ writeInt(0); // TODO: Find me
+ writeInt(0); // TODO: Find me
break;
}
case ACTION:
@@ -70,11 +69,10 @@ public class ShortCutRegister implements IClientOutgoingPacket
case RECIPE:
case BOOKMARK:
{
- packet.writeD(_shortcut.getId());
- packet.writeD(_shortcut.getCharacterType());
+ writeInt(_shortcut.getId());
+ writeInt(_shortcut.getCharacterType());
break;
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
index cfae3b3fad..63ca0204f3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
@@ -18,10 +18,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShowBoard implements IClientOutgoingPacket
+public class ShowBoard extends ServerPacket
{
private final String _content;
private int _showBoard = 1; // 1 show, 0 hide
@@ -51,19 +50,18 @@ public class ShowBoard implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_BOARD.writeId(packet);
- packet.writeC(_showBoard); // c4 1 to show community 00 to hide
- packet.writeS("bypass _bbshome"); // top
- packet.writeS("bypass _bbsgetfav"); // favorite
- packet.writeS("bypass _bbsloc"); // region
- packet.writeS("bypass _bbsclan"); // clan
- packet.writeS("bypass _bbsmemo"); // memo
- packet.writeS("bypass _bbsmail"); // mail
- packet.writeS("bypass _bbsfriends"); // friends
- packet.writeS("bypass bbs_add_fav"); // add fav.
- packet.writeS(_content);
- return true;
+ ServerPackets.SHOW_BOARD.writeId(this);
+ writeByte(_showBoard); // c4 1 to show community 00 to hide
+ writeString("bypass _bbshome"); // top
+ writeString("bypass _bbsgetfav"); // favorite
+ writeString("bypass _bbsloc"); // region
+ writeString("bypass _bbsclan"); // clan
+ writeString("bypass _bbsmemo"); // memo
+ writeString("bypass _bbsmail"); // mail
+ writeString("bypass _bbsfriends"); // friends
+ writeString("bypass bbs_add_fav"); // add fav.
+ writeString(_content);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
index 4d62e99d7a..ebe4880e02 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShowCalculator implements IClientOutgoingPacket
+public class ShowCalculator extends ServerPacket
{
private final int _calculatorId;
@@ -29,10 +28,9 @@ public class ShowCalculator implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_CALC.writeId(packet);
- packet.writeD(_calculatorId);
- return true;
+ ServerPackets.SHOW_CALC.writeId(this);
+ writeInt(_calculatorId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
index 4574762467..e30231b47e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShowMiniMap implements IClientOutgoingPacket
+public class ShowMiniMap extends ServerPacket
{
private final int _mapId;
@@ -29,11 +28,10 @@ public class ShowMiniMap implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_MINIMAP.writeId(packet);
- packet.writeD(_mapId);
- packet.writeC(0); // Seven Signs state
- return true;
+ ServerPackets.SHOW_MINIMAP.writeId(this);
+ writeInt(_mapId);
+ writeByte(0); // Seven Signs state
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
index 97100d09d2..9f9e3832fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket
+public class ShowPCCafeCouponShowUI extends ServerPacket
{
public static final ShowPCCafeCouponShowUI STATIC_PACKET = new ShowPCCafeCouponShowUI();
@@ -31,9 +30,8 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet);
- return true;
+ ServerPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
index 60752a64ca..73d09b2e46 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShowTownMap implements IClientOutgoingPacket
+public class ShowTownMap extends ServerPacket
{
private final String _texture;
private final int _x;
@@ -33,12 +32,11 @@ public class ShowTownMap implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_TOWN_MAP.writeId(packet);
- packet.writeS(_texture);
- packet.writeD(_x);
- packet.writeD(_y);
- return true;
+ ServerPackets.SHOW_TOWN_MAP.writeId(this);
+ writeString(_texture);
+ writeInt(_x);
+ writeInt(_y);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
index 0a0f3ae861..79fdbe0ba5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author devScarlet, mrTJO
*/
-public class ShowXMasSeal implements IClientOutgoingPacket
+public class ShowXMasSeal extends ServerPacket
{
private final int _item;
@@ -32,10 +31,9 @@ public class ShowXMasSeal implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet);
- packet.writeD(_item);
- return true;
+ ServerPackets.SHOW_XMAS_SEAL.writeId(this);
+ writeInt(_item);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
index 1baa030c4d..808ab39a85 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Populates the Siege Attacker List in the SiegeInfo Window
@@ -45,7 +44,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
* d = AllyCrestID
* @author KenM
*/
-public class SiegeAttackerList implements IClientOutgoingPacket
+public class SiegeAttackerList extends ServerPacket
{
private final Castle _castle;
@@ -55,19 +54,19 @@ public class SiegeAttackerList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet);
- packet.writeD(_castle.getResidenceId());
- packet.writeD(0); // 0
- packet.writeD(1); // 1
- packet.writeD(0); // 0
+ ServerPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(this);
+ writeInt(_castle.getResidenceId());
+ writeInt(0); // 0
+ writeInt(1); // 1
+ writeInt(0); // 0
final int size = _castle.getSiege().getAttackerClans().size();
if (size > 0)
{
Clan clan;
- packet.writeD(size);
- packet.writeD(size);
+ writeInt(size);
+ writeInt(size);
for (SiegeClan siegeclan : _castle.getSiege().getAttackerClans())
{
clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
@@ -75,22 +74,21 @@ public class SiegeAttackerList implements IClientOutgoingPacket
{
continue;
}
- packet.writeD(clan.getId());
- packet.writeS(clan.getName());
- packet.writeS(clan.getLeaderName());
- packet.writeD(clan.getCrestId());
- packet.writeD(0); // signed time (seconds) (not storated by L2J)
- packet.writeD(clan.getAllyId());
- packet.writeS(clan.getAllyName());
- packet.writeS(""); // AllyLeaderName
- packet.writeD(clan.getAllyCrestId());
+ writeInt(clan.getId());
+ writeString(clan.getName());
+ writeString(clan.getLeaderName());
+ writeInt(clan.getCrestId());
+ writeInt(0); // signed time (seconds) (not storated by L2J)
+ writeInt(clan.getAllyId());
+ writeString(clan.getAllyName());
+ writeString(""); // AllyLeaderName
+ writeInt(clan.getAllyCrestId());
}
}
else
{
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 8afd1f38ce..678f0f29e1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.SiegeClanType;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Populates the Siege Defender List in the SiegeInfo Window
@@ -47,7 +46,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
* d = AllyCrestID
* @author KenM
*/
-public class SiegeDefenderList implements IClientOutgoingPacket
+public class SiegeDefenderList extends ServerPacket
{
private final Castle _castle;
@@ -57,30 +56,30 @@ public class SiegeDefenderList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet);
- packet.writeD(_castle.getResidenceId());
- packet.writeD(0); // Unknown
- packet.writeD(1); // Unknown
- packet.writeD(0); // Unknown
+ ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
+ writeInt(_castle.getResidenceId());
+ writeInt(0); // Unknown
+ writeInt(1); // Unknown
+ writeInt(0); // Unknown
final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
- packet.writeD(size);
- packet.writeD(size);
+ writeInt(size);
+ writeInt(size);
// Add owners
final Clan ownerClan = _castle.getOwner();
if (ownerClan != null)
{
- packet.writeD(ownerClan.getId());
- packet.writeS(ownerClan.getName());
- packet.writeS(ownerClan.getLeaderName());
- packet.writeD(ownerClan.getCrestId());
- packet.writeD(0); // signed time (seconds) (not storated by L2J)
- packet.writeD(SiegeClanType.OWNER.ordinal());
- packet.writeD(ownerClan.getAllyId());
- packet.writeS(ownerClan.getAllyName());
- packet.writeS(""); // AllyLeaderName
- packet.writeD(ownerClan.getAllyCrestId());
+ writeInt(ownerClan.getId());
+ writeString(ownerClan.getName());
+ writeString(ownerClan.getLeaderName());
+ writeInt(ownerClan.getCrestId());
+ writeInt(0); // signed time (seconds) (not storated by L2J)
+ writeInt(SiegeClanType.OWNER.ordinal());
+ writeInt(ownerClan.getAllyId());
+ writeString(ownerClan.getAllyName());
+ writeString(""); // AllyLeaderName
+ writeInt(ownerClan.getAllyCrestId());
}
// List of confirmed defenders
for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
@@ -90,16 +89,16 @@ public class SiegeDefenderList implements IClientOutgoingPacket
{
continue;
}
- packet.writeD(defendingClan.getId());
- packet.writeS(defendingClan.getName());
- packet.writeS(defendingClan.getLeaderName());
- packet.writeD(defendingClan.getCrestId());
- packet.writeD(0); // signed time (seconds) (not storated by L2J)
- packet.writeD(SiegeClanType.DEFENDER.ordinal());
- packet.writeD(defendingClan.getAllyId());
- packet.writeS(defendingClan.getAllyName());
- packet.writeS(""); // AllyLeaderName
- packet.writeD(defendingClan.getAllyCrestId());
+ writeInt(defendingClan.getId());
+ writeString(defendingClan.getName());
+ writeString(defendingClan.getLeaderName());
+ writeInt(defendingClan.getCrestId());
+ writeInt(0); // signed time (seconds) (not storated by L2J)
+ writeInt(SiegeClanType.DEFENDER.ordinal());
+ writeInt(defendingClan.getAllyId());
+ writeString(defendingClan.getAllyName());
+ writeString(""); // AllyLeaderName
+ writeInt(defendingClan.getAllyCrestId());
}
// List of not confirmed defenders
for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
@@ -109,17 +108,16 @@ public class SiegeDefenderList implements IClientOutgoingPacket
{
continue;
}
- packet.writeD(defendingClan.getId());
- packet.writeS(defendingClan.getName());
- packet.writeS(defendingClan.getLeaderName());
- packet.writeD(defendingClan.getCrestId());
- packet.writeD(0); // signed time (seconds) (not storated by L2J)
- packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal());
- packet.writeD(defendingClan.getAllyId());
- packet.writeS(defendingClan.getAllyName());
- packet.writeS(""); // AllyLeaderName
- packet.writeD(defendingClan.getAllyCrestId());
+ writeInt(defendingClan.getId());
+ writeString(defendingClan.getName());
+ writeString(defendingClan.getLeaderName());
+ writeInt(defendingClan.getCrestId());
+ writeInt(0); // signed time (seconds) (not storated by L2J)
+ writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
+ writeInt(defendingClan.getAllyId());
+ writeString(defendingClan.getAllyName());
+ writeString(""); // AllyLeaderName
+ writeInt(defendingClan.getAllyCrestId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
index a16aa90e84..78fd43dcd2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
@@ -19,12 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Calendar;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
@@ -43,7 +42,7 @@ import org.l2jmobius.gameserver.network.PacketLogger;
* d = (UNKNOW) Siege Time Select Related?
* @author KenM
*/
-public class SiegeInfo implements IClientOutgoingPacket
+public class SiegeInfo extends ServerPacket
{
private final Castle _castle;
private final Player _player;
@@ -55,24 +54,24 @@ public class SiegeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet);
+ ServerPackets.CASTLE_SIEGE_INFO.writeId(this);
if (_castle != null)
{
- packet.writeD(_castle.getResidenceId());
+ writeInt(_castle.getResidenceId());
final int ownerId = _castle.getOwnerId();
- packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0);
- packet.writeD(ownerId);
+ writeInt((ownerId == _player.getClanId()) && (_player.isClanLeader()));
+ writeInt(ownerId);
if (ownerId > 0)
{
final Clan owner = ClanTable.getInstance().getClan(ownerId);
if (owner != null)
{
- packet.writeS(owner.getName()); // Clan Name
- packet.writeS(owner.getLeaderName()); // Clan Leader Name
- packet.writeD(owner.getAllyId()); // Ally ID
- packet.writeS(owner.getAllyName()); // Ally Name
+ writeString(owner.getName()); // Clan Name
+ writeString(owner.getLeaderName()); // Clan Leader Name
+ writeInt(owner.getAllyId()); // Ally ID
+ writeString(owner.getAllyName()); // Ally Name
}
else
{
@@ -81,32 +80,31 @@ public class SiegeInfo implements IClientOutgoingPacket
}
else
{
- packet.writeS(""); // Clan Name
- packet.writeS(""); // Clan Leader Name
- packet.writeD(0); // Ally ID
- packet.writeS(""); // Ally Name
+ writeString(""); // Clan Name
+ writeString(""); // Clan Leader Name
+ writeInt(0); // Ally ID
+ writeString(""); // Ally Name
}
- packet.writeD((int) (System.currentTimeMillis() / 1000));
+ writeInt((int) (System.currentTimeMillis() / 1000));
if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId()))
{
final Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis());
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
- packet.writeD(0);
- packet.writeD(Config.SIEGE_HOUR_LIST.size());
+ writeInt(0);
+ writeInt(Config.SIEGE_HOUR_LIST.size());
for (int hour : Config.SIEGE_HOUR_LIST)
{
cal.set(Calendar.HOUR_OF_DAY, hour);
- packet.writeD((int) (cal.getTimeInMillis() / 1000));
+ writeInt((int) (cal.getTimeInMillis() / 1000));
}
}
else
{
- packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000));
- packet.writeD(0);
+ writeInt((int) (_castle.getSiegeDate().getTimeInMillis() / 1000));
+ writeInt(0);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
index 3df53c1587..e228eb1e6b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.TimeStamp;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Skill Cool Time server packet implementation.
* @author KenM, Zoey76, Mobius
*/
-public class SkillCoolTime implements IClientOutgoingPacket
+public class SkillCoolTime extends ServerPacket
{
private final long _currentTime;
private final List _skillReuseTimeStamps = new ArrayList<>();
@@ -47,17 +46,16 @@ public class SkillCoolTime implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SKILL_COOL_TIME.writeId(packet);
- packet.writeD(_skillReuseTimeStamps.size());
+ ServerPackets.SKILL_COOL_TIME.writeId(this);
+ writeInt(_skillReuseTimeStamps.size());
for (TimeStamp ts : _skillReuseTimeStamps)
{
- packet.writeD(ts.getSkillId());
- packet.writeD(0); // ?
- packet.writeD((int) ts.getReuse() / 1000);
- packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000);
+ writeInt(ts.getSkillId());
+ writeInt(0); // ?
+ writeInt((int) ts.getReuse() / 1000);
+ writeInt((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
index 83ac89b18f..2e249aaa1a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
@@ -20,15 +20,48 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.SkillData;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SkillList implements IClientOutgoingPacket
+public class SkillList extends ServerPacket
{
private final List _skills = new ArrayList<>();
private int _lastLearnedSkillId = 0;
+ public SkillList()
+ {
+ super(1024);
+ }
+
+ @Override
+ public void write()
+ {
+ ServerPackets.SKILL_LIST.writeId(this);
+ _skills.sort(Comparator.comparing(s -> SkillData.getInstance().getSkill(s.id, s.level, s.subLevel).isToggle() ? 1 : 0));
+ writeInt(_skills.size());
+ for (Skill temp : _skills)
+ {
+ writeInt(temp.passive);
+ writeShort(temp.level);
+ writeShort(temp.subLevel);
+ writeInt(temp.id);
+ writeInt(temp.reuseDelayGroup); // GOD ReuseDelayShareGroupID
+ writeByte(temp.disabled); // iSkillDisabled
+ writeByte(temp.enchanted); // CanEnchant
+ }
+ writeInt(_lastLearnedSkillId);
+ }
+
+ public void addSkill(int id, int reuseDelayGroup, int level, int subLevel, boolean passive, boolean disabled, boolean enchanted)
+ {
+ _skills.add(new Skill(id, reuseDelayGroup, level, subLevel, passive, disabled, enchanted));
+ }
+
+ public void setLastLearnedSkillId(int lastLearnedSkillId)
+ {
+ _lastLearnedSkillId = lastLearnedSkillId;
+ }
+
static class Skill
{
public int id;
@@ -50,34 +83,4 @@ public class SkillList implements IClientOutgoingPacket
enchanted = pEnchanted;
}
}
-
- public void addSkill(int id, int reuseDelayGroup, int level, int subLevel, boolean passive, boolean disabled, boolean enchanted)
- {
- _skills.add(new Skill(id, reuseDelayGroup, level, subLevel, passive, disabled, enchanted));
- }
-
- public void setLastLearnedSkillId(int lastLearnedSkillId)
- {
- _lastLearnedSkillId = lastLearnedSkillId;
- }
-
- @Override
- public boolean write(PacketWriter packet)
- {
- OutgoingPackets.SKILL_LIST.writeId(packet);
- _skills.sort(Comparator.comparing(s -> SkillData.getInstance().getSkill(s.id, s.level, s.subLevel).isToggle() ? 1 : 0));
- packet.writeD(_skills.size());
- for (Skill temp : _skills)
- {
- packet.writeD(temp.passive ? 1 : 0);
- packet.writeH(temp.level);
- packet.writeH(temp.subLevel);
- packet.writeD(temp.id);
- packet.writeD(temp.reuseDelayGroup); // GOD ReuseDelayShareGroupID
- packet.writeC(temp.disabled ? 1 : 0); // iSkillDisabled
- packet.writeC(temp.enchanted ? 1 : 0); // CanEnchant
- }
- packet.writeD(_lastLearnedSkillId);
- return true;
- }
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
index ed4615c403..1a16cb569b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class Snoop implements IClientOutgoingPacket
+public class Snoop extends ServerPacket
{
private final int _convoId;
private final String _name;
@@ -38,15 +37,14 @@ public class Snoop implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SNOOP.writeId(packet);
- packet.writeD(_convoId);
- packet.writeS(_name);
- packet.writeD(0); // ??
- packet.writeD(_type.getClientId());
- packet.writeS(_speaker);
- packet.writeS(_msg);
- return true;
+ ServerPackets.SNOOP.writeId(this);
+ writeInt(_convoId);
+ writeString(_name);
+ writeInt(0); // ??
+ writeInt(_type.getClientId());
+ writeString(_speaker);
+ writeString(_msg);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java
index 52f15519a5..e37312a8cc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SocialAction implements IClientOutgoingPacket
+public class SocialAction extends ServerPacket
{
// TODO: Enum
public static final int LEVEL_UP = 2122;
@@ -34,12 +33,11 @@ public class SocialAction implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SOCIAL_ACTION.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_actionId);
- packet.writeD(0); // TODO: Find me!
- return true;
+ ServerPackets.SOCIAL_ACTION.writeId(this);
+ writeInt(_objectId);
+ writeInt(_actionId);
+ writeInt(0); // TODO: Find me!
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index 19066f5f85..0244067da2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SpawnItem implements IClientOutgoingPacket
+public class SpawnItem extends ServerPacket
{
private final Item _item;
@@ -30,21 +29,20 @@ public class SpawnItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SPAWN_ITEM.writeId(packet);
- packet.writeD(_item.getObjectId());
- packet.writeD(_item.getDisplayId());
- packet.writeD(_item.getX());
- packet.writeD(_item.getY());
- packet.writeD(_item.getZ());
+ ServerPackets.SPAWN_ITEM.writeId(this);
+ writeInt(_item.getObjectId());
+ writeInt(_item.getDisplayId());
+ writeInt(_item.getX());
+ writeInt(_item.getY());
+ writeInt(_item.getZ());
// only show item count if it is a stackable item
- packet.writeD(_item.isStackable() ? 1 : 0);
- packet.writeQ(_item.getCount());
- packet.writeD(0); // c2
- packet.writeC(_item.getEnchantLevel()); // Grand Crusade
- packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade
- packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade
- return true;
+ writeInt(_item.isStackable());
+ writeLong(_item.getCount());
+ writeInt(0); // c2
+ writeByte(_item.getEnchantLevel()); // Grand Crusade
+ writeByte(_item.getAugmentation() != null); // Grand Crusade
+ writeByte(_item.getSpecialAbilities().size()); // Grand Crusade
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
index 04f3ad716c..115f77a029 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Special Camera server packet implementation.
* @author Zoey76
*/
-public class SpecialCamera implements IClientOutgoingPacket
+public class SpecialCamera extends ServerPacket
{
private final int _id;
private final int _force;
@@ -107,20 +106,19 @@ public class SpecialCamera implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SPECIAL_CAMERA.writeId(packet);
- packet.writeD(_id);
- packet.writeD(_force);
- packet.writeD(_angle1);
- packet.writeD(_angle2);
- packet.writeD(_time);
- packet.writeD(_duration);
- packet.writeD(_relYaw);
- packet.writeD(_relPitch);
- packet.writeD(_isWide);
- packet.writeD(_relAngle);
- packet.writeD(_unk);
- return true;
+ ServerPackets.SPECIAL_CAMERA.writeId(this);
+ writeInt(_id);
+ writeInt(_force);
+ writeInt(_angle1);
+ writeInt(_angle2);
+ writeInt(_time);
+ writeInt(_duration);
+ writeInt(_relYaw);
+ writeInt(_relPitch);
+ writeInt(_isWide);
+ writeInt(_relAngle);
+ writeInt(_unk);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
index 281756e793..cb3303c7b5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StartPledgeWar implements IClientOutgoingPacket
+public class StartPledgeWar extends ServerPacket
{
private final String _pledgeName;
private final String _playerName;
@@ -31,11 +30,10 @@ public class StartPledgeWar implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.START_PLEDGE_WAR.writeId(packet);
- packet.writeS(_playerName);
- packet.writeS(_pledgeName);
- return true;
+ ServerPackets.START_PLEDGE_WAR.writeId(this);
+ writeString(_playerName);
+ writeString(_pledgeName);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java
index 27fb4f606b..486aa63bf4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StartRotation implements IClientOutgoingPacket
+public class StartRotation extends ServerPacket
{
private final int _objectId;
private final int _degree;
@@ -35,13 +34,12 @@ public class StartRotation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.START_ROTATING.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_degree);
- packet.writeD(_side);
- packet.writeD(_speed);
- return true;
+ ServerPackets.START_ROTATING.writeId(this);
+ writeInt(_objectId);
+ writeInt(_degree);
+ writeInt(_side);
+ writeInt(_speed);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
index 067bdeb082..f78c0f040b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.Door;
import org.l2jmobius.gameserver.model.actor.instance.StaticObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class StaticObjectInfo implements IClientOutgoingPacket
+public class StaticObjectInfo extends ServerPacket
{
private final int _staticObjectId;
private final int _objectId;
@@ -69,20 +68,19 @@ public class StaticObjectInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.STATIC_OBJECT.writeId(packet);
- packet.writeD(_staticObjectId);
- packet.writeD(_objectId);
- packet.writeD(_type);
- packet.writeD(_isTargetable ? 1 : 0);
- packet.writeD(_meshIndex);
- packet.writeD(_isClosed ? 1 : 0);
- packet.writeD(_isEnemy ? 1 : 0);
- packet.writeD(_currentHp);
- packet.writeD(_maxHp);
- packet.writeD(_showHp ? 1 : 0);
- packet.writeD(_damageGrade);
- return true;
+ ServerPackets.STATIC_OBJECT.writeId(this);
+ writeInt(_staticObjectId);
+ writeInt(_objectId);
+ writeInt(_type);
+ writeInt(_isTargetable);
+ writeInt(_meshIndex);
+ writeInt(_isClosed);
+ writeInt(_isEnemy);
+ writeInt(_currentHp);
+ writeInt(_maxHp);
+ writeInt(_showHp);
+ writeInt(_damageGrade);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
index 0f99a19cd2..4fe03f9647 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
@@ -20,12 +20,11 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.StatusUpdateType;
import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StatusUpdate implements IClientOutgoingPacket
+public class StatusUpdate extends ServerPacket
{
private final int _objectId;
private int _casterObjectId = 0;
@@ -72,18 +71,17 @@ public class StatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.STATUS_UPDATE.writeId(packet);
- packet.writeD(_objectId); // casterId
- packet.writeD(_isVisible ? _casterObjectId : 0);
- packet.writeC(_isVisible ? 1 : 0);
- packet.writeC(_updates.size());
+ ServerPackets.STATUS_UPDATE.writeId(this);
+ writeInt(_objectId); // casterId
+ writeInt(_isVisible ? _casterObjectId : 0);
+ writeByte(_isVisible);
+ writeByte(_updates.size());
for (Entry entry : _updates.entrySet())
{
- packet.writeC(entry.getKey().getClientId());
- packet.writeD(entry.getValue());
+ writeByte(entry.getKey().getClientId());
+ writeInt(entry.getValue());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java
index cf2b71df5a..4ea1bdf2e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StopMove implements IClientOutgoingPacket
+public class StopMove extends ServerPacket
{
private final int _objectId;
private final int _x;
@@ -50,14 +49,13 @@ public class StopMove implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.STOP_MOVE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- return true;
+ ServerPackets.STOP_MOVE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
index 78fdb5d70c..14d01f9217 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Maktakien
*/
-public class StopMoveInVehicle implements IClientOutgoingPacket
+public class StopMoveInVehicle extends ServerPacket
{
private final int _objectId;
private final int _boatId;
@@ -40,15 +39,14 @@ public class StopMoveInVehicle implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_boatId);
- packet.writeD(_pos.getX());
- packet.writeD(_pos.getY());
- packet.writeD(_pos.getZ());
- packet.writeD(_heading);
- return true;
+ ServerPackets.STOP_MOVE_IN_VEHICLE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_boatId);
+ writeInt(_pos.getX());
+ writeInt(_pos.getY());
+ writeInt(_pos.getZ());
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
index b254cad8b1..e5ad3b5baf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StopPledgeWar implements IClientOutgoingPacket
+public class StopPledgeWar extends ServerPacket
{
private final String _pledgeName;
private final String _playerName;
@@ -31,11 +30,10 @@ public class StopPledgeWar implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet);
- packet.writeS(_pledgeName);
- packet.writeS(_playerName);
- return true;
+ ServerPackets.STOP_PLEDGE_WAR.writeId(this);
+ writeString(_pledgeName);
+ writeString(_playerName);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java
index ca69cd5346..7eb14d3829 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StopRotation implements IClientOutgoingPacket
+public class StopRotation extends ServerPacket
{
private final int _objectId;
private final int _degree;
@@ -33,13 +32,12 @@ public class StopRotation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FINISH_ROTATING.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_degree);
- packet.writeD(_speed);
- packet.writeD(0); // ?
- return true;
+ ServerPackets.FINISH_ROTATING.writeId(this);
+ writeInt(_objectId);
+ writeInt(_degree);
+ writeInt(_speed);
+ writeInt(0); // ?
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 26972d8873..679c26e073 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.NpcInfoType;
import org.l2jmobius.gameserver.enums.Team;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw
@@ -205,169 +204,168 @@ public class SummonInfo extends AbstractMaskPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SUMMON_INFO.writeId(packet);
- packet.writeD(_summon.getObjectId());
- packet.writeC(_value); // 0=teleported 1=default 2=summoned
- packet.writeH(37); // mask_bits_37
- packet.writeB(_masks);
+ ServerPackets.SUMMON_INFO.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeByte(_value); // 0=teleported 1=default 2=summoned
+ writeShort(37); // mask_bits_37
+ writeBytes(_masks);
// Block 1
- packet.writeC(_initSize);
+ writeByte(_initSize);
if (containsMask(NpcInfoType.ATTACKABLE))
{
- packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0);
+ writeByte(_summon.isAutoAttackable(_attacker));
}
if (containsMask(NpcInfoType.RELATIONS))
{
- packet.writeQ(_relation);
+ writeLong(_relation);
}
if (containsMask(NpcInfoType.TITLE))
{
- packet.writeS(_title);
+ writeString(_title);
}
// Block 2
- packet.writeH(_blockSize);
+ writeShort(_blockSize);
if (containsMask(NpcInfoType.ID))
{
- packet.writeD(_summon.getTemplate().getDisplayId() + 1000000);
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
}
if (containsMask(NpcInfoType.POSITION))
{
- packet.writeD(_summon.getX());
- packet.writeD(_summon.getY());
- packet.writeD(_summon.getZ());
+ writeInt(_summon.getX());
+ writeInt(_summon.getY());
+ writeInt(_summon.getZ());
}
if (containsMask(NpcInfoType.HEADING))
{
- packet.writeD(_summon.getHeading());
+ writeInt(_summon.getHeading());
}
if (containsMask(NpcInfoType.UNKNOWN2))
{
- packet.writeD(0); // Unknown
+ writeInt(0); // Unknown
}
if (containsMask(NpcInfoType.ATK_CAST_SPEED))
{
- packet.writeD(_summon.getPAtkSpd());
- packet.writeD(_summon.getMAtkSpd());
+ writeInt(_summon.getPAtkSpd());
+ writeInt(_summon.getMAtkSpd());
}
if (containsMask(NpcInfoType.SPEED_MULTIPLIER))
{
- packet.writeE((float) _summon.getStat().getMovementSpeedMultiplier());
- packet.writeE((float) _summon.getStat().getAttackSpeedMultiplier());
+ writeFloat((float) _summon.getStat().getMovementSpeedMultiplier());
+ writeFloat((float) _summon.getStat().getAttackSpeedMultiplier());
}
if (containsMask(NpcInfoType.EQUIPPED))
{
- packet.writeD(_summon.getWeapon());
- packet.writeD(_summon.getArmor()); // Armor id?
- packet.writeD(0);
+ writeInt(_summon.getWeapon());
+ writeInt(_summon.getArmor()); // Armor id?
+ writeInt(0);
}
if (containsMask(NpcInfoType.ALIVE))
{
- packet.writeC(_summon.isDead() ? 0 : 1);
+ writeByte(!_summon.isDead());
}
if (containsMask(NpcInfoType.RUNNING))
{
- packet.writeC(_summon.isRunning() ? 1 : 0);
+ writeByte(_summon.isRunning());
}
if (containsMask(NpcInfoType.SWIM_OR_FLY))
{
- packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0);
+ writeByte(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0);
}
if (containsMask(NpcInfoType.TEAM))
{
- packet.writeC(_summon.getTeam().getId());
+ writeByte(_summon.getTeam().getId());
}
if (containsMask(NpcInfoType.ENCHANT))
{
- packet.writeD(_summon.getTemplate().getWeaponEnchant());
+ writeInt(_summon.getTemplate().getWeaponEnchant());
}
if (containsMask(NpcInfoType.FLYING))
{
- packet.writeD(_summon.isFlying() ? 1 : 0);
+ writeInt(_summon.isFlying());
}
if (containsMask(NpcInfoType.CLONE))
{
- packet.writeD(0); // Player ObjectId with Decoy
+ writeInt(0); // Player ObjectId with Decoy
}
if (containsMask(NpcInfoType.COLOR_EFFECT))
{
// No visual effect
- packet.writeD(0); // Unknown
+ writeInt(0); // Unknown
}
if (containsMask(NpcInfoType.DISPLAY_EFFECT))
{
- packet.writeD(0);
+ writeInt(0);
}
if (containsMask(NpcInfoType.TRANSFORMATION))
{
- packet.writeD(_summon.getTransformationDisplayId()); // Transformation ID
+ writeInt(_summon.getTransformationDisplayId()); // Transformation ID
}
if (containsMask(NpcInfoType.CURRENT_HP))
{
- packet.writeD((int) _summon.getCurrentHp());
+ writeInt((int) _summon.getCurrentHp());
}
if (containsMask(NpcInfoType.CURRENT_MP))
{
- packet.writeD((int) _summon.getCurrentMp());
+ writeInt((int) _summon.getCurrentMp());
}
if (containsMask(NpcInfoType.MAX_HP))
{
- packet.writeD(_summon.getMaxHp());
+ writeInt(_summon.getMaxHp());
}
if (containsMask(NpcInfoType.MAX_MP))
{
- packet.writeD(_summon.getMaxMp());
+ writeInt(_summon.getMaxMp());
}
if (containsMask(NpcInfoType.SUMMONED))
{
- packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
+ writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
}
if (containsMask(NpcInfoType.UNKNOWN12))
{
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
if (containsMask(NpcInfoType.NAME))
{
- packet.writeS(_summon.getName());
+ writeString(_summon.getName());
}
if (containsMask(NpcInfoType.NAME_NPCSTRINGID))
{
- packet.writeD(-1); // NPCStringId for name
+ writeInt(-1); // NPCStringId for name
}
if (containsMask(NpcInfoType.TITLE_NPCSTRINGID))
{
- packet.writeD(-1); // NPCStringId for title
+ writeInt(-1); // NPCStringId for title
}
if (containsMask(NpcInfoType.PVP_FLAG))
{
- packet.writeC(_summon.getPvpFlag()); // PVP flag
+ writeByte(_summon.getPvpFlag()); // PVP flag
}
if (containsMask(NpcInfoType.REPUTATION))
{
- packet.writeD(_summon.getReputation()); // Name color
+ writeInt(_summon.getReputation()); // Name color
}
if (containsMask(NpcInfoType.CLAN))
{
- packet.writeD(_clanId);
- packet.writeD(_clanCrest);
- packet.writeD(_clanLargeCrest);
- packet.writeD(_allyId);
- packet.writeD(_allyCrest);
+ writeInt(_clanId);
+ writeInt(_clanCrest);
+ writeInt(_clanLargeCrest);
+ writeInt(_allyId);
+ writeInt(_allyCrest);
}
if (containsMask(NpcInfoType.VISUAL_STATE))
{
- packet.writeC(_statusMask);
+ writeByte(_statusMask);
}
if (containsMask(NpcInfoType.ABNORMALS))
{
- packet.writeH(_abnormalVisualEffects.size());
+ writeShort(_abnormalVisualEffects.size());
for (AbnormalVisualEffect abnormalVisualEffect : _abnormalVisualEffects)
{
- packet.writeH(abnormalVisualEffect.getClientId());
+ writeShort(abnormalVisualEffect.getClientId());
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java
index 324610ef20..688f1f156b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SunRise implements IClientOutgoingPacket
+public class SunRise extends ServerPacket
{
public static final SunRise STATIC_PACKET = new SunRise();
@@ -28,9 +27,8 @@ public class SunRise implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SUN_RISE.writeId(packet);
- return true;
+ ServerPackets.SUN_RISE.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java
index 1be988f401..115faad864 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SunSet implements IClientOutgoingPacket
+public class SunSet extends ServerPacket
{
public static final SunSet STATIC_PACKET = new SunSet();
@@ -28,9 +27,8 @@ public class SunSet implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SUN_SET.writeId(packet);
- return true;
+ ServerPackets.SUN_SET.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
index 6f88551204..8708599430 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SurrenderPledgeWar implements IClientOutgoingPacket
+public class SurrenderPledgeWar extends ServerPacket
{
private final String _pledgeName;
private final String _playerName;
@@ -31,11 +30,10 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet);
- packet.writeS(_pledgeName);
- packet.writeS(_playerName);
- return true;
+ ServerPackets.SURRENDER_PLEDGE_WAR.writeId(this);
+ writeString(_pledgeName);
+ writeString(_playerName);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index bbd7706dbe..67f5d5bdfb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Arrays;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -27,15 +26,15 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation;
/**
* @author Forsaiken
*/
-public class SystemMessage implements IClientOutgoingPacket
+public class SystemMessage extends ServerPacket
{
private static final SMParam[] EMPTY_PARAM_ARRAY = new SMParam[0];
@@ -391,9 +390,9 @@ public class SystemMessage implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SYSTEM_MESSAGE.writeId(packet);
+ ServerPackets.SYSTEM_MESSAGE.writeId(this);
// Localisation related.
if (_lang != null)
{
@@ -405,15 +404,15 @@ public class SystemMessage implements IClientOutgoingPacket
{
params[i] = _params[i].getValue();
}
- packet.writeH(SystemMessageId.S1_2.getId());
- packet.writeC(1);
- packet.writeC(TYPE_TEXT);
- packet.writeS(sml.getLocalisation(params));
- return true;
+ writeShort(SystemMessageId.S1_2.getId());
+ writeByte(1);
+ writeByte(TYPE_TEXT);
+ writeString(sml.getLocalisation(params));
+ return;
}
}
- packet.writeH(getId());
- packet.writeC(_params.length);
+ writeShort(getId());
+ writeByte(_params.length);
for (SMParam param : _params)
{
if (param == null)
@@ -421,7 +420,7 @@ public class SystemMessage implements IClientOutgoingPacket
PacketLogger.warning("Found null parameter for SystemMessageId " + _smId);
continue;
}
- packet.writeC(param.getType());
+ writeByte(param.getType());
switch (param.getType())
{
case TYPE_ELEMENT_NAME:
@@ -429,7 +428,7 @@ public class SystemMessage implements IClientOutgoingPacket
case TYPE_FACTION_NAME:
case TYPE_ELEMENTAL_SPIRIT:
{
- packet.writeC(param.getIntValue());
+ writeByte(param.getIntValue());
break;
}
case TYPE_CASTLE_NAME:
@@ -437,7 +436,7 @@ public class SystemMessage implements IClientOutgoingPacket
case TYPE_INSTANCE_NAME:
case TYPE_CLASS_ID:
{
- packet.writeH(param.getIntValue());
+ writeShort(param.getIntValue());
break;
}
case TYPE_ITEM_NAME:
@@ -445,39 +444,38 @@ public class SystemMessage implements IClientOutgoingPacket
case TYPE_NPC_NAME:
case TYPE_DOOR_NAME:
{
- packet.writeD(param.getIntValue());
+ writeInt(param.getIntValue());
break;
}
case TYPE_LONG_NUMBER:
{
- packet.writeQ(param.getLongValue());
+ writeLong(param.getLongValue());
break;
}
case TYPE_TEXT:
case TYPE_PLAYER_NAME:
{
- packet.writeS(param.getStringValue());
+ writeString(param.getStringValue());
break;
}
case TYPE_SKILL_NAME:
{
final int[] array = param.getIntArrayValue();
- packet.writeD(array[0]); // skill id
- packet.writeH(array[1]); // skill level
- packet.writeH(array[2]); // skill sub level
+ writeInt(array[0]); // skill id
+ writeShort(array[1]); // skill level
+ writeShort(array[2]); // skill sub level
break;
}
case TYPE_POPUP_ID:
case TYPE_ZONE_NAME:
{
final int[] array = param.getIntArrayValue();
- packet.writeD(array[0]); // x
- packet.writeD(array[1]); // y
- packet.writeD(array[2]); // z
+ writeInt(array[0]); // x
+ writeInt(array[1]); // y
+ writeInt(array[2]); // z
break;
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
index d357efbb0e..942dc7e4b0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class TargetSelected implements IClientOutgoingPacket
+public class TargetSelected extends ServerPacket
{
private final int _objectId;
private final int _targetObjId;
@@ -44,15 +43,14 @@ public class TargetSelected implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TARGET_SELECTED.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_targetObjId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(0); // ?
- return true;
+ ServerPackets.TARGET_SELECTED.writeId(this);
+ writeInt(_objectId);
+ writeInt(_targetObjId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(0); // ?
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
index 3d7208c06f..0d4761877d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class TargetUnselected implements IClientOutgoingPacket
+public class TargetUnselected extends ServerPacket
{
private final int _targetObjId;
private final int _x;
@@ -39,14 +38,13 @@ public class TargetUnselected implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TARGET_UNSELECTED.writeId(packet);
- packet.writeD(_targetObjId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(0); // ??
- return true;
+ ServerPackets.TARGET_UNSELECTED.writeId(this);
+ writeInt(_targetObjId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(0); // ?
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
index 13f9b9565a..cb7b40ba06 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class TeleportToLocation implements IClientOutgoingPacket
+public class TeleportToLocation extends ServerPacket
{
private final int _targetObjId;
private final int _x;
@@ -38,16 +37,15 @@ public class TeleportToLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet);
- packet.writeD(_targetObjId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(0); // Fade 0, Instant 1.
- packet.writeD(_heading);
- packet.writeD(0); // Unknown.
- return true;
+ ServerPackets.TELEPORT_TO_LOCATION.writeId(this);
+ writeInt(_targetObjId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(0); // Fade 0, Instant 1.
+ writeInt(_heading);
+ writeInt(0); // Unknown.
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java
index 8d09576d9d..1afd030d4a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class TradeDone implements IClientOutgoingPacket
+public class TradeDone extends ServerPacket
{
private final int _num;
@@ -29,10 +28,9 @@ public class TradeDone implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_DONE.writeId(packet);
- packet.writeD(_num);
- return true;
+ ServerPackets.TRADE_DONE.writeId(this);
+ writeInt(_num);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
index 6a94d2463f..010ddaff8a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Yme
@@ -35,16 +34,15 @@ public class TradeOtherAdd extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_OTHER_ADD.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.TRADE_OTHER_ADD.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(1);
+ writeInt(1);
}
- packet.writeD(1);
- writeItem(packet, _item);
- return true;
+ writeInt(1);
+ writeItem(_item);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
index 7569bb1512..8d9ea7f725 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class TradeOtherDone implements IClientOutgoingPacket
+public class TradeOtherDone extends ServerPacket
{
public static final TradeOtherDone STATIC_PACKET = new TradeOtherDone();
@@ -28,9 +27,8 @@ public class TradeOtherDone implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_PRESS_OTHER_OK.writeId(packet);
- return true;
+ ServerPackets.TRADE_PRESS_OTHER_OK.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
index 7907f3d498..d6342f2b7d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Yme
@@ -35,16 +34,15 @@ public class TradeOwnAdd extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_OWN_ADD.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.TRADE_OWN_ADD.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(1);
+ writeInt(1);
}
- packet.writeD(1);
- writeItem(packet, _item);
- return true;
+ writeInt(1);
+ writeItem(_item);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
index 62f2a804a6..8f4e03d152 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
@@ -19,12 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
import org.l2jmobius.gameserver.instancemanager.MentorManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class TradeStart extends AbstractItemPacket
{
@@ -67,33 +66,32 @@ public class TradeStart extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if ((_player.getActiveTradeList() == null) || (_partner == null))
{
- return false;
+ return;
}
- OutgoingPackets.TRADE_START.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.TRADE_START.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_itemList.size());
- packet.writeD(_itemList.size());
+ writeInt(_itemList.size());
+ writeInt(_itemList.size());
for (Item item : _itemList)
{
- writeItem(packet, item);
+ writeItem(item);
}
}
else
{
- packet.writeD(_partner.getObjectId());
- packet.writeC(_mask); // some kind of mask
+ writeInt(_partner.getObjectId());
+ writeByte(_mask); // some kind of mask
if ((_mask & 0x10) == 0)
{
- packet.writeC(_partner.getLevel());
+ writeByte(_partner.getLevel());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
index e5ec2376cc..0ed3752546 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author daemon
@@ -40,17 +39,16 @@ public class TradeUpdate extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_UPDATE.writeId(packet);
- packet.writeC(_sendType);
- packet.writeD(1);
+ ServerPackets.TRADE_UPDATE.writeId(this);
+ writeByte(_sendType);
+ writeInt(1);
if (_sendType == 2)
{
- packet.writeD(1);
- packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2);
- writeItem(packet, _item, _count);
+ writeInt(1);
+ writeShort((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2);
+ writeItem(_item, _count);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
index 09844cfa0d..fca823d03d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* TutorialCloseHtml server packet implementation.
* @author HorridoJoho
*/
-public class TutorialCloseHtml implements IClientOutgoingPacket
+public class TutorialCloseHtml extends ServerPacket
{
public static final TutorialCloseHtml STATIC_PACKET = new TutorialCloseHtml();
@@ -32,9 +31,8 @@ public class TutorialCloseHtml implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_CLOSE_HTML.writeId(packet);
- return true;
+ ServerPackets.TUTORIAL_CLOSE_HTML.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
index 728020c0b1..4053323c7a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class TutorialEnableClientEvent implements IClientOutgoingPacket
+public class TutorialEnableClientEvent extends ServerPacket
{
private int _eventId = 0;
@@ -29,10 +28,9 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet);
- packet.writeD(_eventId);
- return true;
+ ServerPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(this);
+ writeInt(_eventId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
index 7cc33a0f80..06281eaf27 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.HtmlActionScope;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* TutorialShowHtml server packet implementation.
@@ -45,12 +44,11 @@ public class TutorialShowHtml extends AbstractHtmlPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet);
- packet.writeD(_type);
- packet.writeS(getHtml());
- return true;
+ ServerPackets.TUTORIAL_SHOW_HTML.writeId(this);
+ writeInt(_type);
+ writeString(getHtml());
}
@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
index 2ee62835db..994f83bef7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class TutorialShowQuestionMark implements IClientOutgoingPacket
+public class TutorialShowQuestionMark extends ServerPacket
{
private final int _markId;
private final int _markType;
@@ -34,11 +33,10 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet);
- packet.writeC(_markType);
- packet.writeD(_markId);
- return true;
+ ServerPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(this);
+ writeByte(_markType);
+ writeInt(_markId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
index ad198b55ae..8fa977c133 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.ExperienceData;
import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
@@ -28,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Sdw, UnAfraid
@@ -127,293 +126,293 @@ public class UserInfo extends AbstractMaskPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_player == null)
{
- return false;
+ return;
}
- OutgoingPackets.USER_INFO.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_initSize);
- packet.writeH(28); // 286 - 28
- packet.writeB(_masks);
+ ServerPackets.USER_INFO.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_initSize);
+ writeShort(28); // 286 - 28
+ writeBytes(_masks);
if (containsMask(UserInfoType.RELATION))
{
- packet.writeD(_relation);
+ writeInt(_relation);
}
if (containsMask(UserInfoType.BASIC_INFO))
{
- packet.writeH(23 + (_player.getAppearance().getVisibleName().length() * 2));
- packet.writeString(_player.getName());
- packet.writeC(_player.isGM() ? 1 : 0);
- packet.writeC(_player.getRace().ordinal());
- packet.writeC(_player.getAppearance().isFemale() ? 1 : 0);
- packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId());
- packet.writeD(_player.getClassId().getId());
- packet.writeD(_player.getLevel()); // 270
- packet.writeD(_player.getClassId().getId()); // 286
+ writeShort(23 + (_player.getAppearance().getVisibleName().length() * 2));
+ writeSizedString(_player.getName());
+ writeByte(_player.isGM());
+ writeByte(_player.getRace().ordinal());
+ writeByte(_player.getAppearance().isFemale());
+ writeInt(_player.getBaseTemplate().getClassId().getRootClassId().getId());
+ writeInt(_player.getClassId().getId());
+ writeInt(_player.getLevel()); // 270
+ writeInt(_player.getClassId().getId()); // 286
}
if (containsMask(UserInfoType.BASE_STATS))
{
- packet.writeH(18);
- packet.writeH(_player.getSTR());
- packet.writeH(_player.getDEX());
- packet.writeH(_player.getCON());
- packet.writeH(_player.getINT());
- packet.writeH(_player.getWIT());
- packet.writeH(_player.getMEN());
- packet.writeH(0);
- packet.writeH(0);
+ writeShort(18);
+ writeShort(_player.getSTR());
+ writeShort(_player.getDEX());
+ writeShort(_player.getCON());
+ writeShort(_player.getINT());
+ writeShort(_player.getWIT());
+ writeShort(_player.getMEN());
+ writeShort(0);
+ writeShort(0);
}
if (containsMask(UserInfoType.MAX_HPCPMP))
{
- packet.writeH(14);
- packet.writeD(_player.getMaxHp());
- packet.writeD(_player.getMaxMp());
- packet.writeD(_player.getMaxCp());
+ writeShort(14);
+ writeInt(_player.getMaxHp());
+ writeInt(_player.getMaxMp());
+ writeInt(_player.getMaxCp());
}
if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP))
{
- packet.writeH(38);
- packet.writeD((int) Math.round(_player.getCurrentHp()));
- packet.writeD((int) Math.round(_player.getCurrentMp()));
- packet.writeD((int) Math.round(_player.getCurrentCp()));
- packet.writeQ(_player.getSp());
- packet.writeQ(_player.getExp());
- packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel())));
+ writeShort(38);
+ writeInt((int) Math.round(_player.getCurrentHp()));
+ writeInt((int) Math.round(_player.getCurrentMp()));
+ writeInt((int) Math.round(_player.getCurrentCp()));
+ writeLong(_player.getSp());
+ writeLong(_player.getExp());
+ writeDouble((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel())));
}
if (containsMask(UserInfoType.ENCHANTLEVEL))
{
- packet.writeH(4);
- packet.writeC(_enchantLevel);
- packet.writeC(_armorEnchant);
+ writeShort(4);
+ writeByte(_enchantLevel);
+ writeByte(_armorEnchant);
}
if (containsMask(UserInfoType.APPAREANCE))
{
- packet.writeH(15);
- packet.writeD(_player.getVisualHair());
- packet.writeD(_player.getVisualHairColor());
- packet.writeD(_player.getVisualFace());
- packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0);
+ writeShort(15);
+ writeInt(_player.getVisualHair());
+ writeInt(_player.getVisualHairColor());
+ writeInt(_player.getVisualFace());
+ writeByte(_player.isHairAccessoryEnabled());
}
if (containsMask(UserInfoType.STATUS))
{
- packet.writeH(6);
- packet.writeC(_player.getMountType().ordinal());
- packet.writeC(_player.getPrivateStoreType().getId());
- packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0);
- packet.writeC(0);
+ writeShort(6);
+ writeByte(_player.getMountType().ordinal());
+ writeByte(_player.getPrivateStoreType().getId());
+ writeByte(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0));
+ writeByte(0);
}
if (containsMask(UserInfoType.STATS))
{
- packet.writeH(64); // 270
- packet.writeH(_player.getActiveWeaponItem() != null ? 40 : 20);
- packet.writeD(_player.getPAtk());
- packet.writeD(_player.getPAtkSpd());
- packet.writeD(_player.getPDef());
- packet.writeD(_player.getEvasionRate());
- packet.writeD(_player.getAccuracy());
- packet.writeD(_player.getCriticalHit());
- packet.writeD(_player.getMAtk());
- packet.writeD(_player.getMAtkSpd());
- packet.writeD(_player.getPAtkSpd()); // Seems like atk speed - 1
- packet.writeD(_player.getMagicEvasionRate());
- packet.writeD(_player.getMDef());
- packet.writeD(_player.getMagicAccuracy());
- packet.writeD(_player.getMCriticalHit());
- packet.writeD(_player.getStat().getWeaponBonusPAtk()); // 270
- packet.writeD(_player.getStat().getWeaponBonusMAtk()); // 270
+ writeShort(64); // 270
+ writeShort(_player.getActiveWeaponItem() != null ? 40 : 20);
+ writeInt(_player.getPAtk());
+ writeInt(_player.getPAtkSpd());
+ writeInt(_player.getPDef());
+ writeInt(_player.getEvasionRate());
+ writeInt(_player.getAccuracy());
+ writeInt(_player.getCriticalHit());
+ writeInt(_player.getMAtk());
+ writeInt(_player.getMAtkSpd());
+ writeInt(_player.getPAtkSpd()); // Seems like atk speed - 1
+ writeInt(_player.getMagicEvasionRate());
+ writeInt(_player.getMDef());
+ writeInt(_player.getMagicAccuracy());
+ writeInt(_player.getMCriticalHit());
+ writeInt(_player.getStat().getWeaponBonusPAtk()); // 270
+ writeInt(_player.getStat().getWeaponBonusMAtk()); // 270
}
if (containsMask(UserInfoType.ELEMENTALS))
{
- packet.writeH(14);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
+ writeShort(14);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
}
if (containsMask(UserInfoType.POSITION))
{
- packet.writeH(18);
- packet.writeD(_player.getX());
- packet.writeD(_player.getY());
- packet.writeD(_player.getZ());
- packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0);
+ writeShort(18);
+ writeInt(_player.getX());
+ writeInt(_player.getY());
+ writeInt(_player.getZ());
+ writeInt(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0);
}
if (containsMask(UserInfoType.SPEED))
{
- packet.writeH(18);
- packet.writeH(_runSpd);
- packet.writeH(_walkSpd);
- packet.writeH(_swimRunSpd);
- packet.writeH(_swimWalkSpd);
- packet.writeH(_flRunSpd);
- packet.writeH(_flWalkSpd);
- packet.writeH(_flyRunSpd);
- packet.writeH(_flyWalkSpd);
+ writeShort(18);
+ writeShort(_runSpd);
+ writeShort(_walkSpd);
+ writeShort(_swimRunSpd);
+ writeShort(_swimWalkSpd);
+ writeShort(_flRunSpd);
+ writeShort(_flWalkSpd);
+ writeShort(_flyRunSpd);
+ writeShort(_flyWalkSpd);
}
if (containsMask(UserInfoType.MULTIPLIER))
{
- packet.writeH(18);
- packet.writeF(_moveMultiplier);
- packet.writeF(_player.getAttackSpeedMultiplier());
+ writeShort(18);
+ writeDouble(_moveMultiplier);
+ writeDouble(_player.getAttackSpeedMultiplier());
}
if (containsMask(UserInfoType.COL_RADIUS_HEIGHT))
{
- packet.writeH(18);
- packet.writeF(_player.getCollisionRadius());
- packet.writeF(_player.getCollisionHeight());
+ writeShort(18);
+ writeDouble(_player.getCollisionRadius());
+ writeDouble(_player.getCollisionHeight());
}
if (containsMask(UserInfoType.ATK_ELEMENTAL))
{
- packet.writeH(5);
- packet.writeC(0);
- packet.writeH(0);
+ writeShort(5);
+ writeByte(0);
+ writeShort(0);
}
if (containsMask(UserInfoType.CLAN))
{
- packet.writeH(32 + (_title.length() * 2));
- packet.writeString(_title);
- packet.writeH(_player.getPledgeType());
- packet.writeD(_player.getClanId());
- packet.writeD(_player.getClanCrestLargeId());
- packet.writeD(_player.getClanCrestId());
- packet.writeD(_player.getClanPrivileges().getBitmask());
- packet.writeC(_player.isClanLeader() ? 1 : 0);
- packet.writeD(_player.getAllyId());
- packet.writeD(_player.getAllyCrestId());
- packet.writeC(_player.isInMatchingRoom() ? 1 : 0);
+ writeShort(32 + (_title.length() * 2));
+ writeSizedString(_title);
+ writeShort(_player.getPledgeType());
+ writeInt(_player.getClanId());
+ writeInt(_player.getClanCrestLargeId());
+ writeInt(_player.getClanCrestId());
+ writeInt(_player.getClanPrivileges().getBitmask());
+ writeByte(_player.isClanLeader());
+ writeInt(_player.getAllyId());
+ writeInt(_player.getAllyCrestId());
+ writeByte(_player.isInMatchingRoom());
}
if (containsMask(UserInfoType.SOCIAL))
{
- packet.writeH(30); // 228
- packet.writeC(_player.getPvpFlag());
- packet.writeD(_player.getReputation()); // Reputation
- packet.writeC(_player.isNoble() ? 1 : 0);
- packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2?
- packet.writeC(_player.getPledgeClass());
- packet.writeD(_player.getPkKills());
- packet.writeD(_player.getPvpKills());
- packet.writeH(_player.getRecomLeft());
- packet.writeH(_player.getRecomHave());
+ writeShort(30); // 228
+ writeByte(_player.getPvpFlag());
+ writeInt(_player.getReputation()); // Reputation
+ writeByte(_player.isNoble());
+ writeByte(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2?
+ writeByte(_player.getPledgeClass());
+ writeInt(_player.getPkKills());
+ writeInt(_player.getPvpKills());
+ writeShort(_player.getRecomLeft());
+ writeShort(_player.getRecomHave());
// AFK animation.
if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)) // 196
{
- packet.writeD(_player.isClanLeader() ? 100 : 101);
+ writeInt(_player.isClanLeader() ? 100 : 101);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(0); // 228
+ writeInt(0); // 228
}
if (containsMask(UserInfoType.VITA_FAME))
{
- packet.writeH(19); // 196
- packet.writeD(_player.getVitalityPoints());
- packet.writeC(0); // Vita Bonus
- packet.writeD(0); // _player.getFame()
- packet.writeD(0); // _player.getRaidbossPoints()
- packet.writeC(0); // 196
- packet.writeH(0); // Henna Seal Engraving Gauge
- packet.writeC(0); // 196
+ writeShort(19); // 196
+ writeInt(_player.getVitalityPoints());
+ writeByte(0); // Vita Bonus
+ writeInt(0); // _player.getFame()
+ writeInt(0); // _player.getRaidbossPoints()
+ writeByte(0); // 196
+ writeShort(0); // Henna Seal Engraving Gauge
+ writeByte(0); // 196
}
if (containsMask(UserInfoType.SLOTS))
{
- packet.writeH(12); // 152
- packet.writeC(_player.getInventory().getTalismanSlots());
- packet.writeC(_player.getInventory().getBroochJewelSlots());
- packet.writeC(_player.getTeam().getId());
- packet.writeD(0);
+ writeShort(12); // 152
+ writeByte(_player.getInventory().getTalismanSlots());
+ writeByte(_player.getInventory().getBroochJewelSlots());
+ writeByte(_player.getTeam().getId());
+ writeInt(0);
if (_player.getInventory().getAgathionSlots() > 0)
{
- packet.writeC(1); // Charm slots
- packet.writeC(_player.getInventory().getAgathionSlots() - 1);
+ writeByte(1); // Charm slots
+ writeByte(_player.getInventory().getAgathionSlots() - 1);
}
else
{
- packet.writeC(0); // Charm slots
- packet.writeC(0);
+ writeByte(0); // Charm slots
+ writeByte(0);
}
- packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152
+ writeByte(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152
}
if (containsMask(UserInfoType.MOVEMENTS))
{
- packet.writeH(4);
- packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
- packet.writeC(_player.isRunning() ? 1 : 0);
+ writeShort(4);
+ writeByte(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
+ writeByte(_player.isRunning());
}
if (containsMask(UserInfoType.COLOR))
{
- packet.writeH(10);
- packet.writeD(_player.getAppearance().getNameColor());
- packet.writeD(_player.getAppearance().getTitleColor());
+ writeShort(10);
+ writeInt(_player.getAppearance().getNameColor());
+ writeInt(_player.getAppearance().getTitleColor());
}
if (containsMask(UserInfoType.INVENTORY_LIMIT))
{
- packet.writeH(13);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(_player.getInventoryLimit());
- packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
- packet.writeC(0); // 196
- packet.writeC(0); // 196
- packet.writeC(0); // 196
- packet.writeC(0); // 196
+ writeShort(13);
+ writeShort(0);
+ writeShort(0);
+ writeShort(_player.getInventoryLimit());
+ writeByte(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
+ writeByte(0); // 196
+ writeByte(0); // 196
+ writeByte(0); // 196
+ writeByte(0); // 196
}
if (containsMask(UserInfoType.TRUE_HERO))
{
- packet.writeH(9);
- packet.writeD(0);
- packet.writeH(0);
- packet.writeC(_player.isTrueHero() ? 100 : 0);
+ writeShort(9);
+ writeInt(0);
+ writeShort(0);
+ writeByte(_player.isTrueHero() ? 100 : 0);
}
if (containsMask(UserInfoType.ATT_SPIRITS)) // 152
{
- packet.writeH(26);
- packet.writeD((int) _player.getActiveElementalSpiritAttack());
- packet.writeD((int) _player.getFireSpiritDefense());
- packet.writeD((int) _player.getWaterSpiritDefense());
- packet.writeD((int) _player.getWindSpiritDefense());
- packet.writeD((int) _player.getEarthSpiritDefense());
- packet.writeD(_player.getActiveElementalSpiritType());
+ writeShort(26);
+ writeInt((int) _player.getActiveElementalSpiritAttack());
+ writeInt((int) _player.getFireSpiritDefense());
+ writeInt((int) _player.getWaterSpiritDefense());
+ writeInt((int) _player.getWindSpiritDefense());
+ writeInt((int) _player.getEarthSpiritDefense());
+ writeInt(_player.getActiveElementalSpiritType());
}
if (containsMask(UserInfoType.RANKING)) // 196
{
- packet.writeH(6);
- packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0);
+ writeShort(6);
+ writeInt(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0);
}
if (containsMask(UserInfoType.STAT_POINTS)) // 235
{
- packet.writeH(16);
- packet.writeH(_player.getLevel() < 76 ? 0 : (_player.getLevel() - 75) + _player.getVariables().getInt(PlayerVariables.ELIXIRS_AVAILABLE, 0) + _player.getVariables().getInt(PlayerVariables.ELIXIRS_USED, 0)); // Usable points
- packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_STR, 0));
- packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_DEX, 0));
- packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_CON, 0));
- packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_INT, 0));
- packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_WIT, 0));
- packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_MEN, 0));
+ writeShort(16);
+ writeShort(_player.getLevel() < 76 ? 0 : (_player.getLevel() - 75) + _player.getVariables().getInt(PlayerVariables.ELIXIRS_AVAILABLE, 0) + _player.getVariables().getInt(PlayerVariables.ELIXIRS_USED, 0)); // Usable points
+ writeShort(_player.getVariables().getInt(PlayerVariables.STAT_STR, 0));
+ writeShort(_player.getVariables().getInt(PlayerVariables.STAT_DEX, 0));
+ writeShort(_player.getVariables().getInt(PlayerVariables.STAT_CON, 0));
+ writeShort(_player.getVariables().getInt(PlayerVariables.STAT_INT, 0));
+ writeShort(_player.getVariables().getInt(PlayerVariables.STAT_WIT, 0));
+ writeShort(_player.getVariables().getInt(PlayerVariables.STAT_MEN, 0));
}
if (containsMask(UserInfoType.STAT_ABILITIES)) // 235
{
- packet.writeH(18);
- packet.writeH(_player.getSTR() - _player.getTemplate().getBaseSTR() - _player.getVariables().getInt(PlayerVariables.STAT_STR, 0)); // additional STR
- packet.writeH(_player.getDEX() - _player.getTemplate().getBaseDEX() - _player.getVariables().getInt(PlayerVariables.STAT_DEX, 0)); // additional DEX
- packet.writeH(_player.getCON() - _player.getTemplate().getBaseCON() - _player.getVariables().getInt(PlayerVariables.STAT_CON, 0)); // additional CON
- packet.writeH(_player.getINT() - _player.getTemplate().getBaseINT() - _player.getVariables().getInt(PlayerVariables.STAT_INT, 0)); // additional INT
- packet.writeH(_player.getWIT() - _player.getTemplate().getBaseWIT() - _player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); // additional WIT
- packet.writeH(_player.getMEN() - _player.getTemplate().getBaseMEN() - _player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); // additional MEN
- packet.writeH(0);
- packet.writeH(0);
+ writeShort(18);
+ writeShort(_player.getSTR() - _player.getTemplate().getBaseSTR() - _player.getVariables().getInt(PlayerVariables.STAT_STR, 0)); // additional STR
+ writeShort(_player.getDEX() - _player.getTemplate().getBaseDEX() - _player.getVariables().getInt(PlayerVariables.STAT_DEX, 0)); // additional DEX
+ writeShort(_player.getCON() - _player.getTemplate().getBaseCON() - _player.getVariables().getInt(PlayerVariables.STAT_CON, 0)); // additional CON
+ writeShort(_player.getINT() - _player.getTemplate().getBaseINT() - _player.getVariables().getInt(PlayerVariables.STAT_INT, 0)); // additional INT
+ writeShort(_player.getWIT() - _player.getTemplate().getBaseWIT() - _player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); // additional WIT
+ writeShort(_player.getMEN() - _player.getTemplate().getBaseMEN() - _player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); // additional MEN
+ writeShort(0);
+ writeShort(0);
}
if (containsMask(UserInfoType.ELIXIR_USED)) // 286
{
- packet.writeD(_player.getVariables().getInt(PlayerVariables.ELIXIRS_USED, 0)); // count
- packet.writeH(0);
+ writeInt(_player.getVariables().getInt(PlayerVariables.ELIXIRS_USED, 0)); // count
+ writeShort(0);
}
// Send exp bonus change.
@@ -421,8 +420,6 @@ public class UserInfo extends AbstractMaskPacket
{
_player.sendUserBoostStat();
}
-
- return true;
}
private int calculateRelation(Player player)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
index 90c416726a..9b005902a6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ValidateLocation implements IClientOutgoingPacket
+public class ValidateLocation extends ServerPacket
{
private final int _objectId;
private final Location _loc;
@@ -33,15 +32,14 @@ public class ValidateLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VALIDATE_LOCATION.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- packet.writeD(_loc.getHeading());
- packet.writeC(0xFF); // TODO: Find me!
- return true;
+ ServerPackets.VALIDATE_LOCATION.writeId(this);
+ writeInt(_objectId);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeInt(_loc.getHeading());
+ writeByte(0xff); // TODO: Find me!
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
index 83f72bf981..f0be12f449 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ValidateLocationInVehicle implements IClientOutgoingPacket
+public class ValidateLocationInVehicle extends ServerPacket
{
private final int _objectId;
private final int _boatObjId;
@@ -37,15 +36,14 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_boatObjId);
- packet.writeD(_pos.getX());
- packet.writeD(_pos.getY());
- packet.writeD(_pos.getZ());
- packet.writeD(_heading);
- return true;
+ ServerPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_boatObjId);
+ writeInt(_pos.getX());
+ writeInt(_pos.getY());
+ writeInt(_pos.getZ());
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
index 71367cd26d..f2dc2ec3f2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Maktakien
*/
-public class VehicleCheckLocation implements IClientOutgoingPacket
+public class VehicleCheckLocation extends ServerPacket
{
private final Creature _boat;
@@ -33,14 +32,13 @@ public class VehicleCheckLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet);
- packet.writeD(_boat.getObjectId());
- packet.writeD(_boat.getX());
- packet.writeD(_boat.getY());
- packet.writeD(_boat.getZ());
- packet.writeD(_boat.getHeading());
- return true;
+ ServerPackets.VEHICLE_CHECK_LOCATION.writeId(this);
+ writeInt(_boat.getObjectId());
+ writeInt(_boat.getX());
+ writeInt(_boat.getY());
+ writeInt(_boat.getZ());
+ writeInt(_boat.getHeading());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
index 5b565c08b7..f6eb0a5ebc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.Boat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Maktakien
*/
-public class VehicleDeparture implements IClientOutgoingPacket
+public class VehicleDeparture extends ServerPacket
{
private final int _objId;
private final int _x;
@@ -43,15 +42,14 @@ public class VehicleDeparture implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(_moveSpeed);
- packet.writeD(_rotationSpeed);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.VEHICLE_DEPARTURE.writeId(this);
+ writeInt(_objId);
+ writeInt(_moveSpeed);
+ writeInt(_rotationSpeed);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
index 4a995a6352..05a266992a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.Boat;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Maktakien
*/
-public class VehicleInfo implements IClientOutgoingPacket
+public class VehicleInfo extends ServerPacket
{
private final int _objId;
private final int _x;
@@ -41,14 +40,13 @@ public class VehicleInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VEHICLE_INFO.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- return true;
+ ServerPackets.VEHICLE_INFO.writeId(this);
+ writeInt(_objId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
index bf629dcbbc..a416efdd6a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Kerberos
*/
-public class VehicleStarted implements IClientOutgoingPacket
+public class VehicleStarted extends ServerPacket
{
private final int _objectId;
private final int _state;
@@ -39,11 +38,10 @@ public class VehicleStarted implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VEHICLE_START.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_state);
- return true;
+ ServerPackets.VEHICLE_START.writeId(this);
+ writeInt(_objectId);
+ writeInt(_state);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
index 5eb9eb7ab9..255c909a0b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
@@ -19,10 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class WareHouseDepositList extends AbstractItemPacket
{
@@ -65,27 +64,26 @@ public class WareHouseDepositList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.WAREHOUSE_DEPOSIT_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_whType);
- packet.writeD(_items.size());
+ writeInt(_whType);
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
}
else
{
- packet.writeH(_whType);
- packet.writeQ(_playerAdena);
- packet.writeD(_itemsStackable.size());
- packet.writeD(_items.size());
+ writeShort(_whType);
+ writeLong(_playerAdena);
+ writeInt(_itemsStackable.size());
+ writeInt(_items.size());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
index 5ece99310a..4d18642747 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
@@ -20,10 +20,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
public class WareHouseWithdrawalList extends AbstractItemPacket
@@ -72,30 +71,29 @@ public class WareHouseWithdrawalList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.WAREHOUSE_WITHDRAW_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeH(0);
- packet.writeD(_invSize);
- packet.writeD(_items.size());
+ writeShort(0);
+ writeInt(_invSize);
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
- packet.writeD(0);
- packet.writeD(0);
+ writeItem(item);
+ writeInt(item.getObjectId());
+ writeInt(0);
+ writeInt(0);
}
}
else
{
- packet.writeH(_whType);
- packet.writeQ(_playerAdena);
- packet.writeD(_invSize);
- packet.writeD(_items.size());
+ writeShort(_whType);
+ writeLong(_playerAdena);
+ writeInt(_invSize);
+ writeInt(_items.size());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java
index aea1476fb2..f576b6a513 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.adenadistribution;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExDivideAdenaCancel implements IClientOutgoingPacket
+public class ExDivideAdenaCancel extends ServerPacket
{
public static final ExDivideAdenaCancel STATIC_PACKET = new ExDivideAdenaCancel();
@@ -32,10 +31,9 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet);
- packet.writeC(0); // TODO: Find me
- return true;
+ ServerPackets.EX_DIVIDE_ADENA_CANCEL.writeId(this);
+ writeByte(0); // TODO: Find me
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java
index de4e955aba..972b5ee4ff 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.adenadistribution;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExDivideAdenaDone implements IClientOutgoingPacket
+public class ExDivideAdenaDone extends ServerPacket
{
private final boolean _isPartyLeader;
private final boolean _isCCLeader;
@@ -43,15 +42,14 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet);
- packet.writeC(_isPartyLeader ? 1 : 0);
- packet.writeC(_isCCLeader ? 1 : 0);
- packet.writeD(_memberCount);
- packet.writeQ(_distributedAdenaCount);
- packet.writeQ(_adenaCount);
- packet.writeS(_distributorName);
- return true;
+ ServerPackets.EX_DIVIDE_ADENA_DONE.writeId(this);
+ writeByte(_isPartyLeader);
+ writeByte(_isCCLeader);
+ writeInt(_memberCount);
+ writeLong(_distributedAdenaCount);
+ writeLong(_adenaCount);
+ writeString(_distributorName);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java
index da0dba20b7..2a0b04d486 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.adenadistribution;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExDivideAdenaStart implements IClientOutgoingPacket
+public class ExDivideAdenaStart extends ServerPacket
{
public static final ExDivideAdenaStart STATIC_PACKET = new ExDivideAdenaStart();
@@ -32,9 +31,8 @@ public class ExDivideAdenaStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DIVIDE_ADENA_START.writeId(packet);
- return true;
+ ServerPackets.EX_DIVIDE_ADENA_START.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java
index a163a85735..74ec96a33b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.appearance;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType;
import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExChooseShapeShiftingItem implements IClientOutgoingPacket
+public class ExChooseShapeShiftingItem extends ServerPacket
{
private final AppearanceType _type;
private final AppearanceTargetType _targetType;
@@ -40,12 +39,11 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet);
- packet.writeD(_targetType != null ? _targetType.ordinal() : 0);
- packet.writeD(_type != null ? _type.ordinal() : 0);
- packet.writeD(_itemId);
- return true;
+ ServerPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(this);
+ writeInt(_targetType != null ? _targetType.ordinal() : 0);
+ writeInt(_type != null ? _type.ordinal() : 0);
+ writeInt(_itemId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java
index ba55887a1a..ba0f43a305 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.appearance;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket
+public class ExCuriousHouseMemberUpdate extends ServerPacket
{
public int _objId;
public int _maxHp;
@@ -42,14 +41,13 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(_maxHp);
- packet.writeD(_maxCp);
- packet.writeD(_currentHp);
- packet.writeD(_currentCp);
- return true;
+ ServerPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(this);
+ writeInt(_objId);
+ writeInt(_maxHp);
+ writeInt(_maxCp);
+ writeInt(_currentHp);
+ writeInt(_currentCp);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java
index be2d29d864..250c0bbcd9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.appearance;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket
+public class ExPutShapeShiftingExtractionItemResult extends ServerPacket
{
public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0);
public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1);
@@ -36,10 +35,9 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(this);
+ writeInt(_result);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java
index e84d7a7255..6a9f577e68 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.appearance;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket
+public class ExPutShapeShiftingTargetItemResult extends ServerPacket
{
public static final int RESULT_FAILED = 0;
public static final int RESULT_SUCCESS = 1;
@@ -40,11 +39,10 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet);
- packet.writeD(_resultId);
- packet.writeQ(_price);
- return true;
+ ServerPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(this);
+ writeInt(_resultId);
+ writeLong(_price);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java
index 038eae0042..5561af5f15 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.appearance;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExShapeShiftingResult implements IClientOutgoingPacket
+public class ExShapeShiftingResult extends ServerPacket
{
public static final int RESULT_FAILED = 0;
public static final int RESULT_SUCCESS = 1;
@@ -44,12 +43,11 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet);
- packet.writeD(_result);
- packet.writeD(_targetItemId);
- packet.writeD(_extractItemId);
- return true;
+ ServerPackets.EX_SHAPE_SHIFTING_RESULT.writeId(this);
+ writeInt(_result);
+ writeInt(_targetItemId);
+ writeInt(_extractItemId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java
index 4b48b09002..2084587520 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.attendance;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket
+public class ExConfirmVipAttendanceCheck extends ServerPacket
{
boolean _available;
int _index;
@@ -35,13 +34,12 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet);
- packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0
- packet.writeC(_index); // active reward index
- packet.writeD(0);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(this);
+ writeByte(_available); // can receive reward today? 1 else 0
+ writeByte(_index); // active reward index
+ writeInt(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java
index dd94df023f..eaf41b163a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java
@@ -16,18 +16,17 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.attendance;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.AttendanceRewardData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExVipAttendanceItemList implements IClientOutgoingPacket
+public class ExVipAttendanceItemList extends ServerPacket
{
boolean _available;
int _index;
@@ -40,28 +39,27 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet);
- packet.writeC(_available ? _index + 1 : _index); // index to receive?
- packet.writeC(_index); // last received index?
- packet.writeD(0);
- packet.writeD(0);
- packet.writeC(1);
- packet.writeC(_available ? 1 : 0); // player can receive reward today?
- packet.writeC(250);
- packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size
+ ServerPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(this);
+ writeByte(_available ? _index + 1 : _index); // index to receive?
+ writeByte(_index); // last received index?
+ writeInt(0);
+ writeInt(0);
+ writeByte(1);
+ writeByte(_available); // player can receive reward today?
+ writeByte(250);
+ writeByte(AttendanceRewardData.getInstance().getRewardsCount()); // reward size
int rewardCounter = 0;
for (ItemHolder reward : AttendanceRewardData.getInstance().getRewards())
{
rewardCounter++;
- packet.writeD(reward.getId());
- packet.writeQ(reward.getCount());
- packet.writeC(1); // is unknown?
- packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row?
+ writeInt(reward.getId());
+ writeLong(reward.getCount());
+ writeByte(1); // is unknown?
+ writeByte((rewardCounter % 7) == 0); // is last in row?
}
- packet.writeC(0);
- packet.writeD(0);
- return true;
+ writeByte(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeFail.java
index ec24470cc2..95cb2dbf72 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeFail.java
@@ -16,21 +16,19 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.attributechange;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExChangeAttributeFail implements IClientOutgoingPacket
+public class ExChangeAttributeFail extends ServerPacket
{
- public static final IClientOutgoingPacket STATIC = new ExChangeAttributeFail();
+ public static final ExChangeAttributeFail STATIC = new ExChangeAttributeFail();
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_ATTRIBUTE_FAIL.writeId(packet);
- return true;
+ ServerPackets.EX_CHANGE_ATTRIBUTE_FAIL.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java
index a161e90edf..f582749763 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java
@@ -19,16 +19,15 @@ package org.l2jmobius.gameserver.network.serverpackets.attributechange;
import java.util.EnumMap;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExChangeAttributeInfo implements IClientOutgoingPacket
+public class ExChangeAttributeInfo extends ServerPacket
{
private static final Map ATTRIBUTE_MASKS = new EnumMap<>(AttributeType.class);
static
@@ -59,12 +58,11 @@ public class ExChangeAttributeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_ATTRIBUTE_INFO.writeId(packet);
- packet.writeD(_crystalItemId);
- packet.writeD(_attributes);
- packet.writeD(_itemObjId);
- return true;
+ ServerPackets.EX_CHANGE_ATTRIBUTE_INFO.writeId(this);
+ writeInt(_crystalItemId);
+ writeInt(_attributes);
+ writeInt(_itemObjId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java
index bfb530ca83..30b8b09ddc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java
@@ -18,9 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets.attributechange;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ItemInfo;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -38,15 +37,14 @@ public class ExChangeAttributeItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet);
- packet.writeD(_itemId);
- packet.writeD(_itemsList.size());
+ ServerPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(this);
+ writeInt(_itemId);
+ writeInt(_itemsList.size());
for (ItemInfo item : _itemsList)
{
- writeItem(packet, item);
+ writeItem(item);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeOk.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeOk.java
index 956433f0aa..3fbfa8e4bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeOk.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeOk.java
@@ -16,21 +16,19 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.attributechange;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExChangeAttributeOk implements IClientOutgoingPacket
+public class ExChangeAttributeOk extends ServerPacket
{
- public static final IClientOutgoingPacket STATIC = new ExChangeAttributeOk();
+ public static final ExChangeAttributeOk STATIC = new ExChangeAttributeOk();
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CHANGE_ATTRIBUTE_OK.writeId(packet);
- return true;
+ ServerPackets.EX_CHANGE_ATTRIBUTE_OK.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java
index 9963a080c6..d789f92c80 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.autoplay;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ShortCuts;
import org.l2jmobius.gameserver.model.Shortcut;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExActivateAutoShortcut implements IClientOutgoingPacket
+public class ExActivateAutoShortcut extends ServerPacket
{
private final int _position;
private final boolean _active;
@@ -37,11 +36,10 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet);
- packet.writeH(_position);
- packet.writeC(_active ? 1 : 0);
- return true;
+ ServerPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(this);
+ writeShort(_position);
+ writeByte(_active);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlayDoMacro.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlayDoMacro.java
index fb4738cd0f..741145f3ee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlayDoMacro.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlayDoMacro.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.autoplay;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExAutoPlayDoMacro implements IClientOutgoingPacket
+public class ExAutoPlayDoMacro extends ServerPacket
{
public static final ExAutoPlayDoMacro STATIC_PACKET = new ExAutoPlayDoMacro();
@@ -32,10 +31,9 @@ public class ExAutoPlayDoMacro implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AUTOPLAY_DO_MACRO.writeId(packet);
- packet.writeD(0x114);
- return true;
+ ServerPackets.EX_AUTOPLAY_DO_MACRO.writeId(this);
+ writeInt(276);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlaySettingSend.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlaySettingSend.java
index 9f587f56b7..13858c88c5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlaySettingSend.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExAutoPlaySettingSend.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.autoplay;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author JoeAlisson
*/
-public class ExAutoPlaySettingSend implements IClientOutgoingPacket
+public class ExAutoPlaySettingSend extends ServerPacket
{
private final int _options;
private final boolean _active;
@@ -47,17 +46,16 @@ public class ExAutoPlaySettingSend implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AUTOPLAY_SETTING.writeId(packet);
- packet.writeH(_options);
- packet.writeC(_active ? 1 : 0);
- packet.writeC(_pickUp ? 1 : 0);
- packet.writeH(_nextTargetMode);
- packet.writeC(_shortRange ? 1 : 0);
- packet.writeD(_potionPercent);
- packet.writeD(_petPotionPercent); // 272
- packet.writeC(_respectfulHunting ? 1 : 0);
- return true;
+ ServerPackets.EX_AUTOPLAY_SETTING.writeId(this);
+ writeShort(_options);
+ writeByte(_active);
+ writeByte(_pickUp);
+ writeShort(_nextTargetMode);
+ writeByte(_shortRange);
+ writeInt(_potionPercent);
+ writeInt(_petPotionPercent); // 272
+ writeByte(_respectfulHunting);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionCancel.java
index 651bfa5b62..12dd7ac8e1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionCancel.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.blessing;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Horus, on 17.04.2021
+ * @author Horus
*/
-public class ExBlessOptionCancel implements IClientOutgoingPacket
+public class ExBlessOptionCancel extends ServerPacket
{
private final int _result;
@@ -33,10 +32,9 @@ public class ExBlessOptionCancel implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLESS_OPTION_CANCEL.writeId(packet);
- packet.writeC(_result);
- return true;
+ ServerPackets.EX_BLESS_OPTION_CANCEL.writeId(this);
+ writeByte(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionEnchant.java
index 24fb8ede5f..804c31bfc8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionEnchant.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionEnchant.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.blessing;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Horus, on 17.04.2021
+ * @author Horus
*/
-public class ExBlessOptionEnchant implements IClientOutgoingPacket
+public class ExBlessOptionEnchant extends ServerPacket
{
private final int _result;
@@ -33,10 +32,9 @@ public class ExBlessOptionEnchant implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLESS_OPTION_ENCHANT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_BLESS_OPTION_ENCHANT.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionPutItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionPutItem.java
index 93ccccf6ae..f0d9f045d3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionPutItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExBlessOptionPutItem.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.blessing;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Horus, on 17.04.2021
+ * @author Horus
*/
-public class ExBlessOptionPutItem implements IClientOutgoingPacket
+public class ExBlessOptionPutItem extends ServerPacket
{
private final int _result;
@@ -33,10 +32,9 @@ public class ExBlessOptionPutItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLESS_OPTION_PUT_ITEM.writeId(packet);
- packet.writeC(_result);
- return true;
+ ServerPackets.EX_BLESS_OPTION_PUT_ITEM.writeId(this);
+ writeByte(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExOpenBlessOptionScroll.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExOpenBlessOptionScroll.java
index 504f4445fb..0791ff1558 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExOpenBlessOptionScroll.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/blessing/ExOpenBlessOptionScroll.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.blessing;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Horus, on 17.04.2021
+ * @author Horus
*/
-public class ExOpenBlessOptionScroll implements IClientOutgoingPacket
+public class ExOpenBlessOptionScroll extends ServerPacket
{
private final int _itemId;
@@ -33,10 +32,9 @@ public class ExOpenBlessOptionScroll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_OPEN_BLESS_OPTION_SCROLL.writeId(packet);
- packet.writeD(_itemId);
- return true;
+ ServerPackets.EX_OPEN_BLESS_OPTION_SCROLL.writeId(this);
+ writeInt(_itemId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/classchange/ExClassChangeSetAlarm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/classchange/ExClassChangeSetAlarm.java
index 8ad26ee170..960efca7ad 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/classchange/ExClassChangeSetAlarm.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/classchange/ExClassChangeSetAlarm.java
@@ -16,25 +16,23 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.classchange;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExClassChangeSetAlarm implements IClientOutgoingPacket
+public class ExClassChangeSetAlarm extends ServerPacket
{
- public static final IClientOutgoingPacket STATIC_PACKET = new ExClassChangeSetAlarm();
+ public static final ExClassChangeSetAlarm STATIC_PACKET = new ExClassChangeSetAlarm();
public ExClassChangeSetAlarm()
{
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CLASS_CHANGE_SET_ALARM.writeId(packet);
- return true;
+ ServerPackets.EX_CLASS_CHANGE_SET_ALARM.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java
index 6a9a1ae36a..8f48bcaa00 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java
@@ -16,20 +16,18 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.collection;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExCollectionCloseUI implements IClientOutgoingPacket
+public class ExCollectionCloseUI extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_CLOSE_UI.writeId(packet);
- packet.writeC(0);
- return true;
+ ServerPackets.EX_COLLECTION_CLOSE_UI.writeId(this);
+ writeByte(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionComplete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionComplete.java
index 664309481f..e48400553a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionComplete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionComplete.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.collection;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* Written by Berezkin Nikolay, on 13.04.2021
*/
-public class ExCollectionComplete implements IClientOutgoingPacket
+public class ExCollectionComplete extends ServerPacket
{
private final int _collectionId;
@@ -33,10 +32,9 @@ public class ExCollectionComplete implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_COMPLETE.writeId(packet);
- packet.writeH(_collectionId);
- return true;
+ ServerPackets.EX_COLLECTION_COMPLETE.writeId(this);
+ writeShort(_collectionId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java
index 92ae04b2ba..9a6a68bf55 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java
@@ -16,20 +16,18 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.collection;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExCollectionFavoriteList implements IClientOutgoingPacket
+public class ExCollectionFavoriteList extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_FAVORITE_LIST.writeId(packet);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_COLLECTION_FAVORITE_LIST.writeId(this);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java
index 8c5acc7c08..6749f885bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java
@@ -20,17 +20,16 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.CollectionData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.PlayerCollectionData;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* Written by Berezkin Nikolay, on 12.04.2021
*/
-public class ExCollectionInfo implements IClientOutgoingPacket
+public class ExCollectionInfo extends ServerPacket
{
final Player _Player;
final List _categoryList;
@@ -48,37 +47,36 @@ public class ExCollectionInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_INFO.writeId(packet);
- packet.writeD(_collections.size()); // size
+ ServerPackets.EX_COLLECTION_INFO.writeId(this);
+ writeInt(_collections.size()); // size
for (Integer collection : _collections)
{
final List collectionCurrent = _categoryList.stream().filter(it -> it.getCollectionId() == collection).collect(Collectors.toList());
- packet.writeD(collectionCurrent.size());
+ writeInt(collectionCurrent.size());
for (PlayerCollectionData current : collectionCurrent)
{
- packet.writeC(current.getIndex());
- packet.writeD(current.getItemId());
- packet.writeH(CollectionData.getInstance().getCollection(collection).getItems().get(current.getIndex()).getEnchantLevel()); // enchant level
- packet.writeC(0); // unk flag for item
- packet.writeD(1); // count
+ writeByte(current.getIndex());
+ writeInt(current.getItemId());
+ writeShort(CollectionData.getInstance().getCollection(collection).getItems().get(current.getIndex()).getEnchantLevel()); // enchant level
+ writeByte(0); // unk flag for item
+ writeInt(1); // count
}
- packet.writeH(collection);
+ writeShort(collection);
}
- packet.writeD(_favoriteList.size()); // favourite size
+ writeInt(_favoriteList.size()); // favourite size
for (int favoriteCollection : _favoriteList)
{
- packet.writeH(favoriteCollection);
+ writeShort(favoriteCollection);
}
- packet.writeD(0);
+ writeInt(0);
// loop unk
// 1 h
// d
// h
// loop end
- packet.writeC(_category);
- packet.writeH(0);
- return true;
+ writeByte(_category);
+ writeShort(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionList.java
index ae4fda8c26..7ccdee322b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionList.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.collection;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExCollectionList implements IClientOutgoingPacket
+public class ExCollectionList extends ServerPacket
{
private final int _category;
@@ -33,11 +32,10 @@ public class ExCollectionList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_LIST.writeId(packet);
- packet.writeC(_category);
- packet.writeD(0); // size & loop body
- return true;
+ ServerPackets.EX_COLLECTION_LIST.writeId(this);
+ writeByte(_category);
+ writeInt(0); // size & loop body
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionOpenUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionOpenUI.java
index 05b3398d25..d5c720b33d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionOpenUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionOpenUI.java
@@ -16,20 +16,18 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.collection;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExCollectionOpenUI implements IClientOutgoingPacket
+public class ExCollectionOpenUI extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_OPEN_UI.writeId(packet);
- packet.writeC(0); // unk and may be unk D too
- return true;
+ ServerPackets.EX_COLLECTION_OPEN_UI.writeId(this);
+ writeByte(0); // unk and may be unk D too
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java
index d4351a66f9..a77a43b37b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* Written by Berezkin Nikolay, on 12.04.2021
*/
-public class ExCollectionRegister implements IClientOutgoingPacket
+public class ExCollectionRegister extends ServerPacket
{
private final int _collectionId;
private final int _index;
@@ -38,18 +37,17 @@ public class ExCollectionRegister implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_REGISTER.writeId(packet);
- packet.writeH(_collectionId);
- packet.writeC(1);
- packet.writeC(0x0E);
- packet.writeC(0);
- packet.writeC(_index);
- packet.writeD(_item.getId());
- packet.writeH(0);
- packet.writeC(0);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_COLLECTION_REGISTER.writeId(this);
+ writeShort(_collectionId);
+ writeByte(1);
+ writeByte(0x0E);
+ writeByte(0);
+ writeByte(_index);
+ writeInt(_item.getId());
+ writeShort(0);
+ writeByte(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionUpdateFavorite.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionUpdateFavorite.java
index 74755ddf90..950a09dc58 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionUpdateFavorite.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionUpdateFavorite.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.collection;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 12.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExCollectionUpdateFavorite implements IClientOutgoingPacket
+public class ExCollectionUpdateFavorite extends ServerPacket
{
private final int _isAdd;
private final int _collectionId;
@@ -35,11 +34,10 @@ public class ExCollectionUpdateFavorite implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_COLLECTION_UPDATE_FAVORITE.writeId(packet);
- packet.writeC(_isAdd);
- packet.writeH(_collectionId);
- return true;
+ ServerPackets.EX_COLLECTION_UPDATE_FAVORITE.writeId(this);
+ writeByte(_isAdd);
+ writeShort(_collectionId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java
index ddf0dfeb17..a55aa8ca54 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.commission;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NosBit
*/
-public class ExCloseCommission implements IClientOutgoingPacket
+public class ExCloseCommission extends ServerPacket
{
public static final ExCloseCommission STATIC_PACKET = new ExCloseCommission();
@@ -32,9 +31,8 @@ public class ExCloseCommission implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CLOSE_COMMISSION.writeId(packet);
- return true;
+ ServerPackets.EX_CLOSE_COMMISSION.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java
index c79b68becc..fb96d6dabf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.commission;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.commission.CommissionItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -36,17 +35,16 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet);
- packet.writeD(_commissionItem != null ? 1 : 0);
+ ServerPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(this);
+ writeInt(_commissionItem != null);
if (_commissionItem != null)
{
- packet.writeQ(_commissionItem.getPricePerUnit());
- packet.writeQ(_commissionItem.getCommissionId());
- packet.writeD(0); // CommissionItemType seems client does not really need it.
- writeItem(packet, _commissionItem.getItemInfo());
+ writeLong(_commissionItem.getPricePerUnit());
+ writeLong(_commissionItem.getCommissionId());
+ writeInt(0); // CommissionItemType seems client does not really need it.
+ writeItem(_commissionItem.getItemInfo());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java
index c1d29735b8..bd81f63aa1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.commission;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.commission.CommissionItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NosBit
*/
-public class ExResponseCommissionBuyItem implements IClientOutgoingPacket
+public class ExResponseCommissionBuyItem extends ServerPacket
{
public static final ExResponseCommissionBuyItem FAILED = new ExResponseCommissionBuyItem(null);
@@ -37,17 +36,16 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet);
- packet.writeD(_commissionItem != null ? 1 : 0);
+ ServerPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(this);
+ writeInt(_commissionItem != null);
if (_commissionItem != null)
{
final ItemInfo itemInfo = _commissionItem.getItemInfo();
- packet.writeD(itemInfo.getEnchantLevel());
- packet.writeD(itemInfo.getItem().getId());
- packet.writeQ(itemInfo.getCount());
+ writeInt(itemInfo.getEnchantLevel());
+ writeInt(itemInfo.getItem().getId());
+ writeLong(itemInfo.getCount());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java
index 01e4782408..5345dbdc54 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.commission;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NosBit
*/
-public class ExResponseCommissionDelete implements IClientOutgoingPacket
+public class ExResponseCommissionDelete extends ServerPacket
{
public static final ExResponseCommissionDelete SUCCEED = new ExResponseCommissionDelete(1);
public static final ExResponseCommissionDelete FAILED = new ExResponseCommissionDelete(0);
@@ -36,10 +35,9 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java
index b915574175..87b521a54d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.commission;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NosBit
*/
-public class ExResponseCommissionInfo implements IClientOutgoingPacket
+public class ExResponseCommissionInfo extends ServerPacket
{
public static final ExResponseCommissionInfo EMPTY = new ExResponseCommissionInfo();
@@ -52,14 +51,13 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet);
- packet.writeD(_result);
- packet.writeD(_itemId);
- packet.writeQ(_presetPricePerUnit);
- packet.writeQ(_presetAmount);
- packet.writeD(_presetDurationType);
- return true;
+ ServerPackets.EX_RESPONSE_COMMISSION_INFO.writeId(this);
+ writeInt(_result);
+ writeInt(_itemId);
+ writeLong(_presetPricePerUnit);
+ writeLong(_presetAmount);
+ writeInt(_presetDurationType);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java
index c32d4f7c04..8067f5324b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java
@@ -18,9 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets.commission;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -38,24 +37,23 @@ public class ExResponseCommissionItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet);
- packet.writeC(_sendType);
+ ServerPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(this);
+ writeByte(_sendType);
if (_sendType == 2)
{
- packet.writeD(_items.size());
- packet.writeD(_items.size());
- for (Item itemInstance : _items)
+ writeInt(_items.size());
+ writeInt(_items.size());
+ for (Item item : _items)
{
- writeItem(packet, itemInstance);
+ writeItem(item);
}
}
else
{
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java
index a012b3ab30..9a7be78bf5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java
@@ -20,9 +20,8 @@ import java.time.Instant;
import java.util.Collections;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.commission.CommissionItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -61,38 +60,37 @@ public class ExResponseCommissionList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet);
- packet.writeD(_replyType.getClientId());
+ ServerPackets.EX_RESPONSE_COMMISSION_LIST.writeId(this);
+ writeInt(_replyType.getClientId());
switch (_replyType)
{
case PLAYER_AUCTIONS:
case AUCTIONS:
{
- packet.writeD((int) Instant.now().getEpochSecond());
- packet.writeD(_chunkId);
+ writeInt((int) Instant.now().getEpochSecond());
+ writeInt(_chunkId);
int chunkSize = _items.size() - _listIndexStart;
if (chunkSize > MAX_CHUNK_SIZE)
{
chunkSize = MAX_CHUNK_SIZE;
}
- packet.writeD(chunkSize);
+ writeInt(chunkSize);
for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++)
{
final CommissionItem commissionItem = _items.get(i);
- packet.writeQ(commissionItem.getCommissionId());
- packet.writeQ(commissionItem.getPricePerUnit());
- packet.writeD(0); // CommissionItemType seems client does not really need it.
- packet.writeD((commissionItem.getDurationInDays() - 1) / 2);
- packet.writeD((int) commissionItem.getEndTime().getEpochSecond());
- packet.writeS(null); // Seller Name its not displayed somewhere so i am not sending it to decrease traffic.
- writeItem(packet, commissionItem.getItemInfo());
+ writeLong(commissionItem.getCommissionId());
+ writeLong(commissionItem.getPricePerUnit());
+ writeInt(0); // CommissionItemType seems client does not really need it.
+ writeInt((commissionItem.getDurationInDays() - 1) / 2);
+ writeInt((int) commissionItem.getEndTime().getEpochSecond());
+ writeString(null); // Seller Name its not displayed somewhere so i am not sending it to decrease traffic.
+ writeItem(commissionItem.getItemInfo());
}
break;
}
}
- return true;
}
public enum CommissionListReplyType
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java
index 183547af06..02a1d2b92b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.commission;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NosBit
*/
-public class ExResponseCommissionRegister implements IClientOutgoingPacket
+public class ExResponseCommissionRegister extends ServerPacket
{
public static final ExResponseCommissionRegister SUCCEED = new ExResponseCommissionRegister(1);
public static final ExResponseCommissionRegister FAILED = new ExResponseCommissionRegister(0);
@@ -36,10 +35,9 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java
index b68386e4ed..2ffb272003 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.commission;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NosBit
*/
-public class ExShowCommission implements IClientOutgoingPacket
+public class ExShowCommission extends ServerPacket
{
public static final ExShowCommission STATIC_PACKET = new ExShowCommission();
@@ -32,10 +31,9 @@ public class ExShowCommission implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet);
- packet.writeD(1);
- return true;
+ ServerPackets.EX_SHOW_COMMISSION.writeId(this);
+ writeInt(1);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java
index 11b1ff1e0a..b154ce20cc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantFail implements IClientOutgoingPacket
+public class ExEnchantFail extends ServerPacket
{
public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0);
@@ -37,11 +36,10 @@ public class ExEnchantFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet);
- packet.writeD(_itemOne);
- packet.writeD(_itemTwo);
- return true;
+ ServerPackets.EX_ENCHANT_FAIL.writeId(this);
+ writeInt(_itemOne);
+ writeInt(_itemTwo);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java
index 4868e22ffc..67c93e5048 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantOneFail implements IClientOutgoingPacket
+public class ExEnchantOneFail extends ServerPacket
{
public static final ExEnchantOneFail STATIC_PACKET = new ExEnchantOneFail();
@@ -32,9 +31,8 @@ public class ExEnchantOneFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_ONE_FAIL.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_ONE_FAIL.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index 72c690cc2d..16e96a30cb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -16,21 +16,19 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantOneOK implements IClientOutgoingPacket
+public class ExEnchantOneOK extends ServerPacket
{
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_ONE_OK.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_ONE_OK.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java
index 7c89326466..debbf4b09c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantOneRemoveFail implements IClientOutgoingPacket
+public class ExEnchantOneRemoveFail extends ServerPacket
{
public static final ExEnchantOneRemoveFail STATIC_PACKET = new ExEnchantOneRemoveFail();
@@ -32,9 +31,8 @@ public class ExEnchantOneRemoveFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_ONE_REMOVE_FAIL.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_ONE_REMOVE_FAIL.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java
index 6aceb10f43..47ed9fdd4f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantOneRemoveOK implements IClientOutgoingPacket
+public class ExEnchantOneRemoveOK extends ServerPacket
{
public static final ExEnchantOneRemoveOK STATIC_PACKET = new ExEnchantOneRemoveOK();
@@ -32,9 +31,8 @@ public class ExEnchantOneRemoveOK implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_ONE_REMOVE_OK.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_ONE_REMOVE_OK.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemFail.java
index 027b851b25..08bc1bff5e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemFail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExEnchantRetryToPutItemFail implements IClientOutgoingPacket
+public class ExEnchantRetryToPutItemFail extends ServerPacket
{
public static final ExEnchantRetryToPutItemFail STATIC_PACKET = new ExEnchantRetryToPutItemFail();
@@ -32,9 +31,8 @@ public class ExEnchantRetryToPutItemFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_FAIL.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_FAIL.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemOk.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemOk.java
index 53c64e485a..819d5ac28e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemOk.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemOk.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExEnchantRetryToPutItemOk implements IClientOutgoingPacket
+public class ExEnchantRetryToPutItemOk extends ServerPacket
{
public static final ExEnchantRetryToPutItemOk STATIC_PACKET = new ExEnchantRetryToPutItemOk();
@@ -32,9 +31,8 @@ public class ExEnchantRetryToPutItemOk implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_OK.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_RETRY_TO_PUT_ITEM_OK.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java
index 87d29a8e7c..551790a745 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantSucess implements IClientOutgoingPacket
+public class ExEnchantSucess extends ServerPacket
{
private final int _itemId;
@@ -33,10 +32,9 @@ public class ExEnchantSucess implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet);
- packet.writeD(_itemId);
- return true;
+ ServerPackets.EX_ENCHANT_SUCESS.writeId(this);
+ writeInt(_itemId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java
index 1c992b0cf6..acc7019295 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantTwoFail implements IClientOutgoingPacket
+public class ExEnchantTwoFail extends ServerPacket
{
public static final ExEnchantTwoFail STATIC_PACKET = new ExEnchantTwoFail();
@@ -32,9 +31,8 @@ public class ExEnchantTwoFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_TWO_FAIL.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_TWO_FAIL.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java
index faf828c160..2402a5222e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantTwoOK implements IClientOutgoingPacket
+public class ExEnchantTwoOK extends ServerPacket
{
public static final ExEnchantTwoOK STATIC_PACKET = new ExEnchantTwoOK();
@@ -32,9 +31,8 @@ public class ExEnchantTwoOK implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_TWO_OK.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_TWO_OK.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java
index 31929740bc..c34d72e4b0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantTwoRemoveFail implements IClientOutgoingPacket
+public class ExEnchantTwoRemoveFail extends ServerPacket
{
public static final ExEnchantTwoRemoveFail STATIC_PACKET = new ExEnchantTwoRemoveFail();
@@ -32,9 +31,8 @@ public class ExEnchantTwoRemoveFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_TWO_REMOVE_FAIL.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_TWO_REMOVE_FAIL.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java
index 11dfd4b3c0..2d94c7df0d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.compound;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnchantTwoRemoveOK implements IClientOutgoingPacket
+public class ExEnchantTwoRemoveOK extends ServerPacket
{
public static final ExEnchantTwoRemoveOK STATIC_PACKET = new ExEnchantTwoRemoveOK();
@@ -32,9 +31,8 @@ public class ExEnchantTwoRemoveOK implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_TWO_REMOVE_OK.writeId(packet);
- return true;
+ ServerPackets.EX_ENCHANT_TWO_REMOVE_OK.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java
index ec67d50fb6..9fa61ff1d6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets.crystalization;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExGetCrystalizingEstimation implements IClientOutgoingPacket
+public class ExGetCrystalizingEstimation extends ServerPacket
{
private final List _items;
@@ -36,16 +35,15 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet);
- packet.writeD(_items.size());
+ ServerPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(this);
+ writeInt(_items.size());
for (ItemChanceHolder holder : _items)
{
- packet.writeD(holder.getId());
- packet.writeQ(holder.getCount());
- packet.writeF(holder.getChance());
+ writeInt(holder.getId());
+ writeLong(holder.getCount());
+ writeDouble(holder.getChance());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java
index ebf5b64751..3f6c5d03ed 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.dailymission;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw, Ren
*/
-public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
+public class ExConnectedTimeAndGettableReward extends ServerPacket
{
private final int _oneDayRewardAvailableCount;
@@ -35,26 +34,25 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (!DailyMissionData.getInstance().isAvailable())
{
- return true;
+ return;
}
- OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet);
- packet.writeD(0);
- packet.writeD(_oneDayRewardAvailableCount);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(this);
+ writeInt(0);
+ writeInt(_oneDayRewardAvailableCount);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
index 0e816bc6b4..6fd56f5f99 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
@@ -20,18 +20,17 @@ import java.time.LocalDate;
import java.util.Collection;
import java.util.Collections;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.commons.time.SchedulingPattern;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExOneDayReceiveRewardList implements IClientOutgoingPacket
+public class ExOneDayReceiveRewardList extends ServerPacket
{
private static final SchedulingPattern DAILY_REUSE_PATTERN = new SchedulingPattern("30 6 * * *");
private static final SchedulingPattern WEEKLY_REUSE_PATTERN = new SchedulingPattern("30 6 * * 1");
@@ -53,30 +52,29 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (!DailyMissionData.getInstance().isAvailable())
{
- return true;
+ return;
}
- OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet);
- packet.writeD(_dayRemainTime);
- packet.writeD(_weekRemainTime);
- packet.writeD(_monthRemainTime);
- packet.writeC(0x17);
- packet.writeD(_player.getClassId().getId());
- packet.writeD(LocalDate.now().getDayOfWeek().ordinal()); // Day of week
- packet.writeD(_rewards.size());
+ ServerPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(this);
+ writeInt(_dayRemainTime);
+ writeInt(_weekRemainTime);
+ writeInt(_monthRemainTime);
+ writeByte(0x17);
+ writeInt(_player.getClassId().getId());
+ writeInt(LocalDate.now().getDayOfWeek().ordinal()); // Day of week
+ writeInt(_rewards.size());
for (DailyMissionDataHolder reward : _rewards)
{
- packet.writeH(reward.getId());
+ writeShort(reward.getId());
final int status = reward.getStatus(_player);
- packet.writeC(status);
- packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0);
- packet.writeD(reward.getParams().getInt("level", -1) == -1 ? (status == 1 ? 0 : reward.getProgress(_player)) : _player.getLevel());
- packet.writeD(reward.getRequiredCompletions());
+ writeByte(status);
+ writeByte(reward.getRequiredCompletions() > 1);
+ writeInt(reward.getParams().getInt("level", -1) == -1 ? (status == 1 ? 0 : reward.getProgress(_player)) : _player.getLevel());
+ writeInt(reward.getRequiredCompletions());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java
index 03c8bc9b68..e407ae01e8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java
@@ -16,38 +16,37 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ElementalSpirit;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author JoeAlisson
*/
-abstract class AbstractElementalSpiritPacket implements IClientOutgoingPacket
+abstract class AbstractElementalSpiritPacket extends ServerPacket
{
- void writeSpiritInfo(PacketWriter packet, ElementalSpirit spirit)
+ void writeSpiritInfo(ElementalSpirit spirit)
{
- packet.writeC(spirit.getStage());
- packet.writeD(spirit.getNpcId());
- packet.writeQ(spirit.getExperience());
- packet.writeQ(spirit.getExperienceToNextLevel());
- packet.writeQ(spirit.getExperienceToNextLevel());
- packet.writeD(spirit.getLevel());
- packet.writeD(spirit.getMaxLevel());
- packet.writeD(spirit.getAvailableCharacteristicsPoints());
- packet.writeD(spirit.getAttackPoints());
- packet.writeD(spirit.getDefensePoints());
- packet.writeD(spirit.getCriticalRatePoints());
- packet.writeD(spirit.getCriticalDamagePoints());
- packet.writeD(spirit.getMaxCharacteristics());
- packet.writeD(spirit.getMaxCharacteristics());
- packet.writeD(spirit.getMaxCharacteristics());
- packet.writeD(spirit.getMaxCharacteristics());
- packet.writeC(1); // unk
+ writeByte(spirit.getStage());
+ writeInt(spirit.getNpcId());
+ writeLong(spirit.getExperience());
+ writeLong(spirit.getExperienceToNextLevel());
+ writeLong(spirit.getExperienceToNextLevel());
+ writeInt(spirit.getLevel());
+ writeInt(spirit.getMaxLevel());
+ writeInt(spirit.getAvailableCharacteristicsPoints());
+ writeInt(spirit.getAttackPoints());
+ writeInt(spirit.getDefensePoints());
+ writeInt(spirit.getCriticalRatePoints());
+ writeInt(spirit.getCriticalDamagePoints());
+ writeInt(spirit.getMaxCharacteristics());
+ writeInt(spirit.getMaxCharacteristics());
+ writeInt(spirit.getMaxCharacteristics());
+ writeInt(spirit.getMaxCharacteristics());
+ writeByte(1); // unk
for (int j = 0; j < 1; j++)
{
- packet.writeH(2);
- packet.writeQ(100);
+ writeShort(2);
+ writeLong(100);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorb.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorb.java
index b639d2a8de..0889366683 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorb.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorb.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JoeAlisson
@@ -31,10 +30,9 @@ public class ElementalSpiritAbsorb extends UpdateElementalSpiritPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB.writeId(packet);
- writeUpdate(packet);
- return true;
+ ServerPackets.EX_ELEMENTAL_SPIRIT_ABSORB.writeId(this);
+ writeUpdate();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java
index 53c6d5b3e9..fa46558725 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java
@@ -18,19 +18,18 @@ package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ElementalSpiritAbsorbItemHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author JoeAlisson
*/
-public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket
+public class ElementalSpiritAbsorbInfo extends ServerPacket
{
private final Player _player;
private final byte _type;
@@ -42,32 +41,31 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(packet);
+ ServerPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(this);
final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type));
if (spirit == null)
{
- packet.writeC(0);
- packet.writeC(0);
- return true;
+ writeByte(0);
+ writeByte(0);
+ return;
}
- packet.writeC(1);
- packet.writeC(_type);
- packet.writeC(spirit.getStage());
- packet.writeQ(spirit.getExperience());
- packet.writeQ(spirit.getExperienceToNextLevel()); // NextExp
- packet.writeQ(spirit.getExperienceToNextLevel()); // MaxExp
- packet.writeD(spirit.getLevel());
- packet.writeD(spirit.getMaxLevel());
+ writeByte(1);
+ writeByte(_type);
+ writeByte(spirit.getStage());
+ writeLong(spirit.getExperience());
+ writeLong(spirit.getExperienceToNextLevel()); // NextExp
+ writeLong(spirit.getExperienceToNextLevel()); // MaxExp
+ writeInt(spirit.getLevel());
+ writeInt(spirit.getMaxLevel());
final List absorbItems = spirit.getAbsorbItems();
- packet.writeD(absorbItems.size()); // AbsorbCount
+ writeInt(absorbItems.size()); // AbsorbCount
for (ElementalSpiritAbsorbItemHolder absorbItem : absorbItems)
{
- packet.writeD(absorbItem.getId());
- packet.writeD(CommonUtil.zeroIfNullOrElse(_player.getInventory().getItemByItemId(absorbItem.getId()), item -> (int) item.getCount()));
- packet.writeD(absorbItem.getExperience());
+ writeInt(absorbItem.getId());
+ writeInt(CommonUtil.zeroIfNullOrElse(_player.getInventory().getItemByItemId(absorbItem.getId()), item -> (int) item.getCount()));
+ writeInt(absorbItem.getExperience());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolution.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolution.java
index b5e807043e..ee3279520b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolution.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolution.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JoeAlisson
@@ -31,10 +30,9 @@ public class ElementalSpiritEvolution extends UpdateElementalSpiritPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION.writeId(packet);
- writeUpdate(packet);
- return true;
+ ServerPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION.writeId(this);
+ writeUpdate();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java
index 7012b8a7a2..5dd7d82912 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java
@@ -18,18 +18,17 @@ package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author JoeAlisson
*/
-public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket
+public class ElementalSpiritEvolutionInfo extends ServerPacket
{
private final Player _player;
private final byte _type;
@@ -41,28 +40,27 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(packet);
+ ServerPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(this);
final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type));
if (spirit == null)
{
- packet.writeC(0);
- packet.writeD(0);
- return true;
+ writeByte(0);
+ writeInt(0);
+ return;
}
- packet.writeC(_type);
- packet.writeD(spirit.getNpcId());
- packet.writeD(1); // unk
- packet.writeD(spirit.getStage());
- packet.writeF(100); // chance ??
+ writeByte(_type);
+ writeInt(spirit.getNpcId());
+ writeInt(1); // unk
+ writeInt(spirit.getStage());
+ writeDouble(100); // chance ??
final List items = spirit.getItemsToEvolve();
- packet.writeD(items.size());
+ writeInt(items.size());
for (ItemHolder item : items)
{
- packet.writeD(item.getId());
- packet.writeQ(item.getCount());
+ writeInt(item.getId());
+ writeLong(item.getCount());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtract.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtract.java
index ed93cbaaea..5491ddc608 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtract.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtract.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JoeAlisson
@@ -31,10 +30,9 @@ public class ElementalSpiritExtract extends UpdateElementalSpiritPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT.writeId(packet);
- writeUpdate(packet);
- return true;
+ ServerPackets.EX_ELEMENTAL_SPIRIT_EXTRACT.writeId(this);
+ writeUpdate();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java
index 030eec0eb4..4a732f9330 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java
@@ -16,18 +16,17 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.ElementalSpiritData;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author JoeAlisson
*/
-public class ElementalSpiritExtractInfo implements IClientOutgoingPacket
+public class ElementalSpiritExtractInfo extends ServerPacket
{
private final Player _player;
private final byte _type;
@@ -39,24 +38,23 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(packet);
+ ServerPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(this);
final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type));
if (spirit == null)
{
- packet.writeC(0);
- packet.writeC(0);
- return true;
+ writeByte(0);
+ writeByte(0);
+ return;
}
- packet.writeC(_type); // active elemental spirit
- packet.writeC(1); // is extract ?
- packet.writeC(1); // cost count
+ writeByte(_type); // active elemental spirit
+ writeByte(1); // is extract ?
+ writeByte(1); // cost count
// for each cost count
- packet.writeD(57); // item id
- packet.writeD(ElementalSpiritData.EXTRACT_FEES[spirit.getStage() - 1]); // item count
- packet.writeD(spirit.getExtractItem());
- packet.writeD(spirit.getExtractAmount());
- return true;
+ writeInt(57); // item id
+ writeInt(ElementalSpiritData.EXTRACT_FEES[spirit.getStage() - 1]); // item count
+ writeInt(spirit.getExtractItem());
+ writeInt(spirit.getExtractAmount());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java
index ba363bf243..a4364b3956 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JoeAlisson
@@ -38,33 +37,32 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet);
+ ServerPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(this);
final ElementalSpirit[] spirits = _player.getSpirits();
if (spirits == null)
{
- packet.writeC(0);
- packet.writeC(0);
- packet.writeC(0);
- return true;
+ writeByte(0);
+ writeByte(0);
+ writeByte(0);
+ return;
}
- packet.writeC(_type); // show spirit info window 1; Change type 2; Only update 0
- packet.writeC(_spiritType);
- packet.writeC(spirits.length); // spirit count
+ writeByte(_type); // show spirit info window 1; Change type 2; Only update 0
+ writeByte(_spiritType);
+ writeByte(spirits.length); // spirit count
for (ElementalSpirit spirit : spirits)
{
- packet.writeC(spirit.getType());
- packet.writeC(1); // spirit active ?
+ writeByte(spirit.getType());
+ writeByte(1); // spirit active ?
// if active
- writeSpiritInfo(packet, spirit);
+ writeSpiritInfo(spirit);
}
- packet.writeD(1); // Reset talent items count
+ writeInt(1); // Reset talent items count
for (int j = 0; j < 1; j++)
{
- packet.writeD(57);
- packet.writeQ(50000);
+ writeInt(57);
+ writeLong(50000);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritSetTalent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritSetTalent.java
index e5ed380ca8..e514e456bb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritSetTalent.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritSetTalent.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JoeAlisson
@@ -31,10 +30,9 @@ public class ElementalSpiritSetTalent extends UpdateElementalSpiritPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_SET_TALENT.writeId(packet);
- writeUpdate(packet);
- return true;
+ ServerPackets.EX_ELEMENTAL_SPIRIT_SET_TALENT.writeId(this);
+ writeUpdate();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java
index 66488267d4..331d900b51 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author JoeAlisson
*/
-public class ExElementalSpiritGetExp implements IClientOutgoingPacket
+public class ExElementalSpiritGetExp extends ServerPacket
{
private final long _experience;
private final byte _type;
@@ -35,11 +34,10 @@ public class ExElementalSpiritGetExp implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(packet);
- packet.writeC(_type);
- packet.writeQ(_experience);
- return true;
+ ServerPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(this);
+ writeByte(_type);
+ writeLong(_experience);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritInfo.java
index db788c9675..cd785539b3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritInfo.java
@@ -16,19 +16,17 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExElementalSpiritInfo implements IClientOutgoingPacket
+public class ExElementalSpiritInfo extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet);
- return true;
+ ServerPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java
index 8f5cfd3c98..2be655d8b1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.elementalspirits;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ElementalType;
import org.l2jmobius.gameserver.model.ElementalSpirit;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,10 +36,10 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri
_update = update;
}
- protected void writeUpdate(PacketWriter packet)
+ protected void writeUpdate()
{
- packet.writeC(_update ? 1 : 0);
- packet.writeC(_type);
+ writeByte(_update);
+ writeByte(_type);
if (_update)
{
final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type));
@@ -48,8 +47,8 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri
{
return;
}
- packet.writeC(_type);
- writeSpiritInfo(packet, spirit);
+ writeByte(_type);
+ writeSpiritInfo(spirit);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java
index ebd49a889e..b5ceeb9332 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.ensoul;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ensoul.EnsoulOption;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExEnSoulExtractionResult implements IClientOutgoingPacket
+public class ExEnSoulExtractionResult extends ServerPacket
{
private final boolean _success;
private final Item _item;
@@ -37,23 +36,22 @@ public class ExEnSoulExtractionResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENSOUL_EXTRACTION_RESULT.writeId(packet);
- packet.writeC(_success ? 1 : 0);
+ ServerPackets.EX_ENSOUL_EXTRACTION_RESULT.writeId(this);
+ writeByte(_success);
if (_success)
{
- packet.writeC(_item.getSpecialAbilities().size());
+ writeByte(_item.getSpecialAbilities().size());
for (EnsoulOption option : _item.getSpecialAbilities())
{
- packet.writeD(option.getId());
+ writeInt(option.getId());
}
- packet.writeC(_item.getAdditionalSpecialAbilities().size());
+ writeByte(_item.getAdditionalSpecialAbilities().size());
for (EnsoulOption option : _item.getAdditionalSpecialAbilities())
{
- packet.writeD(option.getId());
+ writeInt(option.getId());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java
index 05771d7bdf..3185c13c2d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.ensoul;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ensoul.EnsoulOption;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExEnsoulResult implements IClientOutgoingPacket
+public class ExEnsoulResult extends ServerPacket
{
private final int _success;
private final Item _item;
@@ -37,20 +36,19 @@ public class ExEnsoulResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENSOUL_RESULT.writeId(packet);
- packet.writeC(_success); // success / failure
- packet.writeC(_item.getSpecialAbilities().size());
+ ServerPackets.EX_ENSOUL_RESULT.writeId(this);
+ writeByte(_success); // success / failure
+ writeByte(_item.getSpecialAbilities().size());
for (EnsoulOption option : _item.getSpecialAbilities())
{
- packet.writeD(option.getId());
+ writeInt(option.getId());
}
- packet.writeC(_item.getAdditionalSpecialAbilities().size());
+ writeByte(_item.getAdditionalSpecialAbilities().size());
for (EnsoulOption option : _item.getAdditionalSpecialAbilities())
{
- packet.writeD(option.getId());
+ writeInt(option.getId());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulExtractionWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulExtractionWindow.java
index 72a02e84ac..cf0a3bf2e0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulExtractionWindow.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulExtractionWindow.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.ensoul;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExShowEnsoulExtractionWindow implements IClientOutgoingPacket
+public class ExShowEnsoulExtractionWindow extends ServerPacket
{
public static final ExShowEnsoulExtractionWindow STATIC_PACKET = new ExShowEnsoulExtractionWindow();
@@ -32,9 +31,8 @@ public class ExShowEnsoulExtractionWindow implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENSOUL_EXTRACTION_SHOW.writeId(packet);
- return true;
+ ServerPackets.EX_ENSOUL_EXTRACTION_SHOW.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java
index 038b199273..4b95db72c4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.ensoul;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExShowEnsoulWindow implements IClientOutgoingPacket
+public class ExShowEnsoulWindow extends ServerPacket
{
public static final ExShowEnsoulWindow STATIC_PACKET = new ExShowEnsoulWindow();
@@ -32,9 +31,8 @@ public class ExShowEnsoulWindow implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_ENSOUL_WINDOW.writeId(packet);
- return true;
+ ServerPackets.EX_SHOW_ENSOUL_WINDOW.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java
index 317caaa596..a1fd4224bb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java
@@ -16,8 +16,7 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.equipmentupgrade;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -26,13 +25,12 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
public class ExShowUpgradeSystem extends AbstractItemPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet);
- packet.writeH(1); // Flag
- packet.writeH(100); // CommissionRatio
- packet.writeD(0); // MaterialItemId (array)
- packet.writeD(0); // MaterialRatio (array)
- return true;
+ ServerPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(this);
+ writeShort(1); // Flag
+ writeShort(100); // CommissionRatio
+ writeInt(0); // MaterialItemId (array)
+ writeInt(0); // MaterialRatio (array)
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExUpgradeSystemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExUpgradeSystemResult.java
index c18420f983..db3a5fe04e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExUpgradeSystemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExUpgradeSystemResult.java
@@ -16,8 +16,7 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.equipmentupgrade;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -35,11 +34,10 @@ public class ExUpgradeSystemResult extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_UPGRADE_SYSTEM_RESULT.writeId(packet);
- packet.writeH(_success);
- packet.writeD(_objectId);
- return true;
+ ServerPackets.EX_UPGRADE_SYSTEM_RESULT.writeId(this);
+ writeShort(_success);
+ writeInt(_objectId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExShowUpgradeSystemNormal.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExShowUpgradeSystemNormal.java
index ff55a2ed25..faac542f06 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExShowUpgradeSystemNormal.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExShowUpgradeSystemNormal.java
@@ -19,10 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets.equipmentupgradenormal;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.EquipmentUpgradeNormalData;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -49,22 +48,21 @@ public class ExShowUpgradeSystemNormal extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM_NORMAL.writeId(packet);
- packet.writeH(_mode);
- packet.writeH(_type);
- packet.writeH(_commission); // default - 100
- packet.writeD(_materials.size()); // array of materials with discount
+ ServerPackets.EX_SHOW_UPGRADE_SYSTEM_NORMAL.writeId(this);
+ writeShort(_mode);
+ writeShort(_type);
+ writeShort(_commission); // default - 100
+ writeInt(_materials.size()); // array of materials with discount
for (int id : _materials)
{
- packet.writeD(id);
+ writeInt(id);
}
- packet.writeD(_discountRatio.size()); // array of discount count
+ writeInt(_discountRatio.size()); // array of discount count
for (int discount : _discountRatio)
{
- packet.writeD(discount);
+ writeInt(discount);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExUpgradeSystemNormalResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExUpgradeSystemNormalResult.java
index 1409425294..7c4706acb3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExUpgradeSystemNormalResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgradenormal/ExUpgradeSystemNormalResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets.equipmentupgradenormal;
import java.util.Collections;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.holders.UniqueItemEnchantHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
/**
@@ -47,29 +46,28 @@ public class ExUpgradeSystemNormalResult extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_UPGRADE_SYSTEM_NORMAL_RESULT.writeId(packet);
- packet.writeH(_result); // Result ID
- packet.writeD(_upgradeId); // Upgrade ID
- packet.writeC(_success ? 1 : 0); // Success
- packet.writeD(_resultItems.size()); // Array of result items (success/failure) start.
+ ServerPackets.EX_UPGRADE_SYSTEM_NORMAL_RESULT.writeId(this);
+ writeShort(_result); // Result ID
+ writeInt(_upgradeId); // Upgrade ID
+ writeByte(_success); // Success
+ writeInt(_resultItems.size()); // Array of result items (success/failure) start.
for (UniqueItemEnchantHolder item : _resultItems)
{
- packet.writeD(item.getObjectId());
- packet.writeD(item.getId());
- packet.writeD(item.getEnchantLevel());
- packet.writeD(Math.toIntExact(item.getCount()));
+ writeInt(item.getObjectId());
+ writeInt(item.getId());
+ writeInt(item.getEnchantLevel());
+ writeInt(Math.toIntExact(item.getCount()));
}
- packet.writeC(0); // Is bonus? Do not see any effect.
- packet.writeD(_bonusItems.size()); // Array of bonus items start.
+ writeByte(0); // Is bonus? Do not see any effect.
+ writeInt(_bonusItems.size()); // Array of bonus items start.
for (UniqueItemEnchantHolder bonus : _bonusItems)
{
- packet.writeD(bonus.getObjectId());
- packet.writeD(bonus.getId());
- packet.writeD(bonus.getEnchantLevel());
- packet.writeD(Math.toIntExact(bonus.getCount()));
+ writeInt(bonus.getObjectId());
+ writeInt(bonus.getId());
+ writeInt(bonus.getEnchantLevel());
+ writeInt(Math.toIntExact(bonus.getCount()));
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java
index d2047e9c3a..9fa988c82b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.fishing;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author bit
*/
-public class ExAutoFishAvailable implements IClientOutgoingPacket
+public class ExAutoFishAvailable extends ServerPacket
{
public static final ExAutoFishAvailable YES = new ExAutoFishAvailable(true);
public static final ExAutoFishAvailable NO = new ExAutoFishAvailable(false);
@@ -36,10 +35,9 @@ public class ExAutoFishAvailable implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AUTO_FISH_AVAILABLE.writeId(packet);
- packet.writeC(_available ? 1 : 0);
- return true;
+ ServerPackets.EX_AUTO_FISH_AVAILABLE.writeId(this);
+ writeByte(_available);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java
index b39820363b..902efbf0f0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.fishing;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.FishingEndReason;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author -Wooden-
*/
-public class ExFishingEnd implements IClientOutgoingPacket
+public class ExFishingEnd extends ServerPacket
{
private final Player _player;
private final FishingEndReason _reason;
@@ -37,11 +36,10 @@ public class ExFishingEnd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_FISHING_END.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeC(_reason.getReason());
- return true;
+ ServerPackets.EX_FISHING_END.writeId(this);
+ writeInt(_player.getObjectId());
+ writeByte(_reason.getReason());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java
index a99ad7f4e3..335d4cf65a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.fishing;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.ILocational;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author -Wooden-
*/
-public class ExFishingStart implements IClientOutgoingPacket
+public class ExFishingStart extends ServerPacket
{
private final Player _player;
private final int _fishType;
@@ -44,15 +43,14 @@ public class ExFishingStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_FISHING_START.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeC(_fishType);
- packet.writeD(_baitLocation.getX());
- packet.writeD(_baitLocation.getY());
- packet.writeD(_baitLocation.getZ());
- packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night
- return true;
+ ServerPackets.EX_FISHING_START.writeId(this);
+ writeInt(_player.getObjectId());
+ writeByte(_fishType);
+ writeInt(_baitLocation.getX());
+ writeInt(_baitLocation.getY());
+ writeInt(_baitLocation.getZ());
+ writeByte(1); // 0 = newbie, 1 = normal, 2 = night
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java
index 74501fe7ff..b1d6c30990 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.fishing;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.ILocational;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExUserInfoFishing implements IClientOutgoingPacket
+public class ExUserInfoFishing extends ServerPacket
{
private final Player _player;
private final boolean _isFishing;
@@ -46,23 +45,22 @@ public class ExUserInfoFishing implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeC(_isFishing ? 1 : 0);
+ ServerPackets.EX_USER_INFO_FISHING.writeId(this);
+ writeInt(_player.getObjectId());
+ writeByte(_isFishing);
if (_baitLocation == null)
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
else
{
- packet.writeD(_baitLocation.getX());
- packet.writeD(_baitLocation.getY());
- packet.writeD(_baitLocation.getZ());
+ writeInt(_baitLocation.getX());
+ writeInt(_baitLocation.getY());
+ writeInt(_baitLocation.getZ());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
index dba3848794..ff2650f7a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets.friend;
import java.util.Calendar;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExFriendDetailInfo implements IClientOutgoingPacket
+public class ExFriendDetailInfo extends ServerPacket
{
private final int _objectId;
private final Player _friend;
@@ -43,45 +42,44 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet);
- packet.writeD(_objectId);
+ ServerPackets.EX_FRIEND_DETAIL_INFO.writeId(this);
+ writeInt(_objectId);
if (_friend == null)
{
- packet.writeS(_name);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeS("");
- packet.writeD(0);
- packet.writeD(0);
- packet.writeS("");
- packet.writeD(1);
- packet.writeS(""); // memo
+ writeString(_name);
+ writeInt(0);
+ writeInt(0);
+ writeShort(0);
+ writeShort(0);
+ writeInt(0);
+ writeInt(0);
+ writeString("");
+ writeInt(0);
+ writeInt(0);
+ writeString("");
+ writeInt(1);
+ writeString(""); // memo
}
else
{
- packet.writeS(_friend.getName());
- packet.writeD(_friend.isOnlineInt());
- packet.writeD(_friend.getObjectId());
- packet.writeH(_friend.getLevel());
- packet.writeH(_friend.getClassId().getId());
- packet.writeD(_friend.getClanId());
- packet.writeD(_friend.getClanCrestId());
- packet.writeS(_friend.getClan() != null ? _friend.getClan().getName() : "");
- packet.writeD(_friend.getAllyId());
- packet.writeD(_friend.getAllyCrestId());
- packet.writeS(_friend.getClan() != null ? _friend.getClan().getAllyName() : "");
+ writeString(_friend.getName());
+ writeInt(_friend.isOnlineInt());
+ writeInt(_friend.getObjectId());
+ writeShort(_friend.getLevel());
+ writeShort(_friend.getClassId().getId());
+ writeInt(_friend.getClanId());
+ writeInt(_friend.getClanCrestId());
+ writeString(_friend.getClan() != null ? _friend.getClan().getName() : "");
+ writeInt(_friend.getAllyId());
+ writeInt(_friend.getAllyCrestId());
+ writeString(_friend.getClan() != null ? _friend.getClan().getAllyName() : "");
final Calendar createDate = _friend.getCreateDate();
- packet.writeC(createDate.get(Calendar.MONTH) + 1);
- packet.writeC(createDate.get(Calendar.DAY_OF_MONTH));
- packet.writeD(_lastAccess);
- packet.writeS(""); // memo
+ writeByte(createDate.get(Calendar.MONTH) + 1);
+ writeByte(createDate.get(Calendar.DAY_OF_MONTH));
+ writeInt(_lastAccess);
+ writeString(""); // memo
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java
index a90b7b6083..21d4cc2b53 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.friend;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
-public class FriendAddRequest implements IClientOutgoingPacket
+public class FriendAddRequest extends ServerPacket
{
private final String _requestorName;
@@ -30,11 +29,10 @@ public class FriendAddRequest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet);
- packet.writeC(0);
- packet.writeS(_requestorName);
- return true;
+ ServerPackets.FRIEND_ADD_REQUEST.writeId(this);
+ writeByte(0);
+ writeString(_requestorName);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java
index d24139644c..a985c1034f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.friend;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class FriendAddRequestResult implements IClientOutgoingPacket
+public class FriendAddRequestResult extends ServerPacket
{
private final int _result;
private final int _charId;
@@ -46,17 +45,16 @@ public class FriendAddRequestResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet);
- packet.writeD(_result);
- packet.writeD(_charId);
- packet.writeS(_charName);
- packet.writeD(_isOnline);
- packet.writeD(_charObjectId);
- packet.writeD(_charLevel);
- packet.writeD(_charClassId);
- packet.writeH(0); // Always 0 on retail
- return true;
+ ServerPackets.FRIEND_ADD_REQUEST_RESULT.writeId(this);
+ writeInt(_result);
+ writeInt(_charId);
+ writeString(_charName);
+ writeInt(_isOnline);
+ writeInt(_charObjectId);
+ writeInt(_charLevel);
+ writeInt(_charClassId);
+ writeShort(0); // Always 0 on retail
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java
index 13a7d01967..caba7996ef 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java
@@ -23,19 +23,18 @@ import java.util.LinkedList;
import java.util.List;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* Support for "Chat with Friends" dialog.
* This packet is sent only at login.
* @author mrTJO, UnAfraid
*/
-public class FriendList implements IClientOutgoingPacket
+public class FriendList extends ServerPacket
{
private final List _info = new LinkedList<>();
@@ -97,19 +96,18 @@ public class FriendList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FRIEND_LIST.writeId(packet);
- packet.writeD(_info.size());
+ ServerPackets.FRIEND_LIST.writeId(this);
+ writeInt(_info.size());
for (FriendInfo info : _info)
{
- packet.writeD(info._objId); // character id
- packet.writeS(info._name);
- packet.writeD(info._online ? 1 : 0); // online
- packet.writeD(info._online ? info._objId : 0); // object id if online
- packet.writeD(info._classid);
- packet.writeD(info._level);
+ writeInt(info._objId); // character id
+ writeString(info._name);
+ writeInt(info._online); // online
+ writeInt(info._online ? info._objId : 0); // object id if online
+ writeInt(info._classid);
+ writeInt(info._level);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java
index 1bb4142e34..2d524f07b3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.friend;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class FriendRemove implements IClientOutgoingPacket
+public class FriendRemove extends ServerPacket
{
private final int _responce;
private final String _charName;
@@ -35,11 +34,10 @@ public class FriendRemove implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FRIEND_REMOVE.writeId(packet);
- packet.writeD(_responce);
- packet.writeS(_charName);
- return true;
+ ServerPackets.FRIEND_REMOVE.writeId(this);
+ writeInt(_responce);
+ writeString(_charName);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java
index a3990c0879..51b8d9013d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.friend;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* Support for "Chat with Friends" dialog.
* Inform player about friend online status change
* @author JIV
*/
-public class FriendStatus implements IClientOutgoingPacket
+public class FriendStatus extends ServerPacket
{
public static final int MODE_OFFLINE = 0;
public static final int MODE_ONLINE = 1;
@@ -49,29 +48,28 @@ public class FriendStatus implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.FRIEND_STATUS.writeId(packet);
- packet.writeD(_type);
- packet.writeS(_name);
+ ServerPackets.FRIEND_STATUS.writeId(this);
+ writeInt(_type);
+ writeString(_name);
switch (_type)
{
case MODE_OFFLINE:
{
- packet.writeD(_objectId);
+ writeInt(_objectId);
break;
}
case MODE_LEVEL:
{
- packet.writeD(_level);
+ writeInt(_level);
break;
}
case MODE_CLASS:
{
- packet.writeD(_classId);
+ writeInt(_classId);
break;
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java
index 78da5850b8..af957ed3f9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java
@@ -16,18 +16,17 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.friend;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* Support for "Chat with Friends" dialog.
* Add new friend or delete.
* @author JIV
*/
-public class L2Friend implements IClientOutgoingPacket
+public class L2Friend extends ServerPacket
{
private final boolean _action;
private final boolean _online;
@@ -47,14 +46,13 @@ public class L2Friend implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.L2_FRIEND.writeId(packet);
- packet.writeD(_action ? 1 : 3); // 1-add 3-remove
- packet.writeD(_objid);
- packet.writeS(_name);
- packet.writeD(_online ? 1 : 0);
- packet.writeD(_online ? _objid : 0);
- return true;
+ ServerPackets.L2_FRIEND.writeId(this);
+ writeInt(_action ? 1 : 3); // 1-add 3-remove
+ writeInt(_objid);
+ writeString(_name);
+ writeInt(_online);
+ writeInt(_online ? _objid : 0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java
index e50693cb11..34d17040be 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java
@@ -19,19 +19,18 @@ package org.l2jmobius.gameserver.network.serverpackets.friend;
import java.util.LinkedList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* Support for "Chat with Friends" dialog.
* This packet is sent only at login.
* @author Tempy
*/
-public class L2FriendList implements IClientOutgoingPacket
+public class L2FriendList extends ServerPacket
{
private final List _info = new LinkedList<>();
@@ -78,20 +77,19 @@ public class L2FriendList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.L2_FRIEND_LIST.writeId(packet);
- packet.writeD(_info.size());
+ ServerPackets.L2_FRIEND_LIST.writeId(this);
+ writeInt(_info.size());
for (FriendInfo info : _info)
{
- packet.writeD(info._objId); // character id
- packet.writeS(info._name);
- packet.writeD(info._online ? 1 : 0); // online
- packet.writeD(info._online ? info._objId : 0); // object id if online
- packet.writeD(info._level);
- packet.writeD(info._classId);
- packet.writeH(0);
+ writeInt(info._objId); // character id
+ writeString(info._name);
+ writeInt(info._online); // online
+ writeInt(info._online ? info._objId : 0); // object id if online
+ writeInt(info._level);
+ writeInt(info._classId);
+ writeShort(0);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimeRestrictFieldUserAlarm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimeRestrictFieldUserAlarm.java
index 17587c80c6..5b789ec895 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimeRestrictFieldUserAlarm.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimeRestrictFieldUserAlarm.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.huntingzones;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NasSeKa
*/
-public class TimeRestrictFieldUserAlarm implements IClientOutgoingPacket
+public class TimeRestrictFieldUserAlarm extends ServerPacket
{
private final Player _player;
private final int _zoneId;
@@ -36,11 +35,10 @@ public class TimeRestrictFieldUserAlarm implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ALARM.writeId(packet);
- packet.writeD(_zoneId);
- packet.writeD((_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000) + 59); // RemainTime (zone left time)
- return true;
+ ServerPackets.EX_TIME_RESTRICT_FIELD_USER_ALARM.writeId(this);
+ writeInt(_zoneId);
+ writeInt((_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000) + 59); // RemainTime (zone left time)
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneChargeResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneChargeResult.java
index ebf213a695..c197c8ca86 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneChargeResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneChargeResult.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.huntingzones;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author NasSeKa
*/
-public class TimedHuntingZoneChargeResult implements IClientOutgoingPacket
+public class TimedHuntingZoneChargeResult extends ServerPacket
{
private final int _zoneId;
private final int _remainTime;
@@ -39,13 +38,12 @@ public class TimedHuntingZoneChargeResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_CHARGE_RESULT.writeId(packet);
- packet.writeD(_zoneId);
- packet.writeD(_remainTime);
- packet.writeD(_refillTime);
- packet.writeD(_chargeTime);
- return true;
+ ServerPackets.EX_TIME_RESTRICT_FIELD_USER_CHARGE_RESULT.writeId(this);
+ writeInt(_zoneId);
+ writeInt(_remainTime);
+ writeInt(_refillTime);
+ writeInt(_chargeTime);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java
index e55156077f..6127208640 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.huntingzones;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius, Index, NasSeKa`, Serenitty
*/
-public class TimedHuntingZoneEnter implements IClientOutgoingPacket
+public class TimedHuntingZoneEnter extends ServerPacket
{
private final Player _player;
private final int _zoneId;
@@ -36,13 +35,12 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet);
- packet.writeC(1); // bEnterSuccess
- packet.writeD(_zoneId);
- packet.writeD((int) (System.currentTimeMillis() / 1000)); // nEnterTimeStamp
- packet.writeD((_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000) + 59); // nRemainTime (zone left time)
- return true;
+ ServerPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(this);
+ writeByte(1); // bEnterSuccess
+ writeInt(_zoneId);
+ writeInt((int) (System.currentTimeMillis() / 1000)); // nEnterTimeStamp
+ writeInt((_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000) + 59); // nRemainTime (zone left time)
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java
index f15edc7580..6af6110512 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.huntingzones;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author dontknowdontcare
*/
-public class TimedHuntingZoneExit implements IClientOutgoingPacket
+public class TimedHuntingZoneExit extends ServerPacket
{
private final int _zoneId;
@@ -33,10 +32,9 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_EXIT.writeId(packet);
- packet.writeD(_zoneId);
- return true;
+ ServerPackets.EX_TIME_RESTRICT_FIELD_USER_EXIT.writeId(this);
+ writeInt(_zoneId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java
index 1606e8cd45..fd7d9ac44c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java
@@ -16,19 +16,18 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.huntingzones;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class TimedHuntingZoneList implements IClientOutgoingPacket
+public class TimedHuntingZoneList extends ServerPacket
{
private final Player _player;
private final boolean _isInTimedHuntingZone;
@@ -40,37 +39,36 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet);
+ ServerPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(this);
final long currentTime = System.currentTimeMillis();
- packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count
+ writeInt(TimedHuntingZoneData.getInstance().getSize()); // zone count
for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones())
{
- packet.writeD(holder.getEntryFee() == 0 ? 0 : 1); // required item count
- packet.writeD(holder.getEntryItemId());
- packet.writeQ(holder.getEntryFee());
- packet.writeD(holder.isWeekly() ? 0 : 1); // reset cycle
- packet.writeD(holder.getZoneId());
- packet.writeD(holder.getMinLevel());
- packet.writeD(holder.getMaxLevel());
- packet.writeD(holder.getInitialTime() / 1000); // remain time base
+ writeInt(holder.getEntryFee() != 0); // required item count
+ writeInt(holder.getEntryItemId());
+ writeLong(holder.getEntryFee());
+ writeInt(!holder.isWeekly()); // reset cycle
+ writeInt(holder.getZoneId());
+ writeInt(holder.getMinLevel());
+ writeInt(holder.getMaxLevel());
+ writeInt(holder.getInitialTime() / 1000); // remain time base
int remainingTime = _player.getTimedHuntingZoneRemainingTime(holder.getZoneId());
if ((remainingTime == 0) && ((_player.getTimedHuntingZoneInitialEntry(holder.getZoneId()) + holder.getResetDelay()) < currentTime))
{
remainingTime = holder.getInitialTime();
}
- packet.writeD(remainingTime / 1000); // remain time
- packet.writeD(holder.getMaximumAddedTime() / 1000);
- packet.writeD(_player.getVariables().getInt(PlayerVariables.HUNTING_ZONE_REMAIN_REFILL + holder.getZoneId(), holder.getRemainRefillTime()));
- packet.writeD(holder.getRefillTimeMax());
- packet.writeC(_isInTimedHuntingZone ? 0 : 1); // field activated (272 C to D)
- packet.writeC(0); // bUserBound
- packet.writeC(0); // bCanReEnter
- packet.writeC(holder.zonePremiumUserOnly() ? 1 : 0); // bIsInZonePCCafeUserOnly
- packet.writeC(_player.hasPremiumStatus() ? 1 : 0); // bIsPCCafeUser
- packet.writeC(holder.useWorldPrefix() ? 1 : 0); // bWorldInZone
+ writeInt(remainingTime / 1000); // remain time
+ writeInt(holder.getMaximumAddedTime() / 1000);
+ writeInt(_player.getVariables().getInt(PlayerVariables.HUNTING_ZONE_REMAIN_REFILL + holder.getZoneId(), holder.getRemainRefillTime()));
+ writeInt(holder.getRefillTimeMax());
+ writeByte(!_isInTimedHuntingZone); // field activated (272 byte to int)
+ writeByte(0); // bUserBound
+ writeByte(0); // bCanReEnter
+ writeByte(holder.zonePremiumUserOnly()); // bIsInZonePCCafeUserOnly
+ writeByte(_player.hasPremiumStatus()); // bIsPCCafeUser
+ writeByte(holder.useWorldPrefix()); // bWorldInZone
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExBloodyCoinCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExBloodyCoinCount.java
index ac2cb08102..8cd5e0fadb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExBloodyCoinCount.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExBloodyCoinCount.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.limitshop;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExBloodyCoinCount implements IClientOutgoingPacket
+public class ExBloodyCoinCount extends ServerPacket
{
private final long _count;
@@ -35,10 +34,9 @@ public class ExBloodyCoinCount implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BLOODY_COIN_COUNT.writeId(packet);
- packet.writeQ(_count);
- return true;
+ ServerPackets.EX_BLOODY_COIN_COUNT.writeId(this);
+ writeLong(_count);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
index 90d67bd73c..6563ea10b1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
@@ -19,20 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets.limitshop;
import java.util.Collection;
import java.util.Collections;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.LimitShopClanData;
import org.l2jmobius.gameserver.data.xml.LimitShopCraftData;
import org.l2jmobius.gameserver.data.xml.LimitShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder;
import org.l2jmobius.gameserver.model.variables.AccountVariables;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket
+public class ExPurchaseLimitShopItemListNew extends ServerPacket
{
private final int _shopType; // 3 Lcoin Store, 4 Special Craft, 100 Clan Shop
private final Player _player;
@@ -67,63 +66,62 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_LIST_NEW.writeId(packet);
- packet.writeC(_shopType);
- packet.writeC(1); // Page. (311)
- packet.writeC(1); // MaxPage. (311)
- packet.writeD(_products.size());
+ ServerPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_LIST_NEW.writeId(this);
+ writeByte(_shopType);
+ writeByte(1); // Page. (311)
+ writeByte(1); // MaxPage. (311)
+ writeInt(_products.size());
for (LimitShopProductHolder product : _products)
{
- packet.writeD(product.getId());
- packet.writeD(product.getProductionId());
- packet.writeD(product.getIngredientIds()[0]);
- packet.writeD(product.getIngredientIds()[1]);
- packet.writeD(product.getIngredientIds()[2]);
- packet.writeD(product.getIngredientIds()[3]); // 306
- packet.writeD(product.getIngredientIds()[4]); // 306
- packet.writeQ(product.getIngredientQuantities()[0]);
- packet.writeQ(product.getIngredientQuantities()[1]);
- packet.writeQ(product.getIngredientQuantities()[2]);
- packet.writeQ(product.getIngredientQuantities()[3]); // 306
- packet.writeQ(product.getIngredientQuantities()[4]); // 306
- packet.writeH(product.getIngredientEnchants()[0]);
- packet.writeH(product.getIngredientEnchants()[1]);
- packet.writeH(product.getIngredientEnchants()[2]);
- packet.writeH(product.getIngredientEnchants()[3]); // 306
- packet.writeH(product.getIngredientEnchants()[4]); // 306
+ writeInt(product.getId());
+ writeInt(product.getProductionId());
+ writeInt(product.getIngredientIds()[0]);
+ writeInt(product.getIngredientIds()[1]);
+ writeInt(product.getIngredientIds()[2]);
+ writeInt(product.getIngredientIds()[3]); // 306
+ writeInt(product.getIngredientIds()[4]); // 306
+ writeLong(product.getIngredientQuantities()[0]);
+ writeLong(product.getIngredientQuantities()[1]);
+ writeLong(product.getIngredientQuantities()[2]);
+ writeLong(product.getIngredientQuantities()[3]); // 306
+ writeLong(product.getIngredientQuantities()[4]); // 306
+ writeShort(product.getIngredientEnchants()[0]);
+ writeShort(product.getIngredientEnchants()[1]);
+ writeShort(product.getIngredientEnchants()[2]);
+ writeShort(product.getIngredientEnchants()[3]); // 306
+ writeShort(product.getIngredientEnchants()[4]); // 306
// Check limits.
if (product.getAccountDailyLimit() > 0) // Sale period.
{
if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0) >= product.getAccountDailyLimit())
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
+ writeInt(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
}
}
else if (product.getAccountBuyLimit() > 0) // Count limit.
{
if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit())
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(product.getAccountBuyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0));
+ writeInt(product.getAccountBuyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0));
}
}
else // No account limits.
{
- packet.writeD(1);
+ writeInt(1);
}
- packet.writeD(0); // nRemainSec
- packet.writeD(0); // nRemainServerItemAmount
- packet.writeH(0); // sCircleNum (311)
+ writeInt(0); // nRemainSec
+ writeInt(0); // nRemainServerItemAmount
+ writeShort(0); // sCircleNum (311)
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java
index fafd159bca..95df57e67a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java
@@ -18,19 +18,18 @@ package org.l2jmobius.gameserver.network.serverpackets.limitshop;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.LimitShopClanData;
import org.l2jmobius.gameserver.data.xml.LimitShopCraftData;
import org.l2jmobius.gameserver.data.xml.LimitShopData;
import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder;
import org.l2jmobius.gameserver.model.holders.LimitShopRandomCraftReward;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Gustavo Fonseca
*/
-public class ExPurchaseLimitShopItemResult implements IClientOutgoingPacket
+public class ExPurchaseLimitShopItemResult extends ServerPacket
{
private final int _category, _productId;
private final boolean _isSuccess;
@@ -68,25 +67,25 @@ public class ExPurchaseLimitShopItemResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_BUY.writeId(packet);
+ ServerPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_BUY.writeId(this);
if ((_product == null) || !_isSuccess)
{
- packet.writeC(1);
- packet.writeC(_category);
- packet.writeD(_productId);
- packet.writeD(1);
- packet.writeC(1);
- packet.writeD(0);
- packet.writeQ(0);
+ writeByte(1);
+ writeByte(_category);
+ writeInt(_productId);
+ writeInt(1);
+ writeByte(1);
+ writeInt(0);
+ writeLong(0);
}
else
{
- packet.writeC(0); // success
- packet.writeC(_category);
- packet.writeD(_productId);
- packet.writeD(_rewards.size());
+ writeByte(0); // success
+ writeByte(_category);
+ writeInt(_productId);
+ writeInt(_rewards.size());
int counter = 0;
for (LimitShopRandomCraftReward entry : _rewards)
{
@@ -94,12 +93,11 @@ public class ExPurchaseLimitShopItemResult implements IClientOutgoingPacket
{
break;
}
- packet.writeC(entry.getRewardIndex());
- packet.writeD(0);
- packet.writeD(entry.getCount());
+ writeByte(entry.getRewardIndex());
+ writeInt(0);
+ writeInt(entry.getCount());
counter++;
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java
index 6a2199073c..4442786a00 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java
@@ -21,18 +21,17 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.LuckyGameItemType;
import org.l2jmobius.gameserver.enums.LuckyGameResultType;
import org.l2jmobius.gameserver.enums.LuckyGameType;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExBettingLuckyGameResult implements IClientOutgoingPacket
+public class ExBettingLuckyGameResult extends ServerPacket
{
public static final ExBettingLuckyGameResult NORMAL_INVALID_ITEM_COUNT = new ExBettingLuckyGameResult(LuckyGameResultType.INVALID_ITEM_COUNT, LuckyGameType.NORMAL);
public static final ExBettingLuckyGameResult LUXURY_INVALID_ITEM_COUNT = new ExBettingLuckyGameResult(LuckyGameResultType.INVALID_ITEM_COUNT, LuckyGameType.LUXURY);
@@ -64,22 +63,21 @@ public class ExBettingLuckyGameResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BETTING_LUCKY_GAME_RESULT.writeId(packet);
- packet.writeD(_result.getClientId());
- packet.writeD(_type.ordinal());
- packet.writeD(_ticketCount);
- packet.writeD(_size);
+ ServerPackets.EX_BETTING_LUCKY_GAME_RESULT.writeId(this);
+ writeInt(_result.getClientId());
+ writeInt(_type.ordinal());
+ writeInt(_ticketCount);
+ writeInt(_size);
for (Entry> reward : _rewards.entrySet())
{
for (ItemHolder item : reward.getValue())
{
- packet.writeD(reward.getKey().getClientId());
- packet.writeD(item.getId());
- packet.writeD((int) item.getCount());
+ writeInt(reward.getKey().getClientId());
+ writeInt(item.getId());
+ writeInt((int) item.getCount());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java
index e59df5b44d..d529c028d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.luckygame;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Sdw
*/
-public class ExStartLuckyGame implements IClientOutgoingPacket
+public class ExStartLuckyGame extends ServerPacket
{
private final LuckyGameType _type;
private final int _ticketCount;
@@ -36,11 +35,10 @@ public class ExStartLuckyGame implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_START_LUCKY_GAME.writeId(packet);
- packet.writeD(_type.ordinal());
- packet.writeD(_ticketCount);
- return true;
+ ServerPackets.EX_START_LUCKY_GAME.writeId(this);
+ writeInt(_type.ordinal());
+ writeInt(_ticketCount);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java
index 52777d85fc..3803f44768 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java
@@ -17,15 +17,14 @@
package org.l2jmobius.gameserver.network.serverpackets.magiclamp;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author L2CCCP
*/
-public class ExMagicLampExpInfoUI implements IClientOutgoingPacket
+public class ExMagicLampExpInfoUI extends ServerPacket
{
private final Player _player;
@@ -35,13 +34,12 @@ public class ExMagicLampExpInfoUI implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MAGICLAMP_EXP_INFO.writeId(packet);
- packet.writeD(Config.ENABLE_MAGIC_LAMP ? 1 : 0); // IsOpen
- packet.writeD(Config.MAGIC_LAMP_MAX_LEVEL_EXP); // MaxMagicLampExp
- packet.writeD(_player.getLampExp()); // MagicLampExp
- packet.writeD(_player.getLampCount()); // MagicLampCount
- return true;
+ ServerPackets.EX_MAGICLAMP_EXP_INFO.writeId(this);
+ writeInt(Config.ENABLE_MAGIC_LAMP); // IsOpen
+ writeInt(Config.MAGIC_LAMP_MAX_LEVEL_EXP); // MaxMagicLampExp
+ writeInt(_player.getLampExp()); // MagicLampExp
+ writeInt(_player.getLampCount()); // MagicLampCount
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
index 962c294fb5..a0aff2daac 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets.magiclamp;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.MagicLampData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.GreaterMagicLampHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author L2CCCP
*/
-public class ExMagicLampGameInfoUI implements IClientOutgoingPacket
+public class ExMagicLampGameInfoUI extends ServerPacket
{
private final Player _player;
private final byte _mode;
@@ -43,22 +42,21 @@ public class ExMagicLampGameInfoUI implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MAGICLAMP_GAME_INFO.writeId(packet);
- packet.writeD(_player.getMaxLampCount()); // MagicLampGameMaxCCount
- packet.writeD(_count); // MagicLampGameCCount
- packet.writeD(_mode == 0 ? Config.MAGIC_LAMP_CONSUME_COUNT : Config.MAGIC_LAMP_GREATER_CONSUME_COUNT); // MagicLampCountPerGame
- packet.writeD(_player.getLampCount()); // MagicLampCount
- packet.writeC(_mode); // GameMode
+ ServerPackets.EX_MAGICLAMP_GAME_INFO.writeId(this);
+ writeInt(_player.getMaxLampCount()); // MagicLampGameMaxCCount
+ writeInt(_count); // MagicLampGameCCount
+ writeInt(_mode == 0 ? Config.MAGIC_LAMP_CONSUME_COUNT : Config.MAGIC_LAMP_GREATER_CONSUME_COUNT); // MagicLampCountPerGame
+ writeInt(_player.getLampCount()); // MagicLampCount
+ writeByte(_mode); // GameMode
final List greater = MagicLampData.getInstance().getGreaterLamps();
- packet.writeD(greater.size()); // costItemList
+ writeInt(greater.size()); // costItemList
for (GreaterMagicLampHolder lamp : greater)
{
- packet.writeD(lamp.getItemId()); // ItemClassID
- packet.writeQ(lamp.getCount()); // ItemAmountPerGame
- packet.writeQ(_player.getInventory().getInventoryItemCount(lamp.getItemId(), -1)); // ItemAmount
+ writeInt(lamp.getItemId()); // ItemClassID
+ writeLong(lamp.getCount()); // ItemAmountPerGame
+ writeLong(_player.getInventory().getInventoryItemCount(lamp.getItemId(), -1)); // ItemAmount
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
index 7c9b802671..e8d9eb593e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets.magiclamp;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.holders.MagicLampHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExMagicLampGameResult implements IClientOutgoingPacket
+public class ExMagicLampGameResult extends ServerPacket
{
private final Collection _rewards;
@@ -36,17 +35,16 @@ public class ExMagicLampGameResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MAGICLAMP_GAME_RESULT.writeId(packet);
- packet.writeD(_rewards.size());
+ ServerPackets.EX_MAGICLAMP_GAME_RESULT.writeId(this);
+ writeInt(_rewards.size());
for (MagicLampHolder lamp : _rewards)
{
- packet.writeC(lamp.getType().getGrade());
- packet.writeD(lamp.getCount());
- packet.writeQ(lamp.getExp());
- packet.writeQ(lamp.getSp());
+ writeByte(lamp.getType().getGrade());
+ writeInt(lamp.getCount());
+ writeLong(lamp.getExp());
+ writeLong(lamp.getSp());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java
index 706c179a9c..0bc501d439 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.mentoring;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Gnacik, UnAfraid
*/
-public class ExMentorAdd implements IClientOutgoingPacket
+public class ExMentorAdd extends ServerPacket
{
final Player _mentor;
@@ -34,12 +33,11 @@ public class ExMentorAdd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MENTOR_ADD.writeId(packet);
- packet.writeS(_mentor.getName());
- packet.writeD(_mentor.getActiveClass());
- packet.writeD(_mentor.getLevel());
- return true;
+ ServerPackets.EX_MENTOR_ADD.writeId(this);
+ writeString(_mentor.getName());
+ writeInt(_mentor.getActiveClass());
+ writeInt(_mentor.getLevel());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
index 2f08d72ba6..662f9b9a6c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -20,17 +20,16 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.MentorManager;
import org.l2jmobius.gameserver.model.Mentee;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExMentorList implements IClientOutgoingPacket
+public class ExMentorList extends ServerPacket
{
private final int _type;
private final Collection _mentees;
@@ -50,7 +49,7 @@ public class ExMentorList implements IClientOutgoingPacket
// else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
// {
// _mentees = Collections.emptyList();
- // _type = 0x01;
+ // _type = 1;
// }
else
{
@@ -60,20 +59,19 @@ public class ExMentorList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MENTOR_LIST.writeId(packet);
- packet.writeD(_type);
- packet.writeD(0);
- packet.writeD(_mentees.size());
+ ServerPackets.EX_MENTOR_LIST.writeId(this);
+ writeInt(_type);
+ writeInt(0);
+ writeInt(_mentees.size());
for (Mentee mentee : _mentees)
{
- packet.writeD(mentee.getObjectId());
- packet.writeS(mentee.getName());
- packet.writeD(mentee.getClassId());
- packet.writeD(mentee.getLevel());
- packet.writeD(mentee.isOnlineInt());
+ writeInt(mentee.getObjectId());
+ writeString(mentee.getName());
+ writeInt(mentee.getClassId());
+ writeInt(mentee.getLevel());
+ writeInt(mentee.isOnlineInt());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
index 3f3a83b27d..0111443410 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets.mentoring;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ListMenteeWaiting implements IClientOutgoingPacket
+public class ListMenteeWaiting extends ServerPacket
{
private static final int PLAYERS_PER_PAGE = 64;
@@ -47,27 +46,27 @@ public class ListMenteeWaiting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet);
- packet.writeD(1); // always 1 in retail
+ ServerPackets.LIST_MENTEE_WAITING.writeId(this);
+ writeInt(1); // always 1 in retail
if (_possibleCandiates.isEmpty())
{
- packet.writeD(0);
- packet.writeD(0);
- return true;
+ writeInt(0);
+ writeInt(0);
+ return;
}
- packet.writeD(_possibleCandiates.size());
- packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE);
+
+ writeInt(_possibleCandiates.size());
+ writeInt(_possibleCandiates.size() % PLAYERS_PER_PAGE);
for (Player player : _possibleCandiates)
{
if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1))))
{
- packet.writeS(player.getName());
- packet.writeD(player.getActiveClass());
- packet.writeD(player.getLevel());
+ writeString(player.getName());
+ writeInt(player.getActiveClass());
+ writeInt(player.getLevel());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
index cff1551196..e2a7e8cb46 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
@@ -18,14 +18,13 @@ package org.l2jmobius.gameserver.network.serverpackets.pet;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.NpcInfoType;
import org.l2jmobius.gameserver.enums.Team;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractMaskPacket;
/**
@@ -205,169 +204,168 @@ public class ExPetInfo extends AbstractMaskPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PET_INFO.writeId(packet);
- packet.writeD(_summon.getObjectId());
- packet.writeC(_value); // 0=teleported 1=default 2=summoned
- packet.writeH(37); // mask_bits_37
- packet.writeB(_masks);
+ ServerPackets.EX_PET_INFO.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeByte(_value); // 0=teleported 1=default 2=summoned
+ writeShort(37); // mask_bits_37
+ writeBytes(_masks);
// Block 1
- packet.writeC(_initSize);
+ writeByte(_initSize);
if (containsMask(NpcInfoType.ATTACKABLE))
{
- packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0);
+ writeByte(_summon.isAutoAttackable(_attacker));
}
if (containsMask(NpcInfoType.RELATIONS))
{
- packet.writeQ(_relation);
+ writeLong(_relation);
}
if (containsMask(NpcInfoType.TITLE))
{
- packet.writeS(_title);
+ writeString(_title);
}
// Block 2
- packet.writeH(_blockSize);
+ writeShort(_blockSize);
if (containsMask(NpcInfoType.ID))
{
- packet.writeD(_summon.getTemplate().getDisplayId() + 1000000);
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
}
if (containsMask(NpcInfoType.POSITION))
{
- packet.writeD(_summon.getX());
- packet.writeD(_summon.getY());
- packet.writeD(_summon.getZ());
+ writeInt(_summon.getX());
+ writeInt(_summon.getY());
+ writeInt(_summon.getZ());
}
if (containsMask(NpcInfoType.HEADING))
{
- packet.writeD(_summon.getHeading());
+ writeInt(_summon.getHeading());
}
if (containsMask(NpcInfoType.UNKNOWN2))
{
- packet.writeD(0); // Unknown
+ writeInt(0); // Unknown
}
if (containsMask(NpcInfoType.ATK_CAST_SPEED))
{
- packet.writeD(_summon.getPAtkSpd());
- packet.writeD(_summon.getMAtkSpd());
+ writeInt(_summon.getPAtkSpd());
+ writeInt(_summon.getMAtkSpd());
}
if (containsMask(NpcInfoType.SPEED_MULTIPLIER))
{
- packet.writeE((float) _summon.getStat().getMovementSpeedMultiplier());
- packet.writeE((float) _summon.getStat().getAttackSpeedMultiplier());
+ writeFloat((float) _summon.getStat().getMovementSpeedMultiplier());
+ writeFloat((float) _summon.getStat().getAttackSpeedMultiplier());
}
if (containsMask(NpcInfoType.EQUIPPED))
{
- packet.writeD(_summon.getWeapon());
- packet.writeD(_summon.getArmor()); // Armor id?
- packet.writeD(0);
+ writeInt(_summon.getWeapon());
+ writeInt(_summon.getArmor()); // Armor id?
+ writeInt(0);
}
if (containsMask(NpcInfoType.ALIVE))
{
- packet.writeC(_summon.isDead() ? 0 : 1);
+ writeByte(!_summon.isDead());
}
if (containsMask(NpcInfoType.RUNNING))
{
- packet.writeC(_summon.isRunning() ? 1 : 0);
+ writeByte(_summon.isRunning());
}
if (containsMask(NpcInfoType.SWIM_OR_FLY))
{
- packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0);
+ writeByte(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0);
}
if (containsMask(NpcInfoType.TEAM))
{
- packet.writeC(_summon.getTeam().getId());
+ writeByte(_summon.getTeam().getId());
}
if (containsMask(NpcInfoType.ENCHANT))
{
- packet.writeD(_summon.getTemplate().getWeaponEnchant());
+ writeInt(_summon.getTemplate().getWeaponEnchant());
}
if (containsMask(NpcInfoType.FLYING))
{
- packet.writeD(_summon.isFlying() ? 1 : 0);
+ writeInt(_summon.isFlying());
}
if (containsMask(NpcInfoType.CLONE))
{
- packet.writeD(0); // Player ObjectId with Decoy
+ writeInt(0); // Player ObjectId with Decoy
}
if (containsMask(NpcInfoType.COLOR_EFFECT))
{
// No visual effect
- packet.writeD(0); // Unknown
+ writeInt(0); // Unknown
}
if (containsMask(NpcInfoType.DISPLAY_EFFECT))
{
- packet.writeD(0);
+ writeInt(0);
}
if (containsMask(NpcInfoType.TRANSFORMATION))
{
- packet.writeD(_summon.getTransformationDisplayId()); // Transformation ID
+ writeInt(_summon.getTransformationDisplayId()); // Transformation ID
}
if (containsMask(NpcInfoType.CURRENT_HP))
{
- packet.writeD((int) _summon.getCurrentHp());
+ writeInt((int) _summon.getCurrentHp());
}
if (containsMask(NpcInfoType.CURRENT_MP))
{
- packet.writeD((int) _summon.getCurrentMp());
+ writeInt((int) _summon.getCurrentMp());
}
if (containsMask(NpcInfoType.MAX_HP))
{
- packet.writeD(_summon.getMaxHp());
+ writeInt(_summon.getMaxHp());
}
if (containsMask(NpcInfoType.MAX_MP))
{
- packet.writeD(_summon.getMaxMp());
+ writeInt(_summon.getMaxMp());
}
if (containsMask(NpcInfoType.SUMMONED))
{
- packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
+ writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
}
if (containsMask(NpcInfoType.UNKNOWN12))
{
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
if (containsMask(NpcInfoType.NAME))
{
- packet.writeS(_summon.getName());
+ writeString(_summon.getName());
}
if (containsMask(NpcInfoType.NAME_NPCSTRINGID))
{
- packet.writeD(-1); // NPCStringId for name
+ writeInt(-1); // NPCStringId for name
}
if (containsMask(NpcInfoType.TITLE_NPCSTRINGID))
{
- packet.writeD(-1); // NPCStringId for title
+ writeInt(-1); // NPCStringId for title
}
if (containsMask(NpcInfoType.PVP_FLAG))
{
- packet.writeC(_summon.getPvpFlag()); // PVP flag
+ writeByte(_summon.getPvpFlag()); // PVP flag
}
if (containsMask(NpcInfoType.REPUTATION))
{
- packet.writeD(_summon.getReputation()); // Name color
+ writeInt(_summon.getReputation()); // Name color
}
if (containsMask(NpcInfoType.CLAN))
{
- packet.writeD(_clanId);
- packet.writeD(_clanCrest);
- packet.writeD(_clanLargeCrest);
- packet.writeD(_allyId);
- packet.writeD(_allyCrest);
+ writeInt(_clanId);
+ writeInt(_clanCrest);
+ writeInt(_clanLargeCrest);
+ writeInt(_allyId);
+ writeInt(_allyCrest);
}
if (containsMask(NpcInfoType.VISUAL_STATE))
{
- packet.writeC(_statusMask);
+ writeByte(_statusMask);
}
if (containsMask(NpcInfoType.ABNORMALS))
{
- packet.writeH(_abnormalVisualEffects.size());
+ writeShort(_abnormalVisualEffects.size());
for (AbnormalVisualEffect abnormalVisualEffect : _abnormalVisualEffects)
{
- packet.writeH(abnormalVisualEffect.getClientId());
+ writeShort(abnormalVisualEffect.getClientId());
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java
index e854fca7ed..f034f1253c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pet;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 26.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExPetSkillList implements IClientOutgoingPacket
+public class ExPetSkillList extends ServerPacket
{
private final boolean _onEnter;
private final Pet _pet;
@@ -37,19 +36,18 @@ public class ExPetSkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PET_SKILL_LIST.writeId(packet);
- packet.writeC(_onEnter ? 1 : 0);
- packet.writeD(_pet.getAllSkills().size());
+ ServerPackets.EX_PET_SKILL_LIST.writeId(this);
+ writeByte(_onEnter);
+ writeInt(_pet.getAllSkills().size());
for (Skill sk : _pet.getAllSkills())
{
- packet.writeD(sk.getDisplayId());
- packet.writeD(sk.getDisplayLevel());
- packet.writeD(sk.getReuseDelayGroup());
- packet.writeC(0);
- packet.writeC(0);
+ writeInt(sk.getDisplayId());
+ writeInt(sk.getDisplayLevel());
+ writeInt(sk.getReuseDelayGroup());
+ writeByte(0);
+ writeByte(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java
index f9b697323e..548d4ebfac 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pet;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
-public class PetDelete implements IClientOutgoingPacket
+public class PetDelete extends ServerPacket
{
private final int _petType;
private final int _petObjId;
@@ -32,11 +31,10 @@ public class PetDelete implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_DELETE.writeId(packet);
- packet.writeD(_petType);
- packet.writeD(_petObjId);
- return true;
+ ServerPackets.PET_DELETE.writeId(this);
+ writeInt(_petType);
+ writeInt(_petObjId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
index f7df4c78cc..fdc110c324 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
@@ -18,20 +18,19 @@ package org.l2jmobius.gameserver.network.serverpackets.pet;
import java.util.Set;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.EvolveLevel;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.actor.instance.Servitor;
import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
/**
* 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
*/
-public class PetInfo implements IClientOutgoingPacket
+public class PetInfo extends ServerPacket
{
private final Summon _summon;
private final int _value;
@@ -95,102 +94,101 @@ public class PetInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_INFO.writeId(packet);
- packet.writeC(_summon.getSummonType());
- packet.writeD(_summon.getObjectId());
- packet.writeD(_summon.getTemplate().getDisplayId() + 1000000);
- packet.writeD(_summon.getX());
- packet.writeD(_summon.getY());
- packet.writeD(_summon.getZ());
- packet.writeD(_summon.getHeading());
- packet.writeD(_summon.getStat().getMAtkSpd());
- packet.writeD(_summon.getStat().getPAtkSpd());
- packet.writeH(_runSpd);
- packet.writeH(_walkSpd);
- packet.writeH(_swimRunSpd);
- packet.writeH(_swimWalkSpd);
- packet.writeH(_flRunSpd);
- packet.writeH(_flWalkSpd);
- packet.writeH(_flyRunSpd);
- packet.writeH(_flyWalkSpd);
- packet.writeF(_moveMultiplier);
- packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
- packet.writeF(_summon.getTemplate().getFCollisionRadius());
- packet.writeF(_summon.getTemplate().getFCollisionHeight());
- packet.writeD(_summon.getWeapon()); // right hand weapon
- packet.writeD(_summon.getArmor()); // body armor
- packet.writeD(0); // left hand weapon
- packet.writeC(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
- packet.writeD(-1); // High Five NPCString ID
+ ServerPackets.PET_INFO.writeId(this);
+ writeByte(_summon.getSummonType());
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+ writeInt(_summon.getX());
+ writeInt(_summon.getY());
+ writeInt(_summon.getZ());
+ writeInt(_summon.getHeading());
+ writeInt(_summon.getStat().getMAtkSpd());
+ writeInt(_summon.getStat().getPAtkSpd());
+ writeShort(_runSpd);
+ writeShort(_walkSpd);
+ writeShort(_swimRunSpd);
+ writeShort(_swimWalkSpd);
+ writeShort(_flRunSpd);
+ writeShort(_flWalkSpd);
+ writeShort(_flyRunSpd);
+ writeShort(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+ writeDouble(_summon.getTemplate().getFCollisionRadius());
+ writeDouble(_summon.getTemplate().getFCollisionHeight());
+ writeInt(_summon.getWeapon()); // right hand weapon
+ writeInt(_summon.getArmor()); // body armor
+ writeInt(0); // left hand weapon
+ writeByte(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
+ writeInt(-1); // High Five NPCString ID
if (_summon.isPet())
{
- packet.writeS(_summon.getName()); // Pet name.
+ writeString(_summon.getName()); // Pet name.
}
else
{
- packet.writeS(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+ writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
}
- packet.writeD(-1); // High Five NPCString ID
- packet.writeS(_summon.getTitle()); // owner name
- packet.writeC(_summon.getPvpFlag()); // confirmed
- packet.writeD(_summon.getReputation()); // confirmed
- packet.writeD(_curFed); // how fed it is
- packet.writeD(_maxFed); // max fed it can be
- packet.writeD((int) _summon.getCurrentHp()); // current hp
- packet.writeD(_summon.getMaxHp()); // max hp
- packet.writeD((int) _summon.getCurrentMp()); // current mp
- packet.writeD(_summon.getMaxMp()); // max mp
- packet.writeQ(_summon.getStat().getSp()); // sp
- packet.writeH(_summon.getLevel()); // level
- packet.writeQ(_summon.getStat().getExp());
+ writeInt(-1); // High Five NPCString ID
+ writeString(_summon.getTitle()); // owner name
+ writeByte(_summon.getPvpFlag()); // confirmed
+ writeInt(_summon.getReputation()); // confirmed
+ writeInt(_curFed); // how fed it is
+ writeInt(_maxFed); // max fed it can be
+ writeInt((int) _summon.getCurrentHp()); // current hp
+ writeInt(_summon.getMaxHp()); // max hp
+ writeInt((int) _summon.getCurrentMp()); // current mp
+ writeInt(_summon.getMaxMp()); // max mp
+ writeLong(_summon.getStat().getSp()); // sp
+ writeShort(_summon.getLevel()); // level
+ writeLong(_summon.getStat().getExp());
// 0% absolute value
- packet.writeQ(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
- packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value
- packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
- packet.writeD(_summon.getMaxLoad()); // max weight it can carry
- packet.writeD(_summon.getPAtk()); // patk
- packet.writeD(_summon.getPDef()); // pdef
- packet.writeD(_summon.getAccuracy()); // accuracy
- packet.writeD(_summon.getEvasionRate()); // evasion
- packet.writeD(_summon.getCriticalHit()); // critical
- packet.writeD(_summon.getMAtk()); // matk
- packet.writeD(_summon.getMDef()); // mdef
- packet.writeD(_summon.getMagicAccuracy()); // magic accuracy
- packet.writeD(_summon.getMagicEvasionRate()); // magic evasion
- packet.writeD(_summon.getMCriticalHit()); // mcritical
- packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed
- packet.writeD(_summon.getPAtkSpd()); // atkspeed
- packet.writeD(_summon.getMAtkSpd()); // casting speed
- packet.writeC(0); // TODO: Check me, might be ride status
- packet.writeC(_summon.getTeam().getId()); // Confirmed
- packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
- packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
- packet.writeD(-1);
- packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
- packet.writeC(0); // Used Summon Points
- packet.writeC(0); // Maximum Summon Points
+ writeLong(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
+ writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+ writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+ writeInt(_summon.getMaxLoad()); // max weight it can carry
+ writeInt(_summon.getPAtk()); // patk
+ writeInt(_summon.getPDef()); // pdef
+ writeInt(_summon.getAccuracy()); // accuracy
+ writeInt(_summon.getEvasionRate()); // evasion
+ writeInt(_summon.getCriticalHit()); // critical
+ writeInt(_summon.getMAtk()); // matk
+ writeInt(_summon.getMDef()); // mdef
+ writeInt(_summon.getMagicAccuracy()); // magic accuracy
+ writeInt(_summon.getMagicEvasionRate()); // magic evasion
+ writeInt(_summon.getMCriticalHit()); // mcritical
+ writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+ writeInt(_summon.getPAtkSpd()); // atkspeed
+ writeInt(_summon.getMAtkSpd()); // casting speed
+ writeByte(0); // TODO: Check me, might be ride status
+ writeByte(_summon.getTeam().getId()); // Confirmed
+ writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+ writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+ writeInt(-1);
+ writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+ writeByte(0); // Used Summon Points
+ writeByte(0); // Maximum Summon Points
final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
- packet.writeH(aves.size()); // Confirmed
+ writeShort(aves.size()); // Confirmed
for (AbnormalVisualEffect ave : aves)
{
- packet.writeH(ave.getClientId()); // Confirmed
+ writeShort(ave.getClientId()); // Confirmed
}
- packet.writeC(_statusMask);
+ writeByte(_statusMask);
if (_summon.isPet())
{
final Pet pet = (Pet) _summon;
- packet.writeD(pet.getPetData().getType());
- packet.writeD(pet.getEvolveLevel());
- packet.writeD(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
+ writeInt(pet.getPetData().getType());
+ writeInt(pet.getEvolveLevel());
+ writeInt(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
}
else
{
- packet.writeD(0);
- packet.writeD(EvolveLevel.None.ordinal());
- packet.writeD(0);
+ writeInt(0);
+ writeInt(EvolveLevel.None.ordinal());
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java
index 19688209cb..733058f749 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java
@@ -18,10 +18,9 @@ package org.l2jmobius.gameserver.network.serverpackets.pet;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractInventoryUpdate;
/**
@@ -44,10 +43,9 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet);
- writeItems(packet);
- return true;
+ ServerPackets.PET_INVENTORY_UPDATE.writeId(this);
+ writeItems();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java
index 80e9863809..e4a70ca633 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java
@@ -18,9 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets.pet;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
public class PetItemList extends AbstractItemPacket
@@ -33,14 +32,13 @@ public class PetItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_ITEM_LIST.writeId(packet);
- packet.writeH(_items.size());
+ ServerPackets.PET_ITEM_LIST.writeId(this);
+ writeShort(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
+ writeItem(item);
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java
index d2e571e518..1b496cf579 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pet;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Yme
*/
-public class PetStatusShow implements IClientOutgoingPacket
+public class PetStatusShow extends ServerPacket
{
private final int _summonType;
private final int _summonObjectId;
@@ -36,11 +35,10 @@ public class PetStatusShow implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_STATUS_SHOW.writeId(packet);
- packet.writeD(_summonType);
- packet.writeD(_summonObjectId);
- return true;
+ ServerPackets.PET_STATUS_SHOW.writeId(this);
+ writeInt(_summonType);
+ writeInt(_summonObjectId);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java
index 9f1edddf54..3ffe1c2e57 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pet;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @version $Revision: 1.5.2.3.2.5 $ $Date: 2005/03/29 23:15:10 $
*/
-public class PetStatusUpdate implements IClientOutgoingPacket
+public class PetStatusUpdate extends ServerPacket
{
private final Summon _summon;
private int _maxFed;
@@ -50,26 +49,25 @@ public class PetStatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_STATUS_UPDATE.writeId(packet);
- packet.writeD(_summon.getSummonType());
- packet.writeD(_summon.getObjectId());
- packet.writeD(_summon.getX());
- packet.writeD(_summon.getY());
- packet.writeD(_summon.getZ());
- packet.writeS(_summon.getTitle());
- packet.writeD(_curFed);
- packet.writeD(_maxFed);
- packet.writeD((int) _summon.getCurrentHp());
- packet.writeD(_summon.getMaxHp());
- packet.writeD((int) _summon.getCurrentMp());
- packet.writeD(_summon.getMaxMp());
- packet.writeD(_summon.getLevel());
- packet.writeQ(_summon.getStat().getExp());
- packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value
- packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value
- packet.writeD(1); // TODO: Find me!
- return true;
+ ServerPackets.PET_STATUS_UPDATE.writeId(this);
+ writeInt(_summon.getSummonType());
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getX());
+ writeInt(_summon.getY());
+ writeInt(_summon.getZ());
+ writeString(_summon.getTitle());
+ writeInt(_curFed);
+ writeInt(_maxFed);
+ writeInt((int) _summon.getCurrentHp());
+ writeInt(_summon.getMaxHp());
+ writeInt((int) _summon.getCurrentMp());
+ writeInt(_summon.getMaxMp());
+ writeInt(_summon.getLevel());
+ writeLong(_summon.getStat().getExp());
+ writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+ writeLong(_summon.getExpForNextLevel()); // 100% absolute value
+ writeInt(1); // TODO: Find me!
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java
index df5be64f25..544253679b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Index
*/
-public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket
+public class ExPledgeClassicRaidInfo extends ServerPacket
{
private final Clan _clan;
@@ -36,25 +35,24 @@ public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_CLASSIC_RAID_INFO.writeId(packet);
+ ServerPackets.EX_PLEDGE_CLASSIC_RAID_INFO.writeId(this);
if (_clan == null)
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
final int stage = GlobalVariablesManager.getInstance().getInt(GlobalVariablesManager.MONSTER_ARENA_VARIABLE + _clan.getId(), 0);
- packet.writeD(stage);
+ writeInt(stage);
// Skill rewards.
- packet.writeD(5);
+ writeInt(5);
for (int i = 1; i <= 5; i++)
{
- packet.writeD(1867);
- packet.writeD(i);
+ writeInt(1867);
+ writeInt(i);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeDonationInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeDonationInfo.java
index b63ea2c5ce..27bb208417 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeDonationInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeDonationInfo.java
@@ -16,21 +16,19 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 22.04.2021
+ * @author Berezkin Nikolay
*/
-public class ExPledgeDonationInfo implements IClientOutgoingPacket
+public class ExPledgeDonationInfo extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_DONATION_INFO.writeId(packet);
- packet.writeD(0);
- packet.writeC(1);
- return true;
+ ServerPackets.EX_PLEDGE_DONATION_INFO.writeId(this);
+ writeInt(0);
+ writeByte(1);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeEnemyInfoList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeEnemyInfoList.java
index 8adf54e18a..ca41df70c7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeEnemyInfoList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeEnemyInfoList.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV3;
import java.util.List;
import java.util.stream.Collectors;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ClanWarState;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanWar;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 04.05.2021
+ * @author Berezkin Nikolay
*/
-public class ExPledgeEnemyInfoList implements IClientOutgoingPacket
+public class ExPledgeEnemyInfoList extends ServerPacket
{
private final Clan _playerClan;
private final List _warList;
@@ -41,18 +40,17 @@ public class ExPledgeEnemyInfoList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_ENEMY_INFO_LIST.writeId(packet);
- packet.writeD(_warList.size());
+ ServerPackets.EX_PLEDGE_ENEMY_INFO_LIST.writeId(this);
+ writeInt(_warList.size());
for (ClanWar war : _warList)
{
final Clan clan = war.getOpposingClan(_playerClan);
- packet.writeD(clan.getRank());
- packet.writeD(clan.getId());
- packet.writeString(clan.getName());
- packet.writeString(clan.getLeaderName());
+ writeInt(clan.getRank());
+ writeInt(clan.getId());
+ writeSizedString(clan.getName());
+ writeSizedString(clan.getLeaderName());
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeLevelUp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeLevelUp.java
index bef348267e..da9b57a49f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeLevelUp.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeLevelUp.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 08.05.2021
+ * @author Berezkin Nikolay
*/
-public class ExPledgeLevelUp implements IClientOutgoingPacket
+public class ExPledgeLevelUp extends ServerPacket
{
private final int _level;
@@ -33,10 +32,9 @@ public class ExPledgeLevelUp implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_LEVEL_UP.writeId(packet);
- packet.writeD(_level);
- return true;
+ ServerPackets.EX_PLEDGE_LEVEL_UP.writeId(this);
+ writeInt(_level);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeV3Info.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeV3Info.java
index 6b02257c13..7cb545a252 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeV3Info.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeV3Info.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgeV3;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 04.05.2021 22 C0 00 00 00 00 00 00 00 00 00
+ * @author Berezkin Nikolay
*/
-public class ExPledgeV3Info implements IClientOutgoingPacket
+public class ExPledgeV3Info extends ServerPacket
{
private final int _points;
private final int _rank;
@@ -39,13 +38,12 @@ public class ExPledgeV3Info implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_V3_INFO.writeId(packet);
- packet.writeD(_points);
- packet.writeD(_rank);
- packet.writeString(_announce);
- packet.writeC(_isShowOnEnter ? 1 : 0);
- return true;
+ ServerPackets.EX_PLEDGE_V3_INFO.writeId(this);
+ writeInt(_points);
+ writeInt(_rank);
+ writeSizedString(_announce);
+ writeByte(_isShowOnEnter);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java
index cc69c4af1e..1264afb746 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java
@@ -18,32 +18,30 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgebonus;
import java.util.Comparator;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.ClanRewardData;
import org.l2jmobius.gameserver.enums.ClanRewardType;
import org.l2jmobius.gameserver.model.clan.ClanRewardBonus;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExPledgeBonusList implements IClientOutgoingPacket
+public class ExPledgeBonusList extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet);
- packet.writeC(0); // 140
+ ServerPackets.EX_PLEDGE_BONUS_LIST.writeId(this);
+ writeByte(0); // 140
ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus ->
{
- packet.writeD(bonus.getSkillReward().getSkillId());
+ writeInt(bonus.getSkillReward().getSkillId());
});
- packet.writeC(0); // 140
+ writeByte(0); // 140
ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus ->
{
- packet.writeD(bonus.getSkillReward().getSkillId());
+ writeInt(bonus.getSkillReward().getSkillId());
});
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java
index 5545599882..af5550c52d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgebonus;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExPledgeBonusMarkReset implements IClientOutgoingPacket
+public class ExPledgeBonusMarkReset extends ServerPacket
{
public static ExPledgeBonusMarkReset STATIC_PACKET = new ExPledgeBonusMarkReset();
@@ -32,9 +31,8 @@ public class ExPledgeBonusMarkReset implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_BONUS_MARK_RESET.writeId(packet);
- return true;
+ ServerPackets.EX_PLEDGE_BONUS_MARK_RESET.writeId(this);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java
index 3db1b1c11b..8e003f343d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java
@@ -16,24 +16,20 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgebonus;
-import java.util.logging.Logger;
-
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.ClanRewardData;
import org.l2jmobius.gameserver.enums.ClanRewardType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanRewardBonus;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExPledgeBonusOpen implements IClientOutgoingPacket
+public class ExPledgeBonusOpen extends ServerPacket
{
- private static final Logger LOGGER = Logger.getLogger(ExPledgeBonusOpen.class.getName());
-
private final Player _player;
public ExPledgeBonusOpen(Player player)
@@ -42,13 +38,13 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final Clan clan = _player.getClan();
if (clan == null)
{
- LOGGER.warning("Player: " + _player + " attempting to write to a null clan!");
- return false;
+ PacketLogger.warning("Player: " + _player + " attempting to write to a null clan!");
+ return;
}
final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE);
final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS);
@@ -56,40 +52,40 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket
final ClanRewardBonus huntingBonus = ClanRewardType.HUNTING_MONSTERS.getAvailableBonus(clan);
if (highestMembersOnlineBonus == null)
{
- LOGGER.warning("Couldn't find highest available clan members online bonus!!");
- return false;
+ PacketLogger.warning("Couldn't find highest available clan members online bonus!!");
+ return;
}
else if (highestHuntingBonus == null)
{
- LOGGER.warning("Couldn't find highest available clan hunting bonus!!");
- return false;
+ PacketLogger.warning("Couldn't find highest available clan hunting bonus!!");
+ return;
}
else if (highestMembersOnlineBonus.getSkillReward() == null)
{
- LOGGER.warning("Couldn't find skill reward for highest available members online bonus!!");
- return false;
+ PacketLogger.warning("Couldn't find skill reward for highest available members online bonus!!");
+ return;
}
else if (highestHuntingBonus.getSkillReward() == null)
{
- LOGGER.warning("Couldn't find skill reward for highest available hunting bonus!!");
- return false;
+ PacketLogger.warning("Couldn't find skill reward for highest available hunting bonus!!");
+ return;
}
+
// General OP Code
- OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet);
+ ServerPackets.EX_PLEDGE_BONUS_OPEN.writeId(this);
// Members online bonus
- packet.writeD(highestMembersOnlineBonus.getRequiredAmount());
- packet.writeD(clan.getMaxOnlineMembers());
- packet.writeC(2); // 140
- packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0);
- packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0);
- packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0);
+ writeInt(highestMembersOnlineBonus.getRequiredAmount());
+ writeInt(clan.getMaxOnlineMembers());
+ writeByte(2); // 140
+ writeInt(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0);
+ writeByte(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0);
+ writeByte(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE));
// Hunting bonus
- packet.writeD(highestHuntingBonus.getRequiredAmount());
- packet.writeD(clan.getHuntingPoints());
- packet.writeC(2); // 140
- packet.writeD(huntingBonus != null ? highestHuntingBonus.getSkillReward().getSkillId() : 0);
- packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0);
- packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0);
- return true;
+ writeInt(highestHuntingBonus.getRequiredAmount());
+ writeInt(clan.getHuntingPoints());
+ writeByte(2); // 140
+ writeInt(huntingBonus != null ? highestHuntingBonus.getSkillReward().getSkillId() : 0);
+ writeByte(huntingBonus != null ? huntingBonus.getLevel() : 0);
+ writeByte(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java
index c0eeb671fa..d2c99ac298 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgebonus;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ClanRewardType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExPledgeBonusUpdate implements IClientOutgoingPacket
+public class ExPledgeBonusUpdate extends ServerPacket
{
private final ClanRewardType _type;
private final int _value;
@@ -36,11 +35,10 @@ public class ExPledgeBonusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_BONUS_UPDATE.writeId(packet);
- packet.writeC(_type.getClientId());
- packet.writeD(_value);
- return true;
+ ServerPackets.EX_PLEDGE_BONUS_UPDATE.writeId(this);
+ writeByte(_type.getClientId());
+ writeInt(_value);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java
index 21020e8d87..fa3c1c933a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgedonation;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 09.05.2021
+ * @author Berezkin Nikolay
*/
-public class ExPledgeContributionList implements IClientOutgoingPacket
+public class ExPledgeContributionList extends ServerPacket
{
private final Collection _contributors;
@@ -36,16 +35,15 @@ public class ExPledgeContributionList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_CONTRIBUTION_LIST.writeId(packet);
- packet.writeD(_contributors.size());
+ ServerPackets.EX_PLEDGE_CONTRIBUTION_LIST.writeId(this);
+ writeInt(_contributors.size());
for (ClanMember contributor : _contributors)
{
- packet.writeString(contributor.getName());
- packet.writeD(contributor.getClan().getClanContributionWeekly(contributor.getObjectId()));
- packet.writeD(contributor.getClan().getClanContribution(contributor.getObjectId()));
+ writeSizedString(contributor.getName());
+ writeInt(contributor.getClan().getClanContributionWeekly(contributor.getObjectId()));
+ writeInt(contributor.getClan().getClanContribution(contributor.getObjectId()));
}
- return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationInfo.java
index 76a7ce2690..58065d9684 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgedonation;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 08.05.2021 00 01 00 00 00 00 00 03 00 00 00 0E 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00 00 00
+ * @author Berezkin Nikolay
*/
-public class ExPledgeDonationInfo implements IClientOutgoingPacket
+public class ExPledgeDonationInfo extends ServerPacket
{
private final int _curPoints;
private final boolean _accepted;
@@ -35,11 +34,10 @@ public class ExPledgeDonationInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_DONATION_INFO.writeId(packet);
- packet.writeD(_curPoints);
- packet.writeC(_accepted ? 0 : 1);
- return true;
+ ServerPackets.EX_PLEDGE_DONATION_INFO.writeId(this);
+ writeInt(_curPoints);
+ writeByte(!_accepted);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationRequest.java
index da43bbe4c7..e50dc7c0a2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeDonationRequest.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.pledgedonation;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
- * Written by Berezkin Nikolay, on 08.05.2021 00 01 00 00 00 00 00 03 00 00 00 0E 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00 00 00 00 01 00 00 00 00 00 03 00 00 00 0E 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00
+ * @author Berezkin Nikolay
*/
-public class ExPledgeDonationRequest implements IClientOutgoingPacket
+public class ExPledgeDonationRequest extends ServerPacket
{
private final boolean _success;
private final int _type;
@@ -37,17 +36,16 @@ public class ExPledgeDonationRequest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_DONATION_REQUEST.writeId(packet);
- packet.writeC(_type);
- packet.writeD(_success ? 1 : 0);
- packet.writeH(0);
- packet.writeD(3);
- packet.writeD(14);
- packet.writeQ(0);
- packet.writeH(0);
- packet.writeD(_curPoints);
- return true;
+ ServerPackets.EX_PLEDGE_DONATION_REQUEST.writeId(this);
+ writeByte(_type);
+ writeInt(_success);
+ writeShort(0);
+ writeInt(3);
+ writeInt(14);
+ writeLong(0);
+ writeShort(0);
+ writeInt(_curPoints);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java
index a43c4c684c..e4851f0b58 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.primeshop;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ExBrProductReplyType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Gnacik, UnAfraid
*/
-public class ExBRBuyProduct implements IClientOutgoingPacket
+public class ExBRBuyProduct extends ServerPacket
{
private final int _reply;
@@ -34,10 +33,9 @@ public class ExBRBuyProduct implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet);
- packet.writeD(_reply);
- return true;
+ ServerPackets.EX_BR_BUY_PRODUCT.writeId(this);
+ writeInt(_reply);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java
index 91a186b81d..b64a92eceb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.primeshop;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Gnacik, UnAfraid
*/
-public class ExBRGamePoint implements IClientOutgoingPacket
+public class ExBRGamePoint extends ServerPacket
{
private final int _charId;
private final int _charPoints;
@@ -36,12 +35,11 @@ public class ExBRGamePoint implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_GAME_POINT.writeId(packet);
- packet.writeD(_charId);
- packet.writeQ(_charPoints);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_BR_GAME_POINT.writeId(this);
+ writeInt(_charId);
+ writeLong(_charPoints);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java
index e36f2ff502..5f37d830f1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.primeshop;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Gnacik
*/
-public class ExBRProductInfo implements IClientOutgoingPacket
+public class ExBRProductInfo extends ServerPacket
{
private final PrimeShopGroup _item;
private final int _charPoints;
@@ -42,22 +41,21 @@ public class ExBRProductInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet);
- packet.writeD(_item.getBrId());
- packet.writeD(_item.getPrice());
- packet.writeD(_item.getItems().size());
+ ServerPackets.EX_BR_PRODUCT_INFO.writeId(this);
+ writeInt(_item.getBrId());
+ writeInt(_item.getPrice());
+ writeInt(_item.getItems().size());
for (PrimeShopItem item : _item.getItems())
{
- packet.writeD(item.getId());
- packet.writeD((int) item.getCount());
- packet.writeD(item.getWeight());
- packet.writeD(item.isTradable());
+ writeInt(item.getId());
+ writeInt((int) item.getCount());
+ writeInt(item.getWeight());
+ writeInt(item.isTradable());
}
- packet.writeQ(_charAdena);
- packet.writeQ(_charPoints);
- packet.writeQ(_charCoins); // Hero coins
- return true;
+ writeLong(_charAdena);
+ writeLong(_charPoints);
+ writeLong(_charCoins); // Hero coins
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java
index 609d459cc6..e56f7b906f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java
@@ -18,18 +18,17 @@ package org.l2jmobius.gameserver.network.serverpackets.primeshop;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem;
import org.l2jmobius.gameserver.model.variables.AccountVariables;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author UnAfraid
*/
-public class ExBRProductList implements IClientOutgoingPacket
+public class ExBRProductList extends ServerPacket
{
private final Player _player;
private final int _type;
@@ -43,80 +42,79 @@ public class ExBRProductList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet);
- packet.writeQ(_player.getAdena()); // Adena
- packet.writeQ(0); // Hero coins
- packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites
- packet.writeD(_primeList.size());
+ ServerPackets.EX_BR_PRODUCT_LIST.writeId(this);
+ writeLong(_player.getAdena()); // Adena
+ writeLong(0); // Hero coins
+ writeByte(_type); // Type 0 - Home, 1 - History, 2 - Favorites
+ writeInt(_primeList.size());
for (PrimeShopGroup brItem : _primeList)
{
- packet.writeD(brItem.getBrId());
- packet.writeC(brItem.getCat());
- packet.writeC(brItem.getPaymentType()); // Payment Type: 0 - Prime Points, 1 - Adena, 2 - Hero Coins
- packet.writeD(brItem.getPrice());
- packet.writeC(brItem.getPanelType()); // Item Panel Type: 0 - None, 1 - Event, 2 - Sale, 3 - New, 4 - Best
- packet.writeD(brItem.getRecommended()); // Recommended: (bit flags) 1 - Top, 2 - Left, 4 - Right
- packet.writeD(brItem.getStartSale());
- packet.writeD(brItem.getEndSale());
- packet.writeC(brItem.getDaysOfWeek());
- packet.writeC(brItem.getStartHour());
- packet.writeC(brItem.getStartMinute());
- packet.writeC(brItem.getStopHour());
- packet.writeC(brItem.getStopMinute());
+ writeInt(brItem.getBrId());
+ writeByte(brItem.getCat());
+ writeByte(brItem.getPaymentType()); // Payment Type: 0 - Prime Points, 1 - Adena, 2 - Hero Coins
+ writeInt(brItem.getPrice());
+ writeByte(brItem.getPanelType()); // Item Panel Type: 0 - None, 1 - Event, 2 - Sale, 3 - New, 4 - Best
+ writeInt(brItem.getRecommended()); // Recommended: (bit flags) 1 - Top, 2 - Left, 4 - Right
+ writeInt(brItem.getStartSale());
+ writeInt(brItem.getEndSale());
+ writeByte(brItem.getDaysOfWeek());
+ writeByte(brItem.getStartHour());
+ writeByte(brItem.getStartMinute());
+ writeByte(brItem.getStopHour());
+ writeByte(brItem.getStopMinute());
// Daily account limit.
if ((brItem.getAccountDailyLimit() > 0) && (_player.getAccountVariables().getInt(AccountVariables.PRIME_SHOP_PRODUCT_DAILY_COUNT + brItem.getBrId(), 0) >= brItem.getAccountDailyLimit()))
{
- packet.writeD(brItem.getAccountDailyLimit());
- packet.writeD(brItem.getAccountDailyLimit());
+ writeInt(brItem.getAccountDailyLimit());
+ writeInt(brItem.getAccountDailyLimit());
}
// General account limit.
else if ((brItem.getAccountBuyLimit() > 0) && (_player.getAccountVariables().getInt(AccountVariables.PRIME_SHOP_PRODUCT_COUNT + brItem.getBrId(), 0) >= brItem.getAccountBuyLimit()))
{
- packet.writeD(brItem.getAccountBuyLimit());
- packet.writeD(brItem.getAccountBuyLimit());
+ writeInt(brItem.getAccountBuyLimit());
+ writeInt(brItem.getAccountBuyLimit());
}
else
{
- packet.writeD(brItem.getStock());
- packet.writeD(brItem.getTotal());
+ writeInt(brItem.getStock());
+ writeInt(brItem.getTotal());
}
- packet.writeC(brItem.getSalePercent());
- packet.writeC(brItem.getMinLevel());
- packet.writeC(brItem.getMaxLevel());
- packet.writeD(brItem.getMinBirthday());
- packet.writeD(brItem.getMaxBirthday());
+ writeByte(brItem.getSalePercent());
+ writeByte(brItem.getMinLevel());
+ writeByte(brItem.getMaxLevel());
+ writeInt(brItem.getMinBirthday());
+ writeInt(brItem.getMaxBirthday());
// Daily account limit.
if (brItem.getAccountDailyLimit() > 0)
{
- packet.writeD(1); // Days
- packet.writeD(brItem.getAccountDailyLimit()); // Amount
+ writeInt(1); // Days
+ writeInt(brItem.getAccountDailyLimit()); // Amount
}
// General account limit.
else if (brItem.getAccountBuyLimit() > 0)
{
- packet.writeD(-1); // Days
- packet.writeD(brItem.getAccountBuyLimit()); // Amount
+ writeInt(-1); // Days
+ writeInt(brItem.getAccountBuyLimit()); // Amount
}
else
{
- packet.writeD(0); // Days
- packet.writeD(0); // Amount
+ writeInt(0); // Days
+ writeInt(0); // Amount
}
- packet.writeC(brItem.getItems().size());
+ writeByte(brItem.getItems().size());
for (PrimeShopItem item : brItem.getItems())
{
- packet.writeD(item.getId());
- packet.writeD((int) item.getCount());
- packet.writeD(item.getWeight());
- packet.writeD(item.isTradable());
+ writeInt(item.getId());
+ writeInt((int) item.getCount());
+ writeInt(item.getWeight());
+ writeInt(item.isTradable());
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
index 31bca3fd66..e8118b956a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
@@ -19,15 +19,14 @@ package org.l2jmobius.gameserver.network.serverpackets.raidbossinfo;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Mobius
*/
-public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
+public class ExRaidBossSpawnInfo extends ServerPacket
{
private final Map _statuses;
@@ -38,16 +37,15 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet);
- packet.writeD(_statuses.size()); // count
+ ServerPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(this);
+ writeInt(_statuses.size()); // count
for (Entry