+{
+ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/OutgoingPackets.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ServerPackets.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/OutgoingPackets.java
rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ServerPackets.java
index b1610e5eef..7550780801 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/OutgoingPackets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_OUTOF_RANGE(0x02),
@@ -515,28 +514,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)
{
@@ -547,22 +536,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
index 9600c6b8de..ed3c9eeb81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.CrystalType;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public abstract class AbstractRefinePacket implements IClientIncomingPacket
+public abstract class AbstractRefinePacket implements ClientPacket
{
public static final int GRADE_NONE = 0;
public static final int GRADE_MID = 1;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index 827e05cab9..17fab57a87 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
index d6b3543d1a..759db5e773 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -30,19 +30,18 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd;
/**
* @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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
index 192c962173..020d7a5fab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
index 1a6ee7dd57..dec31eeb44 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index acab47f316..78aac61c4a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
index 88ba1ea945..b0843b21ad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
@@ -33,15 +33,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
* Format: (ch) d
* @author -Wooden-, Tryskell
*/
-public class AnswerJoinPartyRoom implements IClientIncomingPacket
+public class AnswerJoinPartyRoom implements ClientPacket
{
private int _answer; // 1 or 0
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
index 568ed16d83..a79f55e434 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index 24ee306c05..bae8f10772 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index 822cc69db7..2014400676 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.ExBrExtraUserInfo;
@@ -31,14 +30,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
index 29f10446ee..ab9b34d7c7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
index adfcd706e8..86cc54c280 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
index 0c5c2d55c7..4bd48ece99 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index b47439803f..22e202f0e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index 544c9e6e68..18cac5c24f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
index ab37b24b64..282ac5d44f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
index 62d5f0d6db..35984a9917 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.FakePlayerData;
import org.l2jmobius.gameserver.data.xml.InitialEquipmentData;
@@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk;
import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
import org.l2jmobius.gameserver.util.Util;
-public class CharacterCreate implements IClientIncomingPacket
+public class CharacterCreate implements ClientPacket
{
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
@@ -67,22 +67,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();
- packet.readD(); // race
- _sex = (byte) packet.readD();
- _classId = packet.readD();
- packet.readD(); // _int
- packet.readD(); // _str
- packet.readD(); // _con
- packet.readD(); // _men
- packet.readD(); // _dex
- packet.readD(); // _wit
- _hairStyle = (byte) packet.readD();
- _hairColor = (byte) packet.readD();
- _face = (byte) packet.readD();
- return true;
+ _name = packet.readString();
+ packet.readInt(); // race
+ _sex = (byte) packet.readInt();
+ _classId = packet.readInt();
+ packet.readInt(); // _int
+ packet.readInt(); // _str
+ packet.readInt(); // _con
+ packet.readInt(); // _men
+ packet.readInt(); // _dex
+ packet.readInt(); // _wit
+ _hairStyle = (byte) packet.readInt();
+ _hairColor = (byte) packet.readInt();
+ _face = (byte) packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
index 3ed3916fe3..cc4d99c14d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.CharSelectInfoPackage;
import org.l2jmobius.gameserver.model.events.Containers;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
@@ -31,16 +31,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
index 75cac54042..d137f4e3dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
index cbbe9570db..4c68fa1f16 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -46,7 +46,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");
@@ -63,14 +63,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
@@ -113,7 +112,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ClientPacket.java
similarity index 77%
rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ClientPacket.java
index 62e69acd86..a66863d984 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index 69ada66b3d..372d1d9d6c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/DummyPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/DummyPacket.java
deleted file mode 100644
index 826e05e364..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/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 true;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
index 6db67e3a4e..8ce00d6b4f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.enums.Movie;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.MovieHolder;
@@ -25,15 +25,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 3bf8b901bc..c94c6d5425 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -111,30 +111,29 @@ 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)
{
- packet.readB(32); // Unknown Byte Array
- packet.readD(); // Unknown Value
- packet.readD(); // Unknown Value
- packet.readD(); // Unknown Value
- packet.readD(); // Unknown Value
- packet.readB(32); // Unknown Byte Array
- packet.readD(); // Unknown Value
+ packet.readBytes(32); // Unknown Byte Array
+ packet.readInt(); // Unknown Value
+ packet.readInt(); // Unknown Value
+ packet.readInt(); // Unknown Value
+ packet.readInt(); // Unknown Value
+ packet.readBytes(32); // Unknown Byte Array
+ packet.readInt(); // Unknown Value
for (int i = 0; i < 5; i++)
{
for (int o = 0; o < 4; o++)
{
- _tracert[i][o] = packet.readC();
+ _tracert[i][o] = packet.readByte();
}
}
- return true;
}
@Override
@@ -756,9 +755,6 @@ public class EnterWorld implements IClientIncomingPacket
}
}
- /**
- * @param player
- */
private void notifyClanMembers(Player player)
{
final Clan clan = player.getClan();
@@ -773,9 +769,6 @@ public class EnterWorld implements IClientIncomingPacket
}
}
- /**
- * @param player
- */
private void notifySponsorOrApprentice(Player player)
{
if (player.getSponsor() != 0)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
index 05d943f009..66e9817af6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
index 580f082b42..33904e57d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 true;
+ _x = packet.readInt();
+ _y = packet.readInt();
+ _z = packet.readInt();
+ _shipId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExPacket.java
index 75c26ee8c9..6a214a705c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
index 3b59829eca..a7760b41f5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
index 4e91188f5c..17794f928d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
index 451537877b..8d9c627aa3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
@@ -35,16 +34,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 677a583efd..232f11bd18 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -16,10 +16,8 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import java.nio.BufferUnderflowException;
-
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.model.Location;
@@ -32,9 +30,8 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.StopMove;
-import org.l2jmobius.gameserver.util.Util;
-public class MoveBackwardToLocation implements IClientIncomingPacket
+public class MoveBackwardToLocation implements ClientPacket
{
private int _targetX;
private int _targetY;
@@ -45,27 +42,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();
- try
- {
- _movementMode = packet.readD(); // is 0 if cursor keys are used 1 if mouse is used
- }
- catch (BufferUnderflowException e)
- {
- if (Config.L2WALKER_PROTECTION)
- {
- final Player player = client.getPlayer();
- Util.handleIllegalPlayerAction(player, player + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH);
- }
- }
- 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
index ed196080e3..6b4f770893 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
index 0fdbec0a51..2711a76556 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
index 6e87353b11..1eb521b9ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 true;
+ _dx = packet.readInt();
+ _dy = packet.readInt();
+ _dz = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 73c497a4d1..82babf281a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.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.xml.MultisellData;
import org.l2jmobius.gameserver.model.Augmentation;
import org.l2jmobius.gameserver.model.Elementals;
@@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* The Class MultiSellChoose.
*/
-public class MultiSellChoose implements IClientIncomingPacket
+public class MultiSellChoose implements ClientPacket
{
private int _listId;
private int _entryId;
@@ -70,23 +70,22 @@ public class MultiSellChoose implements IClientIncomingPacket
private int _unk11;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _listId = packet.readD();
- _entryId = packet.readD();
- _amount = packet.readQ();
- _unk1 = packet.readH();
- _unk2 = packet.readD();
- _unk3 = packet.readD();
- _unk4 = packet.readH(); // elemental attributes
- _unk5 = packet.readH(); // elemental attributes
- _unk6 = packet.readH(); // elemental attributes
- _unk7 = packet.readH(); // elemental attributes
- _unk8 = packet.readH(); // elemental attributes
- _unk9 = packet.readH(); // elemental attributes
- _unk10 = packet.readH(); // elemental attributes
- _unk11 = packet.readH(); // elemental attributes
- return true;
+ _listId = packet.readInt();
+ _entryId = packet.readInt();
+ _amount = packet.readLong();
+ _unk1 = packet.readShort();
+ _unk2 = packet.readInt();
+ _unk3 = packet.readInt();
+ _unk4 = packet.readShort(); // elemental attributes
+ _unk5 = packet.readShort(); // elemental attributes
+ _unk6 = packet.readShort(); // elemental attributes
+ _unk7 = packet.readShort(); // elemental attributes
+ _unk8 = packet.readShort(); // elemental attributes
+ _unk9 = packet.readShort(); // elemental attributes
+ _unk10 = packet.readShort(); // elemental attributes
+ _unk11 = packet.readShort(); // elemental attributes
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
index f768bde90e..f8ec7ca9ac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
index fb416da3ed..f7ea08ef75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
index b8b7ec4d5c..c723992666 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 44b469d012..6edfb66cd8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -58,7 +58,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[] QUEST_VAR_NAMES =
{
@@ -74,16 +74,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index ed09c0d5a1..8be4882bd7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -33,19 +33,18 @@ import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo;
* 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8d951f50fd..88e4653f9c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.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.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -64,7 +64,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
* This class manages the action use request packet.
* @author Zoey76
*/
-public class RequestActionUse implements IClientIncomingPacket
+public class RequestActionUse implements ClientPacket
{
private static final int SIN_EATER_ID = 12564;
private static final int SWITCH_STANCE_ID = 6054;
@@ -80,16 +80,12 @@ public class RequestActionUse implements IClientIncomingPacket
private boolean _ctrlPressed;
private boolean _shiftPressed;
- private GameClient _client;
-
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _actionId = packet.readD();
- _ctrlPressed = (packet.readD() == 1);
- _shiftPressed = (packet.readC() == 1);
- _client = client;
- return true;
+ _actionId = packet.readInt();
+ _ctrlPressed = (packet.readInt() == 1);
+ _shiftPressed = (packet.readByte() == 1);
}
@Override
@@ -142,13 +138,13 @@ public class RequestActionUse implements IClientIncomingPacket
{
if (player.isSitting() || !player.isMoving() || player.isFakeDeath())
{
- useSit(player, target);
+ useSit(client, player, target);
}
else
{
// Sit when arrive using next action.
// Creating next action class.
- final NextAction nextAction = new NextAction(CtrlEvent.EVT_ARRIVED, CtrlIntention.AI_INTENTION_MOVE_TO, () -> useSit(player, target));
+ final NextAction nextAction = new NextAction(CtrlEvent.EVT_ARRIVED, CtrlIntention.AI_INTENTION_MOVE_TO, () -> useSit(client, player, target));
// Binding next action to AI.
player.getAI().setNextAction(nextAction);
}
@@ -173,7 +169,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 15: // Change Movement Mode (Pets)
{
- if (validateSummon(summon, true))
+ if (validateSummon(client, summon, true))
{
((SummonAI) summon.getAI()).notifyFollowStatusChange();
}
@@ -181,7 +177,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 16: // Attack (Pets)
{
- if (validateSummon(summon, true) && summon.canAttack(_ctrlPressed))
+ if (validateSummon(client, summon, true) && summon.canAttack(_ctrlPressed))
{
summon.doSummonAttack(target);
}
@@ -189,7 +185,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 17: // Stop (Pets)
{
- if (validateSummon(summon, true))
+ if (validateSummon(client, summon, true))
{
summon.cancelAction();
}
@@ -197,7 +193,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 19: // Unsummon Pet
{
- if (!validateSummon(summon, true))
+ if (!validateSummon(client, summon, true))
{
break;
}
@@ -228,7 +224,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 21: // Change Movement Mode (Servitors)
{
- if (validateSummon(summon, false))
+ if (validateSummon(client, summon, false))
{
((SummonAI) summon.getAI()).notifyFollowStatusChange();
}
@@ -236,7 +232,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 22: // Attack (Servitors)
{
- if (validateSummon(summon, false) && summon.canAttack(_ctrlPressed))
+ if (validateSummon(client, summon, false) && summon.canAttack(_ctrlPressed))
{
summon.doSummonAttack(target);
}
@@ -244,7 +240,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 23: // Stop (Servitors)
{
- if (validateSummon(summon, false))
+ if (validateSummon(client, summon, false))
{
summon.cancelAction();
}
@@ -257,12 +253,12 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 32: // Wild Hog Cannon - Wild Cannon
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 36: // Soulless - Toxic Smoke
{
- useSkill("RangeDebuff", false);
+ useSkill(client, "RangeDebuff", false);
break;
}
case 37: // Dwarven Manufacture
@@ -291,16 +287,16 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 39: // Soulless - Parasite Burst
{
- useSkill("RangeDD", false);
+ useSkill(client, "RangeDD", false);
break;
}
case 41: // Wild Hog Cannon - Attack
{
- if (validateSummon(summon, false))
+ if (validateSummon(client, summon, false))
{
if ((target != null) && (target.isDoor() || (target instanceof SiegeFlag)))
{
- useSkill(4230, false);
+ useSkill(client, 4230, false);
}
else
{
@@ -311,37 +307,37 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 42: // Kai the Cat - Self Damage Shield
{
- useSkill("HealMagic", false);
+ useSkill(client, "HealMagic", false);
break;
}
case 43: // Merrow the Unicorn - Hydro Screw
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 44: // Big Boom - Boom Attack
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 45: // Boxer the Unicorn - Master Recharge
{
- useSkill("HealMagic", player, false);
+ useSkill(client, "HealMagic", player, false);
break;
}
case 46: // Mew the Cat - Mega Storm Strike
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 47: // Silhouette - Steal Blood
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 48: // Mechanic Golem - Mech. Cannon
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 51: // General Manufacture
@@ -366,7 +362,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 52: // Unsummon Servitor
{
- if (validateSummon(summon, false))
+ if (validateSummon(client, summon, false))
{
if (summon.isAttackingNow() || summon.isInCombat())
{
@@ -379,7 +375,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 53: // Move to target (Servitors)
{
- if (validateSummon(summon, false) && (target != null) && (summon != target) && !summon.isMovementDisabled())
+ if (validateSummon(client, summon, false) && (target != null) && (summon != target) && !summon.isMovementDisabled())
{
summon.setFollowStatus(false);
summon.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
@@ -388,7 +384,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 54: // Move to target (Pets)
{
- if (validateSummon(summon, true) && (target != null) && (summon != target) && !summon.isMovementDisabled())
+ if (validateSummon(client, summon, true) && (target != null) && (summon != target) && !summon.isMovementDisabled())
{
summon.setFollowStatus(false);
summon.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
@@ -455,20 +451,20 @@ public class RequestActionUse implements IClientIncomingPacket
case 72:
case 73:
{
- useCoupleSocial(_actionId - 55);
+ useCoupleSocial(client, _actionId - 55);
break;
}
case 1000: // Siege Golem - Siege Hammer
{
if ((target != null) && target.isDoor())
{
- useSkill(4079, false);
+ useSkill(client, 4079, false);
}
break;
}
case 1001: // Sin Eater - Ultimate Bombastic Buster
{
- if (validateSummon(summon, true) && (summon.getId() == SIN_EATER_ID))
+ if (validateSummon(client, summon, true) && (summon.getId() == SIN_EATER_ID))
{
summon.broadcastPacket(new NpcSay(summon.getObjectId(), ChatType.NPC_GENERAL, summon.getId(), NPC_STRINGS[Rnd.get(NPC_STRINGS.length)]));
}
@@ -476,566 +472,566 @@ public class RequestActionUse implements IClientIncomingPacket
}
case 1003: // Wind Hatchling/Strider - Wild Stun
{
- useSkill("PhysicalSpecial", true);
+ useSkill(client, "PhysicalSpecial", true);
break;
}
case 1004: // Wind Hatchling/Strider - Wild Defense
{
- useSkill("Buff", player, true);
+ useSkill(client, "Buff", player, true);
break;
}
case 1005: // Star Hatchling/Strider - Bright Burst
{
- useSkill("DDMagic", true);
+ useSkill(client, "DDMagic", true);
break;
}
case 1006: // Star Hatchling/Strider - Bright Heal
{
- useSkill("Heal", player, true);
+ useSkill(client, "Heal", player, true);
break;
}
case 1007: // Feline Queen - Blessing of Queen
{
- useSkill("Buff1", player, false);
+ useSkill(client, "Buff1", player, false);
break;
}
case 1008: // Feline Queen - Gift of Queen
{
- useSkill("Buff2", player, false);
+ useSkill(client, "Buff2", player, false);
break;
}
case 1009: // Feline Queen - Cure of Queen
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 1010: // Unicorn Seraphim - Blessing of Seraphim
{
- useSkill("Buff1", player, false);
+ useSkill(client, "Buff1", player, false);
break;
}
case 1011: // Unicorn Seraphim - Gift of Seraphim
{
- useSkill("Buff2", player, false);
+ useSkill(client, "Buff2", player, false);
break;
}
case 1012: // Unicorn Seraphim - Cure of Seraphim
{
- useSkill("DDMagic", false);
+ useSkill(client, "DDMagic", false);
break;
}
case 1013: // Nightshade - Curse of Shade
{
- useSkill("DeBuff1", false);
+ useSkill(client, "DeBuff1", false);
break;
}
case 1014: // Nightshade - Mass Curse of Shade
{
- useSkill("DeBuff2", false);
+ useSkill(client, "DeBuff2", false);
break;
}
case 1015: // Nightshade - Shade Sacrifice
{
- useSkill("Heal", false);
+ useSkill(client, "Heal", false);
break;
}
case 1016: // Cursed Man - Cursed Blow
{
- useSkill("PhysicalSpecial1", false);
+ useSkill(client, "PhysicalSpecial1", false);
break;
}
case 1017: // Cursed Man - Cursed Strike
{
- useSkill("PhysicalSpecial2", false);
+ useSkill(client, "PhysicalSpecial2", false);
break;
}
case 1031: // Feline King - Slash
{
- useSkill("PhysicalSpecial1", false);
+ useSkill(client, "PhysicalSpecial1", false);
break;
}
case 1032: // Feline King - Spinning Slash
{
- useSkill("PhysicalSpecial2", false);
+ useSkill(client, "PhysicalSpecial2", false);
break;
}
case 1033: // Feline King - Hold of King
{
- useSkill("PhysicalSpecial3", false);
+ useSkill(client, "PhysicalSpecial3", false);
break;
}
case 1034: // Magnus the Unicorn - Whiplash
{
- useSkill("PhysicalSpecial1", false);
+ useSkill(client, "PhysicalSpecial1", false);
break;
}
case 1035: // Magnus the Unicorn - Tridal Wave
{
- useSkill("PhysicalSpecial2", false);
+ useSkill(client, "PhysicalSpecial2", false);
break;
}
case 1036: // Spectral Lord - Corpse Kaboom
{
- useSkill("PhysicalSpecial1", false);
+ useSkill(client, "PhysicalSpecial1", false);
break;
}
case 1037: // Spectral Lord - Dicing Death
{
- useSkill("PhysicalSpecial2", false);
+ useSkill(client, "PhysicalSpecial2", false);
break;
}
case 1038: // Spectral Lord - Dark Curse
{
- useSkill("PhysicalSpecial3", false);
+ useSkill(client, "PhysicalSpecial3", false);
break;
}
case 1039: // Swoop Cannon - Cannon Fodder
{
- useSkill(5110, false);
+ useSkill(client, 5110, false);
break;
}
case 1040: // Swoop Cannon - Big Bang
{
- useSkill(5111, false);
+ useSkill(client, 5111, false);
break;
}
case 1041: // Great Wolf - Bite Attack
{
- useSkill("Skill01", true);
+ useSkill(client, "Skill01", true);
break;
}
case 1042: // Great Wolf - Maul
{
- useSkill("Skill03", true);
+ useSkill(client, "Skill03", true);
break;
}
case 1043: // Great Wolf - Cry of the Wolf
{
- useSkill("Skill02", true);
+ useSkill(client, "Skill02", true);
break;
}
case 1044: // Great Wolf - Awakening
{
- useSkill("Skill04", true);
+ useSkill(client, "Skill04", true);
break;
}
case 1045: // Great Wolf - Howl
{
- useSkill(5584, true);
+ useSkill(client, 5584, true);
break;
}
case 1046: // Strider - Roar
{
- useSkill(5585, true);
+ useSkill(client, 5585, true);
break;
}
case 1047: // Divine Beast - Bite
{
- useSkill(5580, false);
+ useSkill(client, 5580, false);
break;
}
case 1048: // Divine Beast - Stun Attack
{
- useSkill(5581, false);
+ useSkill(client, 5581, false);
break;
}
case 1049: // Divine Beast - Fire Breath
{
- useSkill(5582, false);
+ useSkill(client, 5582, false);
break;
}
case 1050: // Divine Beast - Roar
{
- useSkill(5583, false);
+ useSkill(client, 5583, false);
break;
}
case 1051: // Feline Queen - Bless The Body
{
- useSkill("buff3", false);
+ useSkill(client, "buff3", false);
break;
}
case 1052: // Feline Queen - Bless The Soul
{
- useSkill("buff4", false);
+ useSkill(client, "buff4", false);
break;
}
case 1053: // Feline Queen - Haste
{
- useSkill("buff5", false);
+ useSkill(client, "buff5", false);
break;
}
case 1054: // Unicorn Seraphim - Acumen
{
- useSkill("buff3", false);
+ useSkill(client, "buff3", false);
break;
}
case 1055: // Unicorn Seraphim - Clarity
{
- useSkill("buff4", false);
+ useSkill(client, "buff4", false);
break;
}
case 1056: // Unicorn Seraphim - Empower
{
- useSkill("buff5", false);
+ useSkill(client, "buff5", false);
break;
}
case 1057: // Unicorn Seraphim - Wild Magic
{
- useSkill("buff6", false);
+ useSkill(client, "buff6", false);
break;
}
case 1058: // Nightshade - Death Whisper
{
- useSkill("buff3", false);
+ useSkill(client, "buff3", false);
break;
}
case 1059: // Nightshade - Focus
{
- useSkill("buff4", false);
+ useSkill(client, "buff4", false);
break;
}
case 1060: // Nightshade - Guidance
{
- useSkill("buff5", false);
+ useSkill(client, "buff5", false);
break;
}
case 1061: // Wild Beast Fighter, White Weasel - Death blow
{
- useSkill(5745, true);
+ useSkill(client, 5745, true);
break;
}
case 1062: // Wild Beast Fighter - Double attack
{
- useSkill(5746, true);
+ useSkill(client, 5746, true);
break;
}
case 1063: // Wild Beast Fighter - Spin attack
{
- useSkill(5747, true);
+ useSkill(client, 5747, true);
break;
}
case 1064: // Wild Beast Fighter - Meteor Shower
{
- useSkill(5748, true);
+ useSkill(client, 5748, true);
break;
}
case 1065: // Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening
{
- useSkill(5753, true);
+ useSkill(client, 5753, true);
break;
}
case 1066: // Fox Shaman, Spirit Shaman - Thunder Bolt
{
- useSkill(5749, true);
+ useSkill(client, 5749, true);
break;
}
case 1067: // Fox Shaman, Spirit Shaman - Flash
{
- useSkill(5750, true);
+ useSkill(client, 5750, true);
break;
}
case 1068: // Fox Shaman, Spirit Shaman - Lightning Wave
{
- useSkill(5751, true);
+ useSkill(client, 5751, true);
break;
}
case 1069: // Fox Shaman, Fairy Princess - Flare
{
- useSkill(5752, true);
+ useSkill(client, 5752, true);
break;
}
case 1070: // White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control
{
- useSkill(5771, true);
+ useSkill(client, 5771, true);
break;
}
case 1071: // Tigress - Power Strike
{
- useSkill("DDMagic", true);
+ useSkill(client, "DDMagic", true);
break;
}
case 1072: // Toy Knight - Piercing attack
{
- useSkill(6046, true);
+ useSkill(client, 6046, true);
break;
}
case 1073: // Toy Knight - Whirlwind
{
- useSkill(6047, true);
+ useSkill(client, 6047, true);
break;
}
case 1074: // Toy Knight - Lance Smash
{
- useSkill(6048, true);
+ useSkill(client, 6048, true);
break;
}
case 1075: // Toy Knight - Battle Cry
{
- useSkill(6049, true);
+ useSkill(client, 6049, true);
break;
}
case 1076: // Turtle Ascetic - Power Smash
{
- useSkill(6050, true);
+ useSkill(client, 6050, true);
break;
}
case 1077: // Turtle Ascetic - Energy Burst
{
- useSkill(6051, true);
+ useSkill(client, 6051, true);
break;
}
case 1078: // Turtle Ascetic - Shockwave
{
- useSkill(6052, true);
+ useSkill(client, 6052, true);
break;
}
case 1079: // Turtle Ascetic - Howl
{
- useSkill(6053, true);
+ useSkill(client, 6053, true);
break;
}
case 1080: // Phoenix Rush
{
- useSkill(6041, false);
+ useSkill(client, 6041, false);
break;
}
case 1081: // Phoenix Cleanse
{
- useSkill(6042, false);
+ useSkill(client, 6042, false);
break;
}
case 1082: // Phoenix Flame Feather
{
- useSkill(6043, false);
+ useSkill(client, 6043, false);
break;
}
case 1083: // Phoenix Flame Beak
{
- useSkill(6044, false);
+ useSkill(client, 6044, false);
break;
}
case 1084: // Switch State
{
if (summon instanceof BabyPet)
{
- useSkill(6054, true);
+ useSkill(client, 6054, true);
}
break;
}
case 1086: // Panther Cancel
{
- useSkill(6094, false);
+ useSkill(client, 6094, false);
break;
}
case 1087: // Panther Dark Claw
{
- useSkill(6095, false);
+ useSkill(client, 6095, false);
break;
}
case 1088: // Panther Fatal Claw
{
- useSkill(6096, false);
+ useSkill(client, 6096, false);
break;
}
case 1089: // Deinonychus - Tail Strike
{
- useSkill(6199, true);
+ useSkill(client, 6199, true);
break;
}
case 1090: // Guardian's Strider - Strider Bite
{
- useSkill(6205, true);
+ useSkill(client, 6205, true);
break;
}
case 1091: // Guardian's Strider - Strider Fear
{
- useSkill(6206, true);
+ useSkill(client, 6206, true);
break;
}
case 1092: // Guardian's Strider - Strider Dash
{
- useSkill(6207, true);
+ useSkill(client, 6207, true);
break;
}
case 1093: // Maguen - Maguen Strike
{
- useSkill(6618, true);
+ useSkill(client, 6618, true);
break;
}
case 1094: // Maguen - Maguen Wind Walk
{
- useSkill(6681, true);
+ useSkill(client, 6681, true);
break;
}
case 1095: // Elite Maguen - Maguen Power Strike
{
- useSkill(6619, true);
+ useSkill(client, 6619, true);
break;
}
case 1096: // Elite Maguen - Elite Maguen Wind Walk
{
- useSkill(6682, true);
+ useSkill(client, 6682, true);
break;
}
case 1097: // Maguen - Maguen Return
{
- useSkill(6683, true);
+ useSkill(client, 6683, true);
break;
}
case 1098: // Elite Maguen - Maguen Party Return
{
- useSkill(6684, true);
+ useSkill(client, 6684, true);
break;
}
case 5000: // Baby Rudolph - Reindeer Scratch
{
- useSkill(23155, true);
+ useSkill(client, 23155, true);
break;
}
case 5001: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction
{
- useSkill(23167, true);
+ useSkill(client, 23167, true);
break;
}
case 5002: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction
{
- useSkill(23168, true);
+ useSkill(client, 23168, true);
break;
}
case 5003: // Hyum, Lapham, Hyum, Lapham - Thunder Bolt
{
- useSkill(5749, true);
+ useSkill(client, 5749, true);
break;
}
case 5004: // Hyum, Lapham, Hyum, Lapham - Flash
{
- useSkill(5750, true);
+ useSkill(client, 5750, true);
break;
}
case 5005: // Hyum, Lapham, Hyum, Lapham - Lightning Wave
{
- useSkill(5751, true);
+ useSkill(client, 5751, true);
break;
}
case 5006: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control
{
- useSkill(5771, true);
+ useSkill(client, 5771, true);
break;
}
case 5007: // Deseloph, Lilias, Deseloph, Lilias - Piercing Attack
{
- useSkill(6046, true);
+ useSkill(client, 6046, true);
break;
}
case 5008: // Deseloph, Lilias, Deseloph, Lilias - Spin Attack
{
- useSkill(6047, true);
+ useSkill(client, 6047, true);
break;
}
case 5009: // Deseloph, Lilias, Deseloph, Lilias - Smash
{
- useSkill(6048, true);
+ useSkill(client, 6048, true);
break;
}
case 5010: // Deseloph, Lilias, Deseloph, Lilias - Ignite
{
- useSkill(6049, true);
+ useSkill(client, 6049, true);
break;
}
case 5011: // Rekang, Mafum, Rekang, Mafum - Power Smash
{
- useSkill(6050, true);
+ useSkill(client, 6050, true);
break;
}
case 5012: // Rekang, Mafum, Rekang, Mafum - Energy Burst
{
- useSkill(6051, true);
+ useSkill(client, 6051, true);
break;
}
case 5013: // Rekang, Mafum, Rekang, Mafum - Shockwave
{
- useSkill(6052, true);
+ useSkill(client, 6052, true);
break;
}
case 5014: // Rekang, Mafum, Rekang, Mafum - Ignite
{
- useSkill(6053, true);
+ useSkill(client, 6053, true);
break;
}
case 5015: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance
{
- useSkill(6054, true);
+ useSkill(client, 6054, true);
break;
}
// Social Packets
case 12: // Greeting
{
- tryBroadcastSocial(2);
+ tryBroadcastSocial(client, 2);
break;
}
case 13: // Victory
{
- tryBroadcastSocial(3);
+ tryBroadcastSocial(client, 3);
break;
}
case 14: // Advance
{
- tryBroadcastSocial(4);
+ tryBroadcastSocial(client, 4);
break;
}
case 24: // Yes
{
- tryBroadcastSocial(6);
+ tryBroadcastSocial(client, 6);
break;
}
case 25: // No
{
- tryBroadcastSocial(5);
+ tryBroadcastSocial(client, 5);
break;
}
case 26: // Bow
{
- tryBroadcastSocial(7);
+ tryBroadcastSocial(client, 7);
break;
}
case 29: // Unaware
{
- tryBroadcastSocial(8);
+ tryBroadcastSocial(client, 8);
break;
}
case 30: // Social Waiting
{
- tryBroadcastSocial(9);
+ tryBroadcastSocial(client, 9);
break;
}
case 31: // Laugh
{
- tryBroadcastSocial(10);
+ tryBroadcastSocial(client, 10);
break;
}
case 33: // Applaud
{
- tryBroadcastSocial(11);
+ tryBroadcastSocial(client, 11);
break;
}
case 34: // Dance
{
- tryBroadcastSocial(12);
+ tryBroadcastSocial(client, 12);
break;
}
case 35: // Sorrow
{
- tryBroadcastSocial(13);
+ tryBroadcastSocial(client, 13);
break;
}
case 62: // Charm
{
- tryBroadcastSocial(14);
+ tryBroadcastSocial(client, 14);
break;
}
case 66: // Shyness
{
- tryBroadcastSocial(15);
+ tryBroadcastSocial(client, 15);
break;
}
}
@@ -1043,11 +1039,12 @@ public class RequestActionUse implements IClientIncomingPacket
/**
* Use the sit action.
+ * @param client the game client
* @param player the player trying to sit
* @param target the target to sit, throne, bench or chair
* @return {@code true} if the player can sit, {@code false} otherwise
*/
- protected boolean useSit(Player player, WorldObject target)
+ protected boolean useSit(GameClient client, Player player, WorldObject target)
{
if (player.getMountType() != MountType.NONE)
{
@@ -1057,7 +1054,7 @@ public class RequestActionUse implements IClientIncomingPacket
if (!player.isSitting() && (target instanceof StaticObject) && (((StaticObject) target).getType() == 1) && player.isInsideRadius2D(target, StaticObject.INTERACTION_DISTANCE))
{
final ChairSit cs = new ChairSit(player, target.getId());
- _client.sendPacket(cs);
+ client.sendPacket(cs);
player.sitDown();
player.broadcastPacket(cs);
return true;
@@ -1081,25 +1078,26 @@ public class RequestActionUse implements IClientIncomingPacket
/**
* Cast a skill for active summon.
* Target is specified as a parameter but can be overwrited or ignored depending on skill type.
+ * @param client the game client
* @param skillId the skill Id to be casted by the summon
* @param target the target to cast the skill on, overwritten or ignored depending on skill type
* @param pet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
*/
- private void useSkill(int skillId, WorldObject target, boolean pet)
+ private void useSkill(GameClient client, int skillId, WorldObject target, boolean pet)
{
- final Player player = _client.getPlayer();
+ final Player player = client.getPlayer();
if (player == null)
{
return;
}
final Summon summon = player.getSummon();
- if (!validateSummon(summon, pet))
+ if (!validateSummon(client, summon, pet))
{
return;
}
- if (!canControl(summon))
+ if (!canControl(client, summon))
{
return;
}
@@ -1126,28 +1124,28 @@ public class RequestActionUse implements IClientIncomingPacket
}
}
- private void useSkill(String skillName, WorldObject target, boolean pet)
+ private void useSkill(GameClient client, String skillName, WorldObject target, boolean pet)
{
- final Player player = _client.getPlayer();
+ final Player player = client.getPlayer();
if (player == null)
{
return;
}
final Summon summon = player.getSummon();
- if (!validateSummon(summon, pet))
+ if (!validateSummon(client, summon, pet))
{
return;
}
- if (!canControl(summon))
+ if (!canControl(client, summon))
{
return;
}
if ((summon instanceof BabyPet) && !((BabyPet) summon).isInSupportMode())
{
- _client.sendPacket(SystemMessageId.A_PET_ON_AUXILIARY_MODE_CANNOT_USE_SKILLS);
+ client.sendPacket(SystemMessageId.A_PET_ON_AUXILIARY_MODE_CANNOT_USE_SKILLS);
return;
}
@@ -1169,17 +1167,17 @@ public class RequestActionUse implements IClientIncomingPacket
}
}
- private boolean canControl(Summon summon)
+ private boolean canControl(GameClient client, Summon summon)
{
if ((summon instanceof BabyPet) && !((BabyPet) summon).isInSupportMode())
{
- _client.sendPacket(SystemMessageId.A_PET_ON_AUXILIARY_MODE_CANNOT_USE_SKILLS);
+ client.sendPacket(SystemMessageId.A_PET_ON_AUXILIARY_MODE_CANNOT_USE_SKILLS);
return false;
}
- if (summon.isPet() && ((summon.getLevel() - _client.getPlayer().getLevel()) > 20))
+ if (summon.isPet() && ((summon.getLevel() - client.getPlayer().getLevel()) > 20))
{
- _client.sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
+ client.sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
return false;
}
@@ -1189,55 +1187,58 @@ public class RequestActionUse implements IClientIncomingPacket
/**
* Cast a skill for active summon.
* Target is retrieved from owner's target, then validated by overloaded method useSkill(int, Creature).
+ * @param client the game client
* @param skillId the skill Id to use
* @param pet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
*/
- private void useSkill(int skillId, boolean pet)
+ private void useSkill(GameClient client, int skillId, boolean pet)
{
- final Player player = _client.getPlayer();
+ final Player player = client.getPlayer();
if (player == null)
{
return;
}
- useSkill(skillId, player.getTarget(), pet);
+ useSkill(client, skillId, player.getTarget(), pet);
}
/**
* Cast a skill for active summon.
* Target is retrieved from owner's target, then validated by overloaded method useSkill(int, Creature).
+ * @param client the game client
* @param skillName the skill name to use
* @param pet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
*/
- private void useSkill(String skillName, boolean pet)
+ private void useSkill(GameClient client, String skillName, boolean pet)
{
- final Player player = _client.getPlayer();
+ final Player player = client.getPlayer();
if (player == null)
{
return;
}
- useSkill(skillName, player.getTarget(), pet);
+ useSkill(client, skillName, player.getTarget(), pet);
}
/**
* Validates the given summon and sends a system message to the master.
+ * @param client the game client
* @param summon the summon to validate
* @param checkPet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
* @return {@code true} if the summon is not null and whether is a pet or a servitor depending on {@code checkPet} value, {@code false} otherwise
*/
- private boolean validateSummon(Summon summon, boolean checkPet)
+ private boolean validateSummon(GameClient client, Summon summon, boolean checkPet)
{
if ((summon != null) && ((checkPet && summon.isPet()) || summon.isServitor()))
{
if (summon.isPet() && ((Pet) summon).isUncontrollable())
{
- _client.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_CAN_VIEW_THE_SIEGE_WAR_STATUS_WINDOW_DURING_A_SIEGE_WAR);
+ client.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_CAN_VIEW_THE_SIEGE_WAR_STATUS_WINDOW_DURING_A_SIEGE_WAR);
return false;
}
if (summon.isBetrayed())
{
- _client.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+ client.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
return false;
}
return true;
@@ -1245,29 +1246,30 @@ public class RequestActionUse implements IClientIncomingPacket
if (checkPet)
{
- _client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
+ client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
}
else
{
- _client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+ client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
}
return false;
}
/**
* Try to broadcast SocialAction packet.
+ * @param client the game client
* @param id the social action Id to broadcast
*/
- private void tryBroadcastSocial(int id)
+ private void tryBroadcastSocial(GameClient client, int id)
{
- final Player player = _client.getPlayer();
+ final Player player = client.getPlayer();
if (player == null)
{
return;
}
if (player.isFishing())
{
- _client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
+ client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}
@@ -1279,11 +1281,12 @@ public class RequestActionUse implements IClientIncomingPacket
/**
* Perform a couple social action.
+ * @param client the game client
* @param id the couple social action Id
*/
- private void useCoupleSocial(int id)
+ private void useCoupleSocial(GameClient client, int id)
{
- final Player requester = _client.getPlayer();
+ final Player requester = client.getPlayer();
if (requester == null)
{
return;
@@ -1292,14 +1295,14 @@ public class RequestActionUse implements IClientIncomingPacket
final WorldObject target = requester.getTarget();
if ((target == null) || !target.isPlayer())
{
- _client.sendPacket(SystemMessageId.INVALID_TARGET);
+ client.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
final int distance = (int) requester.calculateDistance2D(target);
if ((distance > 125) || (distance < 15) || (requester.getObjectId() == target.getObjectId()))
{
- _client.sendPacket(SystemMessageId.THE_REQUEST_CANNOT_BE_COMPLETED_BECAUSE_THE_TARGET_DOES_NOT_MEET_LOCATION_REQUIREMENTS);
+ client.sendPacket(SystemMessageId.THE_REQUEST_CANNOT_BE_COMPLETED_BECAUSE_THE_TARGET_DOES_NOT_MEET_LOCATION_REQUIREMENTS);
return;
}
@@ -1308,7 +1311,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_SHOP_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1316,13 +1319,13 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
if (requester.isFishing())
{
- _client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
+ client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}
@@ -1330,7 +1333,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1338,7 +1341,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1346,7 +1349,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1354,14 +1357,14 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_HIDEOUT_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
}
if (requester.isMounted() || requester.isFlyingMounted() || requester.isInBoat() || requester.isInAirShip())
{
sm = new SystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1369,7 +1372,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1377,7 +1380,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(requester);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1387,7 +1390,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_SHOP_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1395,7 +1398,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1403,7 +1406,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_PARTICIPATING_IN_A_COUPLE_ACTION_AND_CANNOT_BE_REQUESTED_FOR_ANOTHER_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1411,7 +1414,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_FISHING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1419,7 +1422,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1427,7 +1430,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1435,7 +1438,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_HIDEOUT_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1443,7 +1446,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1451,7 +1454,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1459,7 +1462,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TELEPORTING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1467,7 +1470,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
@@ -1475,20 +1478,20 @@ public class RequestActionUse implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
return;
}
if (requester.isAllSkillsDisabled() || partner.isAllSkillsDisabled())
{
- _client.sendPacket(SystemMessageId.THE_COUPLE_ACTION_WAS_CANCELLED);
+ client.sendPacket(SystemMessageId.THE_COUPLE_ACTION_WAS_CANCELLED);
return;
}
requester.setMultiSocialAction(id, partner.getObjectId());
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_COUPLE_ACTION_WITH_C1);
sm.addPcName(partner);
- _client.sendPacket(sm);
+ client.sendPacket(sm);
if ((requester.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE) || (partner.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE))
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 5788f7b28b..5b8dfe4711 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index 44ceaa0b87..c581c3a729 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index beb5024780..86e0004b81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 9d051a99c3..6d37435358 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,15 +24,14 @@ 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();
- return true;
+ _crestId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 4dc52e2648..683c961938 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java
index 4fa42b1f5c..acaa208628 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.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.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.FriendPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-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)
{
- _response = packet.readD();
- return true;
+ _response = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
index dd87921944..37bc45b9ad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
index 8d12e8207d..a9f168d69a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.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.model.partymatching.PartyMatchRoom;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index 48589ce65c..4aaa5ca710 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -34,15 +34,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
index 6b4dad2365..51e886aebc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index 876aa0931b..1bc6eb6e3f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -28,18 +28,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1.0.0.0 $ $Date: 2005/07/11 15:29:30 $
*/
-public class RequestAutoSoulShot implements IClientIncomingPacket
+public class RequestAutoSoulShot implements ClientPacket
{
// format cd
private int _itemId;
private int _type; // 1 = on : 0 = off;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _itemId = packet.readD();
- _type = packet.readD();
- return true;
+ _itemId = packet.readInt();
+ _type = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 4b817c3e70..4681c21d7f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
index bbcd1c8223..714439550d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
index 176538531e..0d34bc0fab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.BlockList;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class RequestBlock implements IClientIncomingPacket
+public class RequestBlock implements ClientPacket
{
private static final int BLOCK = 0;
private static final int UNBLOCK = 1;
@@ -36,14 +36,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
index 4742d6e2f8..f49ebdf1e9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java
index c1755df94e..f310325465 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.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.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -36,17 +36,16 @@ import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
/**
* @author Mobius
*/
-public class RequestBrBuyProduct implements IClientIncomingPacket
+public class RequestBrBuyProduct implements ClientPacket
{
private int _productId;
private int _count;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _productId = packet.readD();
- _count = packet.readD();
- return true;
+ _productId = packet.readInt();
+ _count = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrGamePoint.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrGamePoint.java
index 7e0b0c2183..345d1c5e4a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrGamePoint.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrGamePoint.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.ExBrGamePoint;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBrGamePoint;
/**
* @author Mobius
*/
-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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductInfo.java
index 4589186b07..d3b7aefb0b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductInfo.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.ExBrProductInfo;
@@ -24,15 +24,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBrProductInfo;
/**
* @author Mobius
*/
-public class RequestBrProductInfo implements IClientIncomingPacket
+public class RequestBrProductInfo implements ClientPacket
{
private int _productId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _productId = packet.readD();
- return true;
+ _productId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductList.java
index d8eac6c43e..445b6cf7cb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrProductList.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.ExBrProductList;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBrProductList;
/**
* @author Mobius
*/
-public class RequestBrProductList implements IClientIncomingPacket
+public class RequestBrProductList implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrRecentProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrRecentProductList.java
index 5049bab002..ec5adc85ff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrRecentProductList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrRecentProductList.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.ExBrRecentProductList;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBrRecentProductList;
/**
* @author Mobius
*/
-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)
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 0fcce9a3f5..ca45747e1e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index c422667c75..19f6c3aa80 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
index ddb2b18a16..36cad1acd3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
@@ -16,19 +16,12 @@
*/
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.ItemList;
-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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 7f87632f78..a7b5bbb202 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.handler.AdminCommandHandler;
import org.l2jmobius.gameserver.handler.BypassHandler;
@@ -48,7 +48,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 =
@@ -67,10 +67,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
index b343d24791..db1b3f8570 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -39,15 +39,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
index a03dfcb308..64f7f12390 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 true;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
index d7e7f94d47..2b237eee6a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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();
- _itemObjectId = packet.readD();
- return true;
+ _colorNum = packet.readInt();
+ _title = packet.readString();
+ _itemObjectId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
index 83cddc7124..c3518203ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
index dfb184a85e..1fc5f6e6f5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.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.PetNameTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.Summon;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
/**
* @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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index fe092d4af8..02597e799b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
@@ -29,15 +29,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index a7eda3ff44..f72dde7e79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
@@ -35,13 +35,12 @@ public class RequestConfirmGemStone extends AbstractRefinePacket
private long _gemStoneCount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- _refinerItemObjId = packet.readD();
- _gemstoneItemObjId = packet.readD();
- _gemStoneCount = packet.readQ();
- return true;
+ _targetItemObjId = packet.readInt();
+ _refinerItemObjId = packet.readInt();
+ _gemstoneItemObjId = packet.readInt();
+ _gemStoneCount = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
index 3077806624..da7c135c1c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.CrystalType;
@@ -34,11 +34,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index fb97d2ad80..d203f8f6c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index 5e0ca812e6..70a3da5a6e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
@@ -32,10 +32,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 51aa14f3a1..469d7f1b38 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.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.PrivateStoreType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.World;
@@ -37,17 +37,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 1b16703f6f..9cf990d9c5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -29,14 +28,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 590ce2e000..d895569dd4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
index e8cb918383..dfc8e1ea12 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
index 018f1548df..c4c055f078 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index 8ff126cf8f..8a5dae027b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index c4d3846ad7..8d33a862ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 0bafe35e50..d90119cfbc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.instancemanager.CursedWeaponsManager;
@@ -38,17 +38,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 511091d8bb..f9d6ca40ad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
index 5fbf3ad1e9..e4ac6b2184 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
@@ -25,18 +25,17 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author Gnacik
*/
-public class RequestDismissPartyRoom implements IClientIncomingPacket
+public class RequestDismissPartyRoom implements ClientPacket
{
private int _roomid;
@SuppressWarnings("unused")
private int _data2;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomid = packet.readD();
- _data2 = packet.readD();
- return true;
+ _roomid = packet.readInt();
+ _data2 = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
index 213f061cfc..04f8516971 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -28,19 +28,18 @@ import org.l2jmobius.gameserver.network.GameClient;
/**
* @author KenM
*/
-public class RequestDispel implements IClientIncomingPacket
+public class RequestDispel implements ClientPacket
{
private int _objectId;
private int _skillId;
private int _skillLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _objectId = packet.readD();
- _skillId = packet.readD();
- _skillLevel = packet.readD();
- return true;
+ _objectId = packet.readInt();
+ _skillId = packet.readInt();
+ _skillLevel = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
index 0bc11f7724..e9bee45ac5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.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.ExReplyDominionInfo;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowOwnthingPos;
/**
* @author JIV
*/
-public class RequestDominionInfo implements IClientIncomingPacket
+public class RequestDominionInfo implements ClientPacket
{
- @Override
- public boolean read(GameClient client, PacketReader packet)
- {
- return true;
- }
-
@Override
public void run(GameClient client)
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
index b7d468fa30..63bd616e30 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
index d15e7b90ef..8038c5aa6d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
index 3026abbf99..50a9db9cb4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -28,17 +28,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();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index f5607f7fa5..fabc17c47e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 879b8de48b..42c621ef9a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
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");
@@ -47,11 +47,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
index 863609e4fd..146bf739c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
index c0d78373e0..93e152a7a0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
index a2a66efe7d..1c72367072 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
index e14047e578..201410515a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
index 0f0d3f2a47..dcb1cb30fe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
index cc082ffff5..2b95c8bd6f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index c019cb08c1..52e76502d9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.EnchantResult;
@@ -24,14 +23,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
index c3602b7366..84a6aa5fb0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
index c2f02f89ad..edf4a96572 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
index d72fdfc413..469c512697 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
index 81e0666178..100ca6e5f1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 04fda7b47d..aba431ee79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.Elementals;
@@ -33,15 +33,14 @@ 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;
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index a1cea3147e..83e6234e35 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
* Format (ch) dd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill level
* @author -Wooden-
*/
-public class RequestExEnchantSkill implements IClientIncomingPacket
+public class RequestExEnchantSkill implements ClientPacket
{
private static final Logger LOGGER_ENCHANT = Logger.getLogger("enchant.skills");
@@ -50,11 +50,10 @@ public class RequestExEnchantSkill implements IClientIncomingPacket
private int _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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 8cd3d8afcf..906f28b05a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.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.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,17 +28,16 @@ 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;
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 052937fedd..56864c42ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.data.xml.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.model.EnchantSkillLearn;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -27,19 +27,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
* Format (ch) ddd c: (id) 0xD0 h: (subid) 0x31 d: type d: skill id d: skill level
* @author -Wooden-
*/
-public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
+public class RequestExEnchantSkillInfoDetail implements ClientPacket
{
private int _type;
private int _skillId;
private int _skillLevel;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _type = packet.readD();
- _skillId = packet.readD();
- _skillLevel = packet.readD();
- return true;
+ _type = packet.readInt();
+ _skillId = packet.readInt();
+ _skillLevel = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
index 624f2a2f0c..649f9cf551 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
@@ -20,7 +20,7 @@ import java.util.logging.Level;
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;
@@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
* Format (ch) dd c: (id) 0xD0 h: (subid) 0x34 d: skill id d: skill level
* @author -Wooden-
*/
-public class RequestExEnchantSkillRouteChange implements IClientIncomingPacket
+public class RequestExEnchantSkillRouteChange implements ClientPacket
{
private static final Logger LOGGER_ENCHANT = Logger.getLogger("enchant.skills");
@@ -51,11 +51,10 @@ public class RequestExEnchantSkillRouteChange implements IClientIncomingPacket
private int _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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
index 5fb2780770..572f94bcb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
@@ -20,7 +20,7 @@ import java.util.logging.Level;
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;
@@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
* Format (ch) dd c: (id) 0xD0 h: (subid) 0x32 d: skill id d: skill level
* @author -Wooden-
*/
-public class RequestExEnchantSkillSafe implements IClientIncomingPacket
+public class RequestExEnchantSkillSafe implements ClientPacket
{
private static final Logger LOGGER_ENCHANT = Logger.getLogger("enchant.skills");
@@ -51,11 +51,10 @@ public class RequestExEnchantSkillSafe implements IClientIncomingPacket
private int _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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
index 924c869682..95399b1df2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
@@ -20,13 +20,13 @@ import java.util.logging.Level;
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.xml.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder;
+import org.l2jmobius.gameserver.model.EnchantSkillLearn;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.EnchantSkillLearn;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
@@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
* Format (ch) dd c: (id) 0xD0 h: (subid) 0x33 d: skill id d: skill level
* @author -Wooden-
*/
-public class RequestExEnchantSkillUntrain implements IClientIncomingPacket
+public class RequestExEnchantSkillUntrain implements ClientPacket
{
private static final Logger LOGGER_ENCHANT = Logger.getLogger("enchant.skills");
@@ -50,11 +50,10 @@ public class RequestExEnchantSkillUntrain implements IClientIncomingPacket
private int _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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
index 6c2f69fe64..e18c2f1768 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.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.instancemanager.FishingChampionshipManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,14 +25,8 @@ import org.l2jmobius.gameserver.network.GameClient;
* 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index a09a265ee3..ff28c24734 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.FriendListExtended;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.FriendListExtended;
/**
* @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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 38c10e8e4e..79579e7204 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 0e765ebabd..4f3345205d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
index b858084554..751b20943b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
index 67d0614ce5..b4beffe0dc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 7250a1e20a..540f858eb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExPledgeEmblem;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPledgeEmblem;
* Fomat : chd c: (id) 0xD0 h: (subid) 0x10 d: the crest id This is a trigger
* @author -Wooden-
*/
-public class RequestExPledgeCrestLarge implements IClientIncomingPacket
+public class RequestExPledgeCrestLarge implements ClientPacket
{
private int _crestId;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _crestId = packet.readD();
- return true;
+ _crestId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index a21189f5d4..d5e390030c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.Elementals;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index 2b1000f445..4b6a52c322 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 63fc7d9576..2bc0b56ef1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index 056262b4ab..2ba3b9bf74 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
index f87b4e3539..1a8ba0e4b5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.item.enchant.EnchantScroll;
@@ -29,17 +29,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index e74b1f32dd..20115a900c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.item.enchant.EnchantScroll;
@@ -31,15 +31,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
index f524a83b06..a20fcbbbe2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index a2667da070..5dc0b830fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index 1355a122ce..3cb99c6138 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java
index d074a71e8e..47fc8fab17 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.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.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -33,15 +33,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.java
index ab073dd105..187d00c4f6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.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.BlockList;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.FriendAddRequest;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-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();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendList.java
index b9a1898fca..1a4260822d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendList.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-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;
@@ -27,14 +26,8 @@ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
index 880d1b418e..43b6631ab1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,18 +33,17 @@ 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();
- // _unknown = packet.readD();
- return true;
+ _targetName = packet.readString();
+ _command = packet.readInt();
+ // _unknown = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
index f0bdef4cf3..62edc9b0bb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -29,15 +29,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ExGetBossRecord;
* 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
index 363b649cfc..d9d21ec74e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.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.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -28,7 +28,7 @@ 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;
@@ -36,12 +36,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 1233ad294b..0185c76176 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index 10070bbbeb..cc403d4915 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
index ed7ae07d03..a01d89d637 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.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.PrivateStoreType;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
@@ -30,17 +30,16 @@ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index 71e028b3be..610c530a3f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
index af59712311..af4e9fa516 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
index 61ed1e33cd..395d8321fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
index bfbe3eff36..e6b443448e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 66d1611adf..58d093ee93 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -32,15 +32,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index 0fb3a57829..6681d159a7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
index 8379ba8544..5e33069b96 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index a8bc98d810..7168478fc0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index b31caa1777..d6181291cb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index d4a4ce742e..16338a2218 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index bc9710d465..ce9d1ccf5b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 0f7a8cc6ee..78ef233acb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.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.ItemList;
@@ -24,14 +23,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ItemList;
/**
* @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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
index 5d7abcb27e..b4889715c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestJoinAlly implements IClientIncomingPacket
+public class RequestJoinAlly 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java
index a920d9cc32..8668b4e14f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -29,19 +29,18 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowDominionRegistry;
/**
* @author Gigiikun
*/
-public class RequestJoinDominionWar implements IClientIncomingPacket
+public class RequestJoinDominionWar implements ClientPacket
{
private int _territoryId;
private int _isClan;
private int _isJoining;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _territoryId = packet.readD();
- _isClan = packet.readD();
- _isJoining = packet.readD();
- return true;
+ _territoryId = packet.readInt();
+ _isClan = packet.readInt();
+ _isJoining = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index 866dfcb72a..d6ac35c4c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.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.BlockList;
import org.l2jmobius.gameserver.model.Party;
@@ -32,17 +32,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();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
index 7d357ea2b9..c8580608da 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -27,17 +27,16 @@ import org.l2jmobius.gameserver.network.serverpackets.AskJoinPledge;
/**
* @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();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index bf06a31ef2..9b864babca 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -32,19 +32,18 @@ import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo;
/**
* @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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 9793d6e1d8..944561fc3a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.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.ExUISetting;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.serverpackets.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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index 472e52d770..ee82e53100 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -17,7 +17,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;
@@ -29,15 +29,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index b31720219d..547264fedc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.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.ExListPartyMatchingWaitingRoom;
@@ -24,7 +24,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;
@@ -32,13 +32,12 @@ public class RequestListPartyMatchingWaitingRoom implements IClientIncomingPacke
private int _mode; // 1 - waitlist 0 - room waitlist
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _page = packet.readD();
- _minLevel = packet.readD();
- _maxLevel = packet.readD();
- _mode = packet.readD();
- return true;
+ _page = packet.readInt();
+ _minLevel = packet.readInt();
+ _maxLevel = packet.readInt();
+ _mode = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 26e0239cf3..b344ee67c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.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.ai.CtrlIntention;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.EffectType;
@@ -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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
index 3eac3cc218..f14808827f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.readC();
- 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.readByte();
+ 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;
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index f2bb6c1413..997115130f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
index 06084ff683..4c4fa9894c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 28ba1388ca..49eb0d4f0c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
index 9f3cb709cf..bd77724b4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
index 0e373e408b..66f2091553 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 70f4d424fa..786a03f7c9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
@@ -31,15 +31,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ListPartyWating;
* format (ch) d
* @author -Wooden-
*/
-public class RequestOustFromPartyRoom implements IClientIncomingPacket
+public class RequestOustFromPartyRoom implements ClientPacket
{
private int _charid;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _charid = packet.readD();
- return true;
+ _charid = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
index 8bb3570222..a5e3482964 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index dc68a12536..9aebf2d02a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.concurrent.TimeUnit;
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;
@@ -33,15 +33,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
index 209835b319..accc9b5c2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
index 6155649ab4..228eaeb495 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
@@ -16,22 +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 true;
- }
-
- @Override
- public void run(GameClient client)
- {
- }
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
index 4c84ba70f7..5079382adb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,7 +37,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
@@ -45,30 +45,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index 2dceac3cdf..a28cf11a07 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Collection;
-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;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.serverpackets.PackageSendableList;
* @author -Wooden-
* @author UnAfraid Thanks mrTJO
*/
-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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
index 0bd52f639c..c621a6f974 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
index 2ac046f731..a5eb618da3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
@@ -31,19 +31,18 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail;
/**
* @version $Revision: 1.1.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPartyMatchConfig implements IClientIncomingPacket
+public class RequestPartyMatchConfig implements ClientPacket
{
private int _auto;
private int _loc;
private int _level;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _auto = packet.readD(); //
- _loc = packet.readD(); // Location
- _level = packet.readD(); // my level
- return true;
+ _auto = packet.readInt(); //
+ _loc = packet.readInt(); // Location
+ _level = packet.readInt(); // my level
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
index 96ecfd8ebb..d23cc03589 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Gnacik
*/
-public class RequestPartyMatchDetail implements IClientIncomingPacket
+public class RequestPartyMatchDetail implements ClientPacket
{
private int _roomid;
@SuppressWarnings("unused")
@@ -42,15 +42,14 @@ public class RequestPartyMatchDetail implements IClientIncomingPacket
private int _unk3;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomid = packet.readD();
+ _roomid = packet.readInt();
// If player click on Room all unk are 0
// If player click AutoJoin values are -1 1 1
- _unk1 = packet.readD();
- _unk2 = packet.readD();
- _unk3 = packet.readD();
- return true;
+ _unk1 = packet.readInt();
+ _unk2 = packet.readInt();
+ _unk3 = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index fa76806f55..7a99c0cb2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail;
/**
* @author Gnacik
*/
-public class RequestPartyMatchList implements IClientIncomingPacket
+public class RequestPartyMatchList implements ClientPacket
{
private int _roomid;
private int _membersmax;
@@ -39,15 +39,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();
- _membersmax = packet.readD();
- _minLevel = packet.readD();
- _maxLevel = packet.readD();
- _loot = packet.readD();
- _roomtitle = packet.readS();
- return true;
+ _roomid = packet.readInt();
+ _membersmax = packet.readInt();
+ _minLevel = packet.readInt();
+ _maxLevel = packet.readInt();
+ _loot = packet.readInt();
+ _roomtitle = packet.readString();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index d66206f3eb..b46a62ef6e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.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.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.MercTicketManager;
@@ -28,15 +28,14 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
index 19c1969f90..0230ecb5f6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.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.IItemHandler;
import org.l2jmobius.gameserver.handler.ItemHandler;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,18 +28,17 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-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
- // readQ();
- // readD();
- return true;
+ // packet.readLong()();
+ // packet.readInt()();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index f7709ba5c7..fe5e046f1a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
index ca92d4562e..8e3fa6d426 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
index af3af505f0..7b19969625 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,7 +29,7 @@ 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 (?,?,?,?,?)";
@@ -39,12 +39,11 @@ public class RequestPetitionFeedback implements IClientIncomingPacket
private String _message;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index 5ea033e30b..527d9d86f4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,15 +24,14 @@ 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();
- return true;
+ _crestId = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
index 42fb37d366..78cbf9bf94 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index a4f9ba1784..d088c29307 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 8c5e2ee3d9..bbac005c01 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
index 4104dd8529..1a115f3954 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
index cc8c8207f8..02c3468062 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index f098b50a98..64acf991fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
index 9d038e1fda..8e34e1e50c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.clan.Clan.RankPrivs;
@@ -27,14 +26,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
index e27eff6935..b4ec5a6bc7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
index 64872dd03e..0a6bccf519 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
index 4b6c2b1a0b..7c035cd8e4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -27,17 +27,16 @@ import org.l2jmobius.gameserver.network.GameClient;
* 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
index e94bffa969..8c26510bb6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 _unk1;
private int _tab;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unk1 = packet.readD();
- _tab = packet.readD();
- return true;
+ _unk1 = packet.readInt();
+ _tab = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 8229c92ff6..0eaa4b202e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -42,15 +42,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 624591a6f3..b06b6b04cf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 51723e8700..2ad68e2d9d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.WorldObject;
@@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.util.Util;
/**
** @author Gnacik
*/
-public class RequestPreviewItem implements IClientIncomingPacket
+public class RequestPreviewItem implements ClientPacket
{
@SuppressWarnings("unused")
private int _unk;
@@ -79,18 +79,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
@@ -99,9 +99,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 8156deae96..15e147319b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.util.Util;
-public class RequestPrivateStoreBuy implements IClientIncomingPacket
+public class RequestPrivateStoreBuy implements ClientPacket
{
private static final int BATCH_LENGTH = 20; // length of the one item
@@ -43,29 +43,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
index d558a927d6..de08516474 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 28a5ffff0a..29f842d2e5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
- // readD();
- // readQ();
- return true;
+ // packet.readInt();
+ // packet.readLong();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
index 721015c5df..e7f35cef9e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
index 07e4c5a414..b0f96ac728 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 5291e9528c..ab146bf46e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/**
* @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestPrivateStoreSell implements IClientIncomingPacket
+public class RequestPrivateStoreSell implements ClientPacket
{
private static final int BATCH_LENGTH = 28; // length of the one item
@@ -41,31 +41,31 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
private ItemRequest[] _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 ItemRequest[count];
for (int i = 0; i < count; i++)
{
- final int objectId = packet.readD();
- final int itemId = packet.readD();
- packet.readH(); // TODO analyse this
- packet.readH(); // TODO analyse this
- final long cnt = packet.readQ();
- final long price = packet.readQ();
+ final int objectId = packet.readInt();
+ final int itemId = packet.readInt();
+ packet.readShort(); // TODO: analyze this
+ packet.readShort(); // TODO: analyze this
+ final long cnt = packet.readLong();
+ final long price = packet.readLong();
if ((objectId < 1) || (itemId < 1) || (cnt < 1) || (price < 0))
{
_items = null;
- return false;
+ return;
}
_items[i] = new ItemRequest(objectId, itemId, cnt, price);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index 24e526120d..2923cfad04 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
index 422e4ff012..4a0f455ffb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.Quest;
@@ -27,15 +27,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index 21ba9b39af..e52c364192 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index cbf78835a6..56c82eb219 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 59b7766f82..aa528e72b9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
index 7c2987ad10..ecf6c59dbb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.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.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;
@@ -31,10 +31,9 @@ public class RequestRecipeBookDestroy implements IClientIncomingPacket
* Unknown Packet:ad 0000: ad 02 00 00 00
*/
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 305b0efd97..591a11182a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index e30bee1ac5..4ffa9896e9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
index da23ab96d5..e1fc7b8a79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 90d4fc84b2..0b08e5c909 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index b82a2048c7..851296e8ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
index 3d3567be48..0cbbef43b7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index da49fdad3b..d97c60e56a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 82f12af318..d34b85456e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
index 768fcb0f1d..3ba07a13cb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
index ac8373ebdf..18d528a1d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 95c5b81a62..df8f7b875b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -25,14 +24,8 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExBrExtraUserInfo;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
index f0129e2d0f..4c5c859bbd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.AugmentationData;
import org.l2jmobius.gameserver.model.Augmentation;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -39,13 +39,12 @@ public class RequestRefine extends AbstractRefinePacket
private long _gemStoneCount;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _targetItemObjId = packet.readD();
- _refinerItemObjId = packet.readD();
- _gemStoneItemObjId = packet.readD();
- _gemStoneCount = packet.readQ();
- return true;
+ _targetItemObjId = packet.readInt();
+ _refinerItemObjId = packet.readInt();
+ _gemStoneItemObjId = packet.readInt();
+ _gemStoneCount = packet.readLong();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index f7107160b2..ec0b375121 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
@@ -30,15 +30,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 686603463d..e9cd8baa0a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.Creature;
@@ -39,7 +39,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;
@@ -48,21 +48,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index 18709b4e0c..1b52ba48a6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.instancemanager.MailManager;
import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.World;
@@ -32,15 +32,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
index 1d29277392..afec056681 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.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 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(); // _reqName
- _answer = packet.readD();
- return true;
+ packet.readString(); // _reqName
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
index 11cc8f54ba..eafb502bd7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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(); // _reqName
- _answer = packet.readD();
- return true;
+ packet.readString(); // _reqName
+ _answer = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
index 8a2f42272a..93f6f08044 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
index b10b15d786..c1247be878 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 647821931b..80c8fb35ed 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.PrivateStoreType;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -43,16 +42,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)
{
@@ -168,7 +161,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());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
index 64d6fc3003..122f7ee071 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.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.sql.ClanHallTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
@@ -42,16 +42,15 @@ import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @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;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _requestedPointType = packet.readD();
- return true;
+ _requestedPointType = packet.readInt();
}
class DeathTask implements Runnable
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSSQStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSSQStatus.java
index 9e03cb3a7a..76ca29057b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSSQStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSSQStatus.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.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.network.GameClient;
@@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.SSQStatus;
* Seven Signs Record Update Request packet type id 0xc7 format: cc
* @author Tempy
*/
-public class RequestSSQStatus implements IClientIncomingPacket
+public class RequestSSQStatus 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
index 9889bd0a87..56af1b4f56 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.network.GameClient;
@@ -24,19 +24,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
index 7ea8c00de2..bfdb6e29c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.java
index f8e19b0252..ad56c9520f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.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.gameserver.data.xml.UIData;
import org.l2jmobius.gameserver.model.ActionKey;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -32,48 +32,47 @@ import org.l2jmobius.gameserver.network.GameClient;
* Request Save Key Mapping client packet.
* @author mrTJO, Zoey76
*/
-public class RequestSaveKeyMapping implements IClientIncomingPacket
+public class RequestSaveKeyMapping implements ClientPacket
{
private final Map> _keyMap = new HashMap<>();
private final Map> _catMap = new HashMap<>();
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
int category = 0;
- packet.readD(); // Unknown
- packet.readD(); // Unknown
- final int _tabNum = packet.readD();
+ packet.readInt(); // Unknown
+ packet.readInt(); // Unknown
+ final int _tabNum = packet.readInt();
for (int i = 0; i < _tabNum; i++)
{
- final int cmd1Size = packet.readC();
+ final int cmd1Size = packet.readByte();
for (int j = 0; j < cmd1Size; j++)
{
- UIData.addCategory(_catMap, category, packet.readC());
+ UIData.addCategory(_catMap, category, packet.readByte());
}
category++;
- final int cmd2Size = packet.readC();
+ final int cmd2Size = packet.readByte();
for (int j = 0; j < cmd2Size; j++)
{
- UIData.addCategory(_catMap, category, packet.readC());
+ UIData.addCategory(_catMap, category, packet.readByte());
}
category++;
- final int cmdSize = packet.readD();
+ final int cmdSize = packet.readInt();
for (int j = 0; j < cmdSize; j++)
{
- final int cmd = packet.readD();
- final int key = packet.readD();
- final int tgKey1 = packet.readD();
- final int tgKey2 = packet.readD();
- final int show = packet.readD();
+ final int cmd = packet.readInt();
+ final int key = packet.readInt();
+ final int tgKey1 = packet.readInt();
+ final int tgKey2 = packet.readInt();
+ final int show = packet.readInt();
UIData.addKey(_keyMap, i, new ActionKey(i, cmd, key, tgKey1, tgKey2, show));
}
}
- packet.readD();
- packet.readD();
- return true;
+ packet.readInt();
+ packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
index 79ad4aa3b5..900627c3e7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 6d7e87a529..6c4b35aed7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.Creature;
@@ -41,7 +41,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;
@@ -50,28 +50,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendFriendMsg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendFriendMsg.java
index 73c62c2a49..3af9c8e41d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendFriendMsg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendFriendMsg.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.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -30,7 +30,7 @@ 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");
@@ -38,11 +38,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
index fe0c714b0f..2fed6eff00 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.enums.PrivateStoreType;
@@ -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,18 @@ 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();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index 9f4036d402..50da4c6f89 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index fbb37b1856..b6bedb5cc6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
index bb4b35af80..64924c9d4d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,21 +29,20 @@ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
index 5ae43534f0..8f63999266 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 197ab07190..98f6cd046a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
index b880bd4aa4..91cd2d5384 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index 7fbe851664..d0b8000360 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index 9f1555e7ad..7e26177ef0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -16,25 +16,24 @@
*/
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;
/**
* @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 id = packet.readD();
+ final int id = packet.readInt();
_slot = id % 12;
_page = id / 12;
- return true;
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a3bb33c912..80e23d3215 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.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.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
-public class RequestShortCutReg implements IClientIncomingPacket
+public class RequestShortCutReg implements ClientPacket
{
private ShortcutType _type;
private int _id;
@@ -33,17 +33,16 @@ public class RequestShortCutReg implements IClientIncomingPacket
private int _characterType; // 1 - player, 2 - pet
@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 slot = packet.readD();
+ final int slot = packet.readInt();
_slot = slot % 12;
_page = slot / 12;
- _id = packet.readD();
- _level = packet.readD();
- _characterType = packet.readD();
- return true;
+ _id = packet.readInt();
+ _level = packet.readInt();
+ _characterType = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 541b987e91..f803deffb5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 492743a557..bcc7a02e06 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index c313f65ebf..c7ee7174ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -29,15 +29,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 57584a89ce..6a4f1e2ac5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -17,7 +17,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;
@@ -27,15 +27,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
index cf812f2e0c..5165e4de4d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 true;
- }
-
- @Override
- public void run(GameClient client)
- {
- // TODO this
- }
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 51c42f7b7c..3a4c2663ec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index a5e8bb5220..8253e90abb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index 6b99f7dd42..c4a8e58b0a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -27,15 +27,14 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index ebdf32ccc2..7d4d173fb8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -26,15 +26,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index fc717d169a..e6ad179119 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
/**
* @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
*/
-public class RequestTargetCanceld implements IClientIncomingPacket
+public class RequestTargetCanceld implements ClientPacket
{
private int _unselect;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _unselect = packet.readH();
- return true;
+ _unselect = packet.readShort();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
index 31bd289033..a364c6fdde 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
+ 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
@@ -42,6 +41,6 @@ public class RequestTeleportBookMark implements IClientIncomingPacket
{
return;
}
- player.teleportBookmarkGo(id);
+ player.teleportBookmarkGo(_id);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
index 6d6be6ba13..e0837ba3d2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index 6709013fb8..f458cb1bef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.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.BypassHandler;
import org.l2jmobius.gameserver.handler.IBypassHandler;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -25,15 +25,14 @@ import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.TutorialCloseHtml;
-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)
{
- _bypass = packet.readS();
- return true;
+ _bypass = packet.readString();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 184ad163e4..2f935d864d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.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.handler.BypassHandler;
import org.l2jmobius.gameserver.handler.IBypassHandler;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.QuestState;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
index 630e6bcab1..b95eb8be83 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.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.actor.instance.ClassMaster;
import org.l2jmobius.gameserver.model.quest.QuestState;
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)
{
- _number = packet.readD();
- return true;
+ _number = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index 0a81c6adda..ba7ba488c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 1d61bdbf07..2160ba307f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.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.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
@@ -27,15 +27,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 0e3300d03c..3233a7d45f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
index 3be6e270c5..450dc2ac23 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -30,14 +29,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail;
/**
* @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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
index 72667fcaad..eed42abff6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
@@ -27,18 +27,17 @@ import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom;
/**
* @author Gnacik
*/
-public class RequestWithdrawPartyRoom implements IClientIncomingPacket
+public class RequestWithdrawPartyRoom implements ClientPacket
{
private int _roomid;
@SuppressWarnings("unused")
private int _unk1;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _roomid = packet.readD();
- _unk1 = packet.readD();
- return true;
+ _roomid = packet.readInt();
+ _unk1 = packet.readInt();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index bdce4a5e28..4e647e40c7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.concurrent.TimeUnit;
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;
@@ -30,14 +29,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
index 3b2494978b..3e73679827 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
index 683ab1a447..49d50f38ef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -43,7 +43,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,12 +91,11 @@ public class Say2 implements IClientIncomingPacket
private String _target;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- _text = packet.readS();
- _type = packet.readD();
- _target = (_type == ChatType.WHISPER.getClientId()) ? packet.readS() : null;
- return true;
+ _text = packet.readString();
+ _type = packet.readInt();
+ _target = (_type == ChatType.WHISPER.getClientId()) ? packet.readString() : null;
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index ed11410f59..6f2c9611e9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 44a4e6fbcd..859322d79c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -39,34 +39,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
index 060f5816b3..68fa65923a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
@@ -36,34 +36,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
index da45dc6538..35537536d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.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;
@@ -35,42 +35,41 @@ import org.l2jmobius.gameserver.util.Util;
/**
* @version $Revision: 1.2.2.1.2.5 $ $Date: 2005/03/27 15:29:30 $ CPU Disasm Packets: ddhhQQ cddb
*/
-public class SetPrivateStoreListBuy implements IClientIncomingPacket
+public class SetPrivateStoreListBuy implements ClientPacket
{
private static final int BATCH_LENGTH = 40; // length of the one item
private Item[] _items = null;
@Override
- public boolean read(GameClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- final int count = packet.readD();
- if ((count < 1) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != packet.getReadableBytes()))
+ 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();
- packet.readD(); // TODO analyse this
+ final int itemId = packet.readInt();
+ packet.readInt(); // 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;
}
- packet.readD(); // Unk
- packet.readD(); // Unk
- packet.readD(); // Unk
- packet.readD(); // Unk
+ packet.readInt(); // Unk
+ packet.readInt(); // Unk
+ packet.readInt(); // Unk
+ packet.readInt(); // Unk
_items[i] = new Item(itemId, cnt, price);
}
- return true;
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
index 6457132d6c..97e6e2b32b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index 89261d5490..21f4eca0fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index 88e04641cf..6cd2e35b57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index 38de85007e..15114ab909 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
index 77995fd596..eed8774d0b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java
index 22a5ded981..146184ec25 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
index 78cee0fdba..b6d90268c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 930ba564d6..9f987d03a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.gameserver.data.BotReportTable;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.BlockList;
@@ -36,15 +36,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();
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 8119d01fc3..374ba296ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
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;
@@ -50,18 +50,17 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
index 43063f03c3..6f1b937c28 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index e4dda29d67..b6b7f2d834 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index f90adbc231..91de33ca1e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 2831581ca8..184aca2cf2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 39726f3209..96785816a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index eabe8e4cc8..4503a57d81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 43ac28c2fd..2489ee6cd0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index aabd12fa73..2cbdf7ab9d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index 90385d6714..9e3d781aea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 187b69692d..d83b8ced5e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index fcec3c1d57..1d097f6864 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index b836d3f9d1..19095b07ec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index ee1c787150..1ecda57e91 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index 63ff77197d..c8c7da8488 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 0921f6fa49..5ef05a94e4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index dfe5405046..9256c2f4c5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 0143bbe1ca..3656ace43d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 0ab730e66c..54753910c5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 08d979c746..ef9d9d8b4f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index c096edd6dd..b752a712ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
index f586bed48e..3f9dc5323d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,19 +35,18 @@ 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.writeD(info.getTime());
+ writeInt(info.getSkill().getDisplayId());
+ writeShort(info.getSkill().getDisplayLevel());
+ writeInt(info.getTime());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index bec794bef3..21e379f20e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java
index 8b40712b46..e475acc928 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,13 +81,13 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket
return _items.values();
}
- protected final void writeItems(PacketWriter packet)
+ protected void writeItems()
{
- packet.writeH(_items.size());
+ writeShort(_items.size());
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index 660f96f592..a538bbb5d1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.model.ItemInfo;
import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -25,65 +24,65 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
/**
* @author UnAfraid
*/
-public abstract class AbstractItemPacket implements IClientOutgoingPacket
+public abstract class AbstractItemPacket extends ServerPacket
{
- protected void writeItem(PacketWriter packet, TradeItem item)
+ protected void writeItem(TradeItem item)
{
- writeItem(packet, new ItemInfo(item));
+ writeItem(new ItemInfo(item));
}
- protected void writeItem(PacketWriter packet, Item item)
+ protected void writeItem(Item item)
{
- writeItem(packet, new ItemInfo(item));
+ writeItem(new ItemInfo(item));
}
- protected void writeItem(PacketWriter packet, ItemInfo item)
+ protected void writeItem(ItemInfo item)
{
- packet.writeD(item.getObjectId()); // ObjectId
- packet.writeD(item.getItem().getDisplayId()); // ItemId
- packet.writeD(item.getLocation()); // T1
- packet.writeQ(item.getCount()); // Quantity
- packet.writeH(item.getItem().getType2()); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
- packet.writeH(item.getCustomType1()); // Filler (always 0)
- packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
- packet.writeD(item.getItem().getBodyPart()); // 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(item.getEnchant()); // Enchant level (pet level shown in control item)
- packet.writeH(item.getCustomType2()); // Pet name exists or not shown in control item
- packet.writeD(item.getAugmentationBonus());
- packet.writeD(item.getMana());
- packet.writeD(item.getTime());
- writeItemElementalAndEnchant(packet, item);
+ writeInt(item.getObjectId()); // ObjectId
+ writeInt(item.getItem().getDisplayId()); // ItemId
+ writeInt(item.getLocation()); // T1
+ writeLong(item.getCount()); // Quantity
+ writeShort(item.getItem().getType2()); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
+ writeShort(item.getCustomType1()); // Filler (always 0)
+ writeShort(item.getEquipped()); // Equipped : 00-No, 01-yes
+ writeInt(item.getItem().getBodyPart()); // 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(item.getEnchant()); // Enchant level (pet level shown in control item)
+ writeShort(item.getCustomType2()); // Pet name exists or not shown in control item
+ writeInt(item.getAugmentationBonus());
+ writeInt(item.getMana());
+ writeInt(item.getTime());
+ writeItemElementalAndEnchant(item);
}
- protected void writeItemElementalAndEnchant(PacketWriter packet, ItemInfo item)
+ protected void writeItemElementalAndEnchant(ItemInfo item)
{
- packet.writeH(item.getAttackElementType());
- packet.writeH(item.getAttackElementPower());
+ writeShort(item.getAttackElementType());
+ writeShort(item.getAttackElementPower());
for (byte i = 0; i < 6; i++)
{
- packet.writeH(item.getElementDefAttr(i));
+ writeShort(item.getElementDefAttr(i));
}
// Enchant Effects
for (int op : item.getEnchantOptions())
{
- packet.writeH(op);
+ writeShort(op);
}
}
- protected void writeInventoryBlock(PacketWriter packet, PlayerInventory inventory)
+ protected void writeInventoryBlock(PlayerInventory inventory)
{
if (inventory.hasInventoryBlock())
{
- packet.writeH(inventory.getBlockItems().length);
- packet.writeC(inventory.getBlockMode());
+ writeShort(inventory.getBlockItems().length);
+ writeByte(inventory.getBlockMode());
for (int i : inventory.getBlockItems())
{
- packet.writeD(i);
+ writeInt(i);
}
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
index 18adfd00a5..764ead46a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.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.sql.ClanTable;
import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData;
import org.l2jmobius.gameserver.enums.PlayerCondOverride;
@@ -31,9 +30,9 @@ 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.model.zone.type.TownZone;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public abstract class AbstractNpcInfo implements IClientOutgoingPacket
+public abstract class AbstractNpcInfo extends ServerPacket
{
protected int _x;
protected int _y;
@@ -135,46 +134,46 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_INFO.writeId(packet);
- packet.writeD(_npc.getObjectId());
- packet.writeD(_displayId + 1000000); // npctype id
- packet.writeD(_isAttackable ? 1 : 0);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- packet.writeD(0);
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- 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(_npc.getAttackSpeedMultiplier());
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(_rhand); // right hand weapon
- packet.writeD(_chest);
- packet.writeD(_lhand); // left hand weapon
- packet.writeC(1); // name above char 1=true ... ??
- packet.writeC(_npc.isRunning() ? 1 : 0);
- packet.writeC(_npc.isInCombat() ? 1 : 0);
- packet.writeC(_npc.isAlikeDead() ? 1 : 0);
- packet.writeC(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
- packet.writeD(-1); // High Five NPCString ID
+ ServerPackets.NPC_INFO.writeId(this);
+ writeInt(_npc.getObjectId());
+ writeInt(_displayId + 1000000); // npctype id
+ writeInt(_isAttackable);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
+ writeInt(0);
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_npc.getAttackSpeedMultiplier());
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(_rhand); // right hand weapon
+ writeInt(_chest);
+ writeInt(_lhand); // left hand weapon
+ writeByte(1); // name above char 1=true ... ??
+ writeByte(_npc.isRunning());
+ writeByte(_npc.isInCombat());
+ writeByte(_npc.isAlikeDead());
+ writeByte(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+ writeInt(-1); // High Five NPCString ID
if ((_localisation == null) && _npc.getTemplate().isUsingServerSideName())
{
_name = _npc.getName(); // On every subclass
}
- packet.writeS(_name);
- packet.writeD(-1); // High Five NPCString ID
+ writeString(_name);
+ writeInt(-1); // High Five NPCString ID
if (_npc.isInvisible())
{
_title = "Invisible";
@@ -226,28 +225,27 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket
{
_title = (Config.CHAMP_TITLE); // On every subclass
}
- packet.writeS(_title);
- packet.writeD(0); // Title color 0=client default
- packet.writeD(0); // pvp flag
- packet.writeD(0); // karma
- packet.writeD(_npc.isInvisible() ? _npc.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _npc.getAbnormalVisualEffects());
- packet.writeD(_clanId); // clan id
- packet.writeD(_clanCrest); // crest id
- packet.writeD(_allyId); // ally id
- packet.writeD(_allyCrest); // all crest
- packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); // C2
- packet.writeC(_npc.getTeam().getId());
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(_enchantEffect); // C4
- packet.writeD(_npc.isFlying() ? 1 : 0); // C6
- packet.writeD(0);
- packet.writeD(_npc.getColorEffect()); // CT1.5 Pet form and skills, Color effect
- packet.writeC(_npc.isTargetable() ? 1 : 0);
- packet.writeC(_npc.isShowName() ? 1 : 0);
- packet.writeD(_npc.getAbnormalVisualEffectSpecial());
- packet.writeD(_displayEffect);
- return true;
+ writeString(_title);
+ writeInt(0); // Title color 0=client default
+ writeInt(0); // pvp flag
+ writeInt(0); // karma
+ writeInt(_npc.isInvisible() ? _npc.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _npc.getAbnormalVisualEffects());
+ writeInt(_clanId); // clan id
+ writeInt(_clanCrest); // crest id
+ writeInt(_allyId); // ally id
+ writeInt(_allyCrest); // all crest
+ writeByte(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); // C2
+ writeByte(_npc.getTeam().getId());
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(_enchantEffect); // C4
+ writeInt(_npc.isFlying()); // C6
+ writeInt(0);
+ writeInt(_npc.getColorEffect()); // CT1.5 Pet form and skills, Color effect
+ writeByte(_npc.isTargetable());
+ writeByte(_npc.isShowName());
+ writeInt(_npc.getAbnormalVisualEffectSpecial());
+ writeInt(_displayEffect);
}
}
@@ -273,63 +271,62 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_INFO.writeId(packet);
- packet.writeD(_trap.getObjectId());
- packet.writeD(_displayId + 1000000); // npctype id
- packet.writeD(_isAttackable ? 1 : 0);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- packet.writeD(0);
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- 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(_trap.getAttackSpeedMultiplier());
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(_rhand); // right hand weapon
- packet.writeD(_chest);
- packet.writeD(_lhand); // left hand weapon
- packet.writeC(1); // name above char 1=true ... ??
- packet.writeC(1);
- packet.writeC(_trap.isInCombat() ? 1 : 0);
- packet.writeC(_trap.isAlikeDead() ? 1 : 0);
- packet.writeC(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
- packet.writeD(-1); // High Five NPCString ID
- packet.writeS(_name);
- packet.writeD(-1); // High Five NPCString ID
- packet.writeS(_title);
- packet.writeD(0); // title color 0 = client default
- packet.writeD(_trap.getPvpFlag());
- packet.writeD(_trap.getKarma());
- packet.writeD(_trap.isInvisible() ? _trap.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _trap.getAbnormalVisualEffects());
- packet.writeD(0); // clan id
- packet.writeD(0); // crest id
- packet.writeD(0); // C2
- packet.writeD(0); // C2
- packet.writeC(0); // C2
- packet.writeC(_trap.getTeam().getId());
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(0); // C4
- packet.writeD(0); // C6
- packet.writeD(0);
- packet.writeD(0); // CT1.5 Pet form and skills
- packet.writeC(1);
- packet.writeC(1);
- packet.writeD(0);
- return true;
+ ServerPackets.NPC_INFO.writeId(this);
+ writeInt(_trap.getObjectId());
+ writeInt(_displayId + 1000000); // npctype id
+ writeInt(_isAttackable);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
+ writeInt(0);
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_trap.getAttackSpeedMultiplier());
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(_rhand); // right hand weapon
+ writeInt(_chest);
+ writeInt(_lhand); // left hand weapon
+ writeByte(1); // name above char 1=true ... ??
+ writeByte(1);
+ writeByte(_trap.isInCombat());
+ writeByte(_trap.isAlikeDead());
+ writeByte(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+ writeInt(-1); // High Five NPCString ID
+ writeString(_name);
+ writeInt(-1); // High Five NPCString ID
+ writeString(_title);
+ writeInt(0); // title color 0 = client default
+ writeInt(_trap.getPvpFlag());
+ writeInt(_trap.getKarma());
+ writeInt(_trap.isInvisible() ? _trap.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _trap.getAbnormalVisualEffects());
+ writeInt(0); // clan id
+ writeInt(0); // crest id
+ writeInt(0); // C2
+ writeInt(0); // C2
+ writeByte(0); // C2
+ writeByte(_trap.getTeam().getId());
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(0); // C4
+ writeInt(0); // C6
+ writeInt(0);
+ writeInt(0); // CT1.5 Pet form and skills
+ writeByte(1);
+ writeByte(1);
+ writeInt(0);
}
}
@@ -361,63 +358,62 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_INFO.writeId(packet);
- packet.writeD(_summon.getObjectId());
- packet.writeD(_displayId + 1000000); // npctype id
- packet.writeD(_isAttackable ? 1 : 0);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- packet.writeD(0);
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- 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(_summon.getAttackSpeedMultiplier());
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(_rhand); // right hand weapon
- packet.writeD(_chest);
- packet.writeD(_lhand); // left hand weapon
- packet.writeC(1); // name above char 1=true ... ??
- packet.writeC(1); // always running 1=running 0=walking
- packet.writeC(_summon.isInCombat() ? 1 : 0);
- packet.writeC(_summon.isAlikeDead() ? 1 : 0);
- packet.writeC(_isSummoned ? 2 : _value); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
- packet.writeD(-1); // High Five NPCString ID
- packet.writeS(_name);
- packet.writeD(-1); // High Five NPCString ID
- packet.writeS(_title);
- packet.writeD(1); // Title color 0=client default
- packet.writeD(_summon.getPvpFlag());
- packet.writeD(_summon.getKarma());
- packet.writeD(_gmSeeInvis && _summon.isInvisible() ? _summon.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _summon.getAbnormalVisualEffects());
- packet.writeD(0); // clan id
- packet.writeD(0); // crest id
- packet.writeD(0); // C2
- packet.writeD(0); // C2
- packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // C2
- packet.writeC(_summon.getTeam().getId());
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(_enchantEffect); // C4
- packet.writeD(0); // C6
- packet.writeD(0);
- packet.writeD(_form); // CT1.5 Pet form and skills
- packet.writeC(1);
- packet.writeC(1);
- packet.writeD(_summon.getAbnormalVisualEffectSpecial());
- return true;
+ ServerPackets.NPC_INFO.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeInt(_displayId + 1000000); // npctype id
+ writeInt(_isAttackable);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
+ writeInt(0);
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_summon.getAttackSpeedMultiplier());
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(_rhand); // right hand weapon
+ writeInt(_chest);
+ writeInt(_lhand); // left hand weapon
+ writeByte(1); // name above char 1=true ... ??
+ writeByte(1); // always running 1=running 0=walking
+ writeByte(_summon.isInCombat());
+ writeByte(_summon.isAlikeDead());
+ writeByte(_isSummoned ? 2 : _value); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+ writeInt(-1); // High Five NPCString ID
+ writeString(_name);
+ writeInt(-1); // High Five NPCString ID
+ writeString(_title);
+ writeInt(1); // Title color 0=client default
+ writeInt(_summon.getPvpFlag());
+ writeInt(_summon.getKarma());
+ writeInt(_gmSeeInvis && _summon.isInvisible() ? _summon.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _summon.getAbnormalVisualEffects());
+ writeInt(0); // clan id
+ writeInt(0); // crest id
+ writeInt(0); // C2
+ writeInt(0); // C2
+ writeByte(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // C2
+ writeByte(_summon.getTeam().getId());
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(_enchantEffect); // C4
+ writeInt(0); // C6
+ writeInt(0);
+ writeInt(_form); // CT1.5 Pet form and skills
+ writeByte(1);
+ writeByte(1);
+ writeInt(_summon.getAbnormalVisualEffectSpecial());
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
index a3144b04fb..9a2959c4a9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
@@ -16,18 +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 Kerberos
*/
-public class AcquireSkillDone implements IClientOutgoingPacket
+public class AcquireSkillDone extends ServerPacket
{
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
index a99ba54cb8..e1fbe7d4af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.writeD(_spCost);
- packet.writeD(_type.ordinal());
- packet.writeD(_reqs.size());
+ ServerPackets.ACQUIRE_SKILL_INFO.writeId(this);
+ writeInt(_id);
+ writeInt(_level);
+ writeInt(_spCost);
+ writeInt(_type.ordinal());
+ 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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
index 8ac604bac5..53e1de3d00 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
@@ -19,14 +19,13 @@ 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.AcquireSkillType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Acquire Skill List server packet implementation.
*/
-public class AcquireSkillList implements IClientOutgoingPacket
+public class AcquireSkillList extends ServerPacket
{
private final List _skills;
private final AcquireSkillType _skillType;
@@ -54,6 +53,7 @@ public class AcquireSkillList implements IClientOutgoingPacket
public AcquireSkillList(AcquireSkillType type)
{
+ super(512);
_skillType = type;
_skills = new ArrayList<>();
}
@@ -64,27 +64,27 @@ public class AcquireSkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_skills.isEmpty())
{
- return false;
+ return;
}
- OutgoingPackets.ACQUIRE_SKILL_LIST.writeId(packet);
- packet.writeD(_skillType.ordinal());
- packet.writeD(_skills.size());
+
+ ServerPackets.ACQUIRE_SKILL_LIST.writeId(this);
+ writeInt(_skillType.ordinal());
+ writeInt(_skills.size());
for (Skill temp : _skills)
{
- packet.writeD(temp.id);
- packet.writeD(temp.nextLevel);
- packet.writeD(temp.maxLevel);
- packet.writeD(temp.spCost);
- packet.writeD(temp.requirements);
+ writeInt(temp.id);
+ writeInt(temp.nextLevel);
+ writeInt(temp.maxLevel);
+ writeInt(temp.spCost);
+ writeInt(temp.requirements);
if (_skillType == AcquireSkillType.SUBPLEDGE)
{
- packet.writeD(0); // TODO: ?
+ writeInt(0); // TODO: ?
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
index cb678b2e29..d1257546bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.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 ActionFailed implements IClientOutgoingPacket
+public class ActionFailed extends ServerPacket
{
public static final ActionFailed STATIC_PACKET = new ActionFailed();
@@ -28,9 +27,8 @@ public class ActionFailed implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ACTION_FAIL.writeId(packet);
- return true;
+ ServerPackets.ACTION_FAIL.writeId(this);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AdminForgePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AdminForgePacket.java
index 80d089ba68..6693718cb4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AdminForgePacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,50 +41,49 @@ 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;
}
- public boolean generate(PacketWriter packet, byte b, String string)
+ public boolean generate(byte b, String string)
{
if ((b == 'C') || (b == 'c'))
{
- packet.writeC(Integer.decode(string));
+ writeByte(Integer.decode(string));
return true;
}
else if ((b == 'D') || (b == 'd'))
{
- packet.writeD(Integer.decode(string));
+ writeInt(Integer.decode(string));
return true;
}
else if ((b == 'H') || (b == 'h'))
{
- packet.writeH(Integer.decode(string));
+ writeShort(Integer.decode(string));
return true;
}
else if ((b == 'F') || (b == 'f'))
{
- packet.writeF(Double.parseDouble(string));
+ writeDouble(Double.parseDouble(string));
return true;
}
else if ((b == 'S') || (b == 's'))
{
- packet.writeS(string);
+ writeString(string);
return true;
}
else if ((b == 'B') || (b == 'b') || (b == 'X') || (b == 'x'))
{
- packet.writeB(new BigInteger(string).toByteArray());
+ writeBytes(new BigInteger(string).toByteArray());
return true;
}
else if ((b == 'Q') || (b == 'q'))
{
- packet.writeQ(Long.decode(string));
+ writeLong(Long.decode(string));
return true;
}
return false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
index b12d882308..5913d43f1a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.residences.AuctionableHall;
import org.l2jmobius.gameserver.model.residences.ClanHall;
import org.l2jmobius.gameserver.model.residences.ClanHall.ClanHallFunction;
-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 AuctionableHall _clanHall;
@@ -35,144 +34,143 @@ public class AgitDecoInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.AGIT_DECO_INFO.writeId(packet);
- packet.writeD(_clanHall.getId());
+ ServerPackets.AGIT_DECO_INFO.writeId(this);
+ writeInt(_clanHall.getId());
// Fireplace
ClanHallFunction function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_HP);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 220)) || ((_clanHall.getGrade() == 1) && (function.getLevel() < 160)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 260)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 300)))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Carpet - Statue
function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_MP);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
- packet.writeC(0);
+ writeByte(0);
+ writeByte(0);
}
else if ((((_clanHall.getGrade() == 0) || (_clanHall.getGrade() == 1)) && (function.getLevel() < 25)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 30)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 40)))
{
- packet.writeC(1);
- packet.writeC(1);
+ writeByte(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
- packet.writeC(2);
+ writeByte(2);
+ writeByte(2);
}
// Chandelier
function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_EXP);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 25)) || ((_clanHall.getGrade() == 1) && (function.getLevel() < 30)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 40)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 50)))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Mirror
function = _clanHall.getFunction(ClanHall.FUNC_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 = _clanHall.getFunction(ClanHall.FUNC_DECO_CURTAINS);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (function.getLevel() <= 1)
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Magic Curtain
function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 2)) || (function.getLevel() < 3))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Support? - Flag
function = _clanHall.getFunction(ClanHall.FUNC_SUPPORT);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
- packet.writeC(0);
+ writeByte(0);
+ writeByte(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 2)) || ((_clanHall.getGrade() == 1) && (function.getLevel() < 4)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 5)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 8)))
{
- packet.writeC(1);
- packet.writeC(1);
+ writeByte(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
- packet.writeC(2);
+ writeByte(2);
+ writeByte(2);
}
// Front platform
function = _clanHall.getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (function.getLevel() <= 1)
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
// Item create?
function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
if ((function == null) || (function.getLevel() == 0))
{
- packet.writeC(0);
+ writeByte(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 2)) || (function.getLevel() < 3))
{
- packet.writeC(1);
+ writeByte(1);
}
else
{
- packet.writeC(2);
+ writeByte(2);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
index 4683fb30f0..5331ed5dfe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
index af7bf93f72..b4fda087fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
@@ -40,19 +39,18 @@ public class AllyCrest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ALLIANCE_CREST.writeId(packet);
- packet.writeD(_crestId);
+ ServerPackets.ALLIANCE_CREST.writeId(this);
+ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
index b667851328..88fdddfde2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,11 +34,10 @@ 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(_requestorName);
- return true;
+ ServerPackets.ASK_JOIN_ALLIANCE.writeId(this);
+ writeInt(_requestorObjId);
+ writeString(_requestorName);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
index b9cfbe81b9..7f4589edbb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
index 0c47cb06a2..1a8085385e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.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 AskJoinPledge implements IClientOutgoingPacket
+public class AskJoinPledge extends ServerPacket
{
private final int _requestorObjId;
private final String _subPledgeName;
@@ -35,19 +34,18 @@ public class AskJoinPledge implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ASK_JOIN_PLEDGE.writeId(packet);
- packet.writeD(_requestorObjId);
+ ServerPackets.ASK_JOIN_PLEDGE.writeId(this);
+ writeInt(_requestorObjId);
if (_subPledgeName != null)
{
- packet.writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);
+ writeString(_pledgeType > 0 ? _subPledgeName : _pledgeName);
}
if (_pledgeType != 0)
{
- packet.writeD(_pledgeType);
+ writeInt(_pledgeType);
}
- packet.writeS(_pledgeName);
- return true;
+ writeString(_pledgeName);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java
index 7458588987..1afd84882b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java
@@ -20,13 +20,12 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Hit;
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;
-public class Attack implements IClientOutgoingPacket
+public class Attack extends ServerPacket
{
private final int _attackerObjId;
private final boolean _soulshot;
@@ -81,34 +80,32 @@ 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.writeC(hit.getFlags());
+ writeInt(hit.getTargetId());
+ writeInt(hit.getDamage());
+ writeByte(hit.getFlags());
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final Iterator it = _hits.iterator();
- OutgoingPackets.ATTACK.writeId(packet);
- packet.writeD(_attackerObjId);
- writeHit(packet, it.next());
- packet.writeD(_attackerLoc.getX());
- packet.writeD(_attackerLoc.getY());
- packet.writeD(_attackerLoc.getZ());
- packet.writeH(_hits.size() - 1);
+ ServerPackets.ATTACK.writeId(this);
+ writeInt(_attackerObjId);
+ writeHit(it.next());
+ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
index 8b85fe85e3..9ef442f27b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
@@ -16,26 +16,21 @@
*/
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;
- /**
- * @param targetId
- */
public AutoAttackStart(int targetId)
{
_targetObjId = targetId;
}
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
index a294b1e212..0f958f99ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
index 0882d902b8..2c2c7f5b5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.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.model.buylist.BuyListHolder;
import org.l2jmobius.gameserver.model.buylist.Product;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class BuyList implements IClientOutgoingPacket
+public class BuyList extends ServerPacket
{
private final int _listId;
private final Collection _list;
@@ -40,50 +39,49 @@ public class BuyList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet);
- packet.writeD(0);
- packet.writeQ(_money); // current money
- packet.writeD(_listId);
- packet.writeH(_list.size());
+ ServerPackets.EX_BUY_SELL_LIST.writeId(this);
+ writeInt(0);
+ writeLong(_money); // current money
+ writeInt(_listId);
+ writeShort(_list.size());
for (Product product : _list)
{
if ((product.getCount() > 0) || !product.hasLimitedStock())
{
- packet.writeD(product.getItemId());
- packet.writeD(product.getItemId());
- packet.writeD(0);
- packet.writeQ(product.getCount() < 0 ? 0 : product.getCount());
- packet.writeH(product.getItem().getType2());
- packet.writeH(product.getItem().getType1()); // Custom Type 1
- packet.writeH(0); // isEquipped
- packet.writeD(product.getItem().getBodyPart()); // Body Part
- packet.writeH(product.getItem().getDefaultEnchantLevel()); // Enchant
- packet.writeH(0); // Custom Type
- packet.writeD(0); // Augment
- packet.writeD(-1); // Mana
- packet.writeD(-9999); // Time
- packet.writeH(0); // Element Type
- packet.writeH(0); // Element Power
+ writeInt(product.getItemId());
+ writeInt(product.getItemId());
+ writeInt(0);
+ writeLong(product.getCount() < 0 ? 0 : product.getCount());
+ writeShort(product.getItem().getType2());
+ writeShort(product.getItem().getType1()); // Custom Type 1
+ writeShort(0); // isEquipped
+ writeInt(product.getItem().getBodyPart()); // Body Part
+ writeShort(product.getItem().getDefaultEnchantLevel()); // Enchant
+ writeShort(0); // Custom Type
+ writeInt(0); // Augment
+ writeInt(-1); // Mana
+ writeInt(-9999); // Time
+ writeShort(0); // Element Type
+ writeShort(0); // Element Power
for (byte i = 0; i < 6; i++)
{
- packet.writeH(0);
+ writeShort(0);
}
// Enchant Effects
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
if ((product.getItemId() >= 3960) && (product.getItemId() <= 4026))
{
- packet.writeQ((long) (product.getPrice() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate)));
+ writeLong((long) (product.getPrice() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate)));
}
else
{
- packet.writeQ((long) (product.getPrice() * (1 + _taxRate)));
+ writeLong((long) (product.getPrice() * (1 + _taxRate)));
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
index b9e260b1e9..033b635711 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,47 +46,46 @@ 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(_manorId); // manor id
+ ServerPackets.BUY_LIST_SEED.writeId(this);
+ writeLong(_money); // current money
+ writeInt(_manorId); // manor id
if (!_list.isEmpty())
{
- packet.writeH(_list.size()); // list length
+ writeShort(_list.size()); // list length
for (SeedProduction s : _list)
{
- packet.writeD(s.getId());
- packet.writeD(s.getId());
- packet.writeD(0);
- packet.writeQ(s.getAmount()); // item count
- packet.writeH(5); // Custom Type 2
- packet.writeH(0); // Custom Type 1
- packet.writeH(0); // Equipped
- packet.writeD(0); // Body Part
- packet.writeH(0); // Enchant
- packet.writeH(0); // Custom Type
- packet.writeD(0); // Augment
- packet.writeD(-1); // Mana
- packet.writeD(-9999); // Time
- packet.writeH(0); // Element Type
- packet.writeH(0); // Element Power
+ writeInt(s.getId());
+ writeInt(s.getId());
+ writeInt(0);
+ writeLong(s.getAmount()); // item count
+ writeShort(5); // Custom Type 2
+ writeShort(0); // Custom Type 1
+ writeShort(0); // Equipped
+ writeInt(0); // Body Part
+ writeShort(0); // Enchant
+ writeShort(0); // Custom Type
+ writeInt(0); // Augment
+ writeInt(-1); // Mana
+ writeInt(-9999); // Time
+ writeShort(0); // Element Type
+ writeShort(0); // Element Power
for (byte i = 0; i < 6; i++)
{
- packet.writeH(0);
+ writeShort(0);
}
// Enchant Effects
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeQ(s.getPrice()); // price
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeLong(s.getPrice()); // price
}
_list.clear();
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
index f3dc872dca..9eb6a694a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java
index b18dac4cc3..f72b2dfe4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java
index adea754676..b5a9c14b69 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
index de141fa067..d0b7a329db 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
index fbe5e39e2e..dfe0c69e1b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
index 067d878cb1..adbfa04246 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
public static final int REASON_CREATION_FAILED = 0x00; // "Your character creation has failed."
public static final int REASON_TOO_MANY_CHARACTERS = 0x01; // "You cannot create another character. Please delete the existing character and try again." Removes all settings that were selected (race, class, etc).
@@ -37,10 +36,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
index 768617e558..3da4ce994e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
index 5a51ab105d..a11229728e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.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 CharDeleteFail implements IClientOutgoingPacket
+public class CharDeleteFail extends ServerPacket
{
public static final int REASON_DELETION_FAILED = 1;
public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 2;
@@ -33,10 +32,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
index 24702fd723..4e3cb291ff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
index 21547ba0d1..7cad31b1b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.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.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Decoy;
@@ -25,9 +24,9 @@ import org.l2jmobius.gameserver.model.clan.Clan;
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();
@@ -115,113 +116,112 @@ public class CharInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHAR_INFO.writeId(packet);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_vehicleId);
- packet.writeD(_objId);
- packet.writeS(_player.getAppearance().getVisibleName());
- packet.writeD(_player.getRace().ordinal());
- packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
- packet.writeD(_player.getBaseClass());
+ ServerPackets.CHAR_INFO.writeId(this);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_vehicleId);
+ writeInt(_objId);
+ writeString(_player.getAppearance().getVisibleName());
+ writeInt(_player.getRace().ordinal());
+ writeInt(_player.getAppearance().isFemale());
+ writeInt(_player.getBaseClass());
for (int slot : getPaperdollOrder())
{
- packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot));
+ writeInt(_player.getInventory().getPaperdollItemDisplayId(slot));
}
for (int slot : getPaperdollOrder())
{
- packet.writeD(_player.getInventory().getPaperdollAugmentationId(slot));
+ writeInt(_player.getInventory().getPaperdollAugmentationId(slot));
}
- packet.writeD(_player.getInventory().getTalismanSlots());
- packet.writeD(_player.getInventory().canEquipCloak() ? 1 : 0);
- packet.writeD(_player.getPvpFlag());
- packet.writeD(_player.getKarma());
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- packet.writeD(0); // ?
- 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());
- packet.writeF(_player.getCollisionRadius());
- packet.writeF(_player.getCollisionHeight());
- packet.writeD(_player.getAppearance().getHairStyle());
- packet.writeD(_player.getAppearance().getHairColor());
- packet.writeD(_player.getAppearance().getFace());
- packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle());
+ writeInt(_player.getInventory().getTalismanSlots());
+ writeInt(_player.getInventory().canEquipCloak());
+ writeInt(_player.getPvpFlag());
+ writeInt(_player.getKarma());
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeInt(0); // ?
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_player.getAttackSpeedMultiplier());
+ writeDouble(_player.getCollisionRadius());
+ writeDouble(_player.getCollisionHeight());
+ writeInt(_player.getAppearance().getHairStyle());
+ writeInt(_player.getAppearance().getHairColor());
+ writeInt(_player.getAppearance().getFace());
+ writeString(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle());
if (!_player.isCursedWeaponEquipped())
{
- packet.writeD(_player.getClanId());
- packet.writeD(_player.getClanCrestId());
- packet.writeD(_player.getAllyId());
- packet.writeD(_player.getAllyCrestId());
+ writeInt(_player.getClanId());
+ writeInt(_player.getClanCrestId());
+ writeInt(_player.getAllyId());
+ writeInt(_player.getAllyCrestId());
}
else
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
- packet.writeC(_player.isSitting() ? 0 : 1); // standing = 1 sitting = 0
- packet.writeC(_player.isRunning() ? 1 : 0); // running = 1 walking = 0
- packet.writeC(_player.isInCombat() ? 1 : 0);
- packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0);
- packet.writeC(!_gmSeeInvis && _player.isInvisible() ? 1 : 0); // invisible = 1 visible =0
- packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
- packet.writeC(_player.getPrivateStoreType().getId());
+ writeByte(!_player.isSitting()); // standing = 1 sitting = 0
+ writeByte(_player.isRunning()); // running = 1 walking = 0
+ writeByte(_player.isInCombat());
+ writeByte(!_player.isInOlympiadMode() && _player.isAlikeDead());
+ writeByte(!_gmSeeInvis && _player.isInvisible()); // invisible = 1 visible =0
+ writeByte(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
+ writeByte(_player.getPrivateStoreType().getId());
- packet.writeH(_player.getCubics().size());
+ writeShort(_player.getCubics().size());
for (int cubicId : _player.getCubics().keySet())
{
- packet.writeH(cubicId);
+ writeShort(cubicId);
}
- packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0);
- packet.writeD(_gmSeeInvis ? (_player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _player.getAbnormalVisualEffects());
- packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
- packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue)
- packet.writeD(_player.getMountNpcId() + 1000000);
- packet.writeD(_player.getClassId().getId());
- packet.writeD(0); // ?
- packet.writeC(_player.isMounted() ? 0 : _player.getEnchantEffect());
- packet.writeC(_player.getTeam().getId());
- packet.writeD(_player.getClanCrestLargeId());
- packet.writeC(_player.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I
- packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura
+ writeByte(_player.isInPartyMatchRoom());
+ writeInt(_gmSeeInvis ? (_player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _player.getAbnormalVisualEffects());
+ writeByte(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
+ writeShort(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue)
+ writeInt(_player.getMountNpcId() + 1000000);
+ writeInt(_player.getClassId().getId());
+ writeInt(0); // ?
+ writeByte(_player.isMounted() ? 0 : _player.getEnchantEffect());
+ writeByte(_player.getTeam().getId());
+ writeInt(_player.getClanCrestLargeId());
+ writeByte(_player.isNoble()); // Symbol on char menu ctrl+I
+ writeByte(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA)); // Hero Aura
- packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0)
- packet.writeD(_player.getFishX());
- packet.writeD(_player.getFishY());
- packet.writeD(_player.getFishZ());
+ writeByte(_player.isFishing()); // 1: Fishing Mode (Cant be undone by setting back to 0)
+ writeInt(_player.getFishX());
+ writeInt(_player.getFishY());
+ writeInt(_player.getFishZ());
- packet.writeD(_player.getAppearance().getNameColor());
- packet.writeD(_heading);
- packet.writeD(_player.getPledgeClass());
- packet.writeD(_player.getPledgeType());
- packet.writeD(_player.getAppearance().getTitleColor());
- packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
- packet.writeD(_clan != null ? _clan.getReputationScore() : 0);
+ writeInt(_player.getAppearance().getNameColor());
+ writeInt(_heading);
+ writeInt(_player.getPledgeClass());
+ writeInt(_player.getPledgeType());
+ writeInt(_player.getAppearance().getTitleColor());
+ writeInt(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
+ writeInt(_clan != null ? _clan.getReputationScore() : 0);
// T1
- packet.writeD(_player.getTransformationDisplayId());
- packet.writeD(_player.getAgathionId());
+ writeInt(_player.getTransformationDisplayId());
+ writeInt(_player.getAgathionId());
// T2
- packet.writeD(1);
+ writeInt(1);
// T2.3
- packet.writeD(_player.getAbnormalVisualEffectSpecial());
- return true;
+ writeInt(_player.getAbnormalVisualEffectSpecial());
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
index ada3623370..77c38c89f7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.writeD((int) _player.getSp());
- packet.writeQ(_player.getExp());
- packet.writeD(_player.getLevel());
- packet.writeD(_player.getKarma()); // thx evill33t
- packet.writeD(_player.getPkKills());
- packet.writeD(_player.getINT());
- packet.writeD(_player.getSTR());
- packet.writeD(_player.getCON());
- packet.writeD(_player.getMEN());
- packet.writeD(_player.getDEX());
- packet.writeD(_player.getWIT());
- packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour
- packet.writeD(0);
- packet.writeD(_player.getClassId().getId());
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeB(new byte[64]);
- 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());
+ writeInt((int) _player.getSp());
+ writeLong(_player.getExp());
+ writeInt(_player.getLevel());
+ writeInt(_player.getKarma()); // thx evill33t
+ writeInt(_player.getPkKills());
+ writeInt(_player.getINT());
+ writeInt(_player.getSTR());
+ writeInt(_player.getCON());
+ writeInt(_player.getMEN());
+ writeInt(_player.getDEX());
+ writeInt(_player.getWIT());
+ writeInt(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour
+ writeInt(0);
+ writeInt(_player.getClassId().getId());
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeBytes(new byte[64]);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
index 3b625f64b7..cd7b88aa21 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -36,9 +35,9 @@ import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
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());
@@ -74,13 +73,13 @@ 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(0);
+ 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(0);
long lastAccess = 0;
if (_activeId == -1)
{
@@ -96,61 +95,60 @@ 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(charInfoPackage.getClanId()); // Clan ID
- packet.writeD(0); // Builder level
- packet.writeD(charInfoPackage.getSex()); // Sex
- packet.writeD(charInfoPackage.getRace()); // Race
- packet.writeD(charInfoPackage.getBaseClassId());
- packet.writeD(1); // GameServerName
- packet.writeD(charInfoPackage.getX());
- packet.writeD(charInfoPackage.getY());
- packet.writeD(charInfoPackage.getZ());
- packet.writeF(charInfoPackage.getCurrentHp());
- packet.writeF(charInfoPackage.getCurrentMp());
- packet.writeD((int) 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()))); // High
+ writeString(charInfoPackage.getName()); // Character name
+ writeInt(charInfoPackage.getObjectId()); // Character ID
+ writeString(_loginName); // Account name
+ writeInt(_sessionId); // Account ID
+ writeInt(charInfoPackage.getClanId()); // Clan ID
+ writeInt(0); // Builder level
+ writeInt(charInfoPackage.getSex()); // Sex
+ writeInt(charInfoPackage.getRace()); // Race
+ writeInt(charInfoPackage.getBaseClassId());
+ writeInt(1); // GameServerName
+ writeInt(charInfoPackage.getX());
+ writeInt(charInfoPackage.getY());
+ writeInt(charInfoPackage.getZ());
+ writeDouble(charInfoPackage.getCurrentHp());
+ writeDouble(charInfoPackage.getCurrentMp());
+ writeInt((int) 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()))); // High
// Five
- packet.writeD(charInfoPackage.getLevel());
- packet.writeD(charInfoPackage.getKarma());
- 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);
+ writeInt(charInfoPackage.getLevel());
+ writeInt(charInfoPackage.getKarma());
+ writeInt(charInfoPackage.getPkKills());
+ writeInt(charInfoPackage.getPvPKills());
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
for (int slot : getPaperdollOrder())
{
- packet.writeD(charInfoPackage.getPaperdollItemId(slot));
+ writeInt(charInfoPackage.getPaperdollItemId(slot));
}
- 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(Math.min(charInfoPackage.getEnchantEffect(), 127));
- packet.writeD(charInfoPackage.getAugmentationId());
- // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations
- packet.writeD(0); // 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
+ 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(Math.min(charInfoPackage.getEnchantEffect(), 127));
+ writeInt(charInfoPackage.getAugmentationId());
+ // writeInt(charInfoPackage.getTransformId()); // Used to display Transformations
+ writeInt(0); // 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
}
- return true;
}
private static List loadCharacterSelectInfo(String loginName)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
index d59df7911a..1ed46b6eed 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
index bb0c9a61f4..b8905886d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
index ae5363dcd3..77738220d0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,26 +64,26 @@ 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_TEXT:
case SystemMessage.TYPE_PLAYER_NAME:
{
- packet.writeS(param.getStringValue());
+ writeString(param.getStringValue());
break;
}
case SystemMessage.TYPE_LONG_NUMBER:
{
- packet.writeQ(param.getLongValue());
+ writeLong(param.getLongValue());
break;
}
case SystemMessage.TYPE_ITEM_NAME:
@@ -96,28 +95,27 @@ public class ConfirmDlg implements IClientOutgoingPacket
case SystemMessage.TYPE_INSTANCE_NAME:
case SystemMessage.TYPE_DOOR_NAME:
{
- packet.writeD(param.getIntValue());
+ writeInt(param.getIntValue());
break;
}
case SystemMessage.TYPE_SKILL_NAME:
{
final int[] array = param.getIntArrayValue();
- packet.writeD(array[0]); // SkillId
- packet.writeD(array[1]); // SkillLevel
+ writeInt(array[0]); // SkillId
+ writeInt(array[1]); // SkillLevel
break;
}
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
index 3414f6765d..50b9f8b78c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.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.enums.ChatType;
import org.l2jmobius.gameserver.model.actor.Creature;
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;
import org.l2jmobius.gameserver.network.SystemMessageId;
-public class CreatureSay implements IClientOutgoingPacket
+public class CreatureSay extends ServerPacket
{
private final Creature _sender;
private final ChatType _chatType;
@@ -39,6 +38,8 @@ public class CreatureSay implements IClientOutgoingPacket
public CreatureSay(Creature sender, ChatType chatType, String senderName, String text)
{
+ super(128);
+
_sender = sender;
_chatType = chatType;
_senderName = senderName;
@@ -47,6 +48,8 @@ public class CreatureSay implements IClientOutgoingPacket
public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId)
{
+ super(128);
+
_sender = sender;
_chatType = chatType;
_messageId = npcStringId.getId();
@@ -58,6 +61,8 @@ public class CreatureSay implements IClientOutgoingPacket
public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId)
{
+ super(128);
+
_sender = null;
_chatType = chatType;
_charId = charId;
@@ -78,36 +83,35 @@ 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);
}
else if (_parameters != null)
{
for (String s : _parameters)
{
- packet.writeS(s);
+ writeString(s);
}
}
- return true;
}
@Override
- public void runImpl(Player player)
+ public void run(Player player)
{
if (player != null)
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
index 2d9b28445c..82bd22984b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.writeD(0); // c2
- return true;
+ ServerPackets.DELETE_OBJECT.writeId(this);
+ writeInt(_objectId);
+ writeInt(0); // c2
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java
index 3b5917e55b..67d37474fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
index d53e282a1f..ac15be32c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
@@ -31,9 +30,9 @@ import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.siege.SiegeClan;
import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class Die implements IClientOutgoingPacket
+public class Die extends ServerPacket
{
private final int _objectId;
private final boolean _canTeleport;
@@ -60,11 +59,11 @@ public class Die implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.DIE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_canTeleport ? 1 : 0);
+ ServerPackets.DIE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_canTeleport);
if (_creature.isPlayer())
{
if (!OlympiadManager.getInstance().isRegistered(_creature.getActingPlayer()) && !_creature.getActingPlayer().isOnEvent())
@@ -103,34 +102,25 @@ public class Die implements IClientOutgoingPacket
isInFortDefense = true;
}
}
- packet.writeD(_clan.getHideoutId() > 0 ? 1 : 0); // 6d 01 00 00 00 - to hide away
- packet.writeD((_clan.getCastleId() > 0) || isInCastleDefense ? 1 : 0); // 6d 02 00 00 00 - to castle
- packet.writeD((TerritoryWarManager.getInstance().getHQForClan(_clan) != null) || ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || ((hall != null) && (hall.getSiege() != null) && hall.getSiege().checkIsAttacker(_clan)) ? 1 : 0); // 6d
- // 03
- // 00
- // 00
- // 00
- // -
- // to
- // siege
- // HQ
- packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow)
- packet.writeD(_staticRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED
- packet.writeD((_clan.getFortId() > 0) || isInFortDefense ? 1 : 0); // 6d 05 00 00 00 - to fortress
+ writeInt(_clan.getHideoutId() > 0); // 6d 01 00 00 00 - to hide away
+ writeInt((_clan.getCastleId() > 0) || isInCastleDefense); // 6d 02 00 00 00 - to castle
+ writeInt((TerritoryWarManager.getInstance().getHQForClan(_clan) != null) || ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || ((hall != null) && (hall.getSiege() != null) && hall.getSiege().checkIsAttacker(_clan))); // siege HQ
+ writeInt(_sweepable); // sweepable (blue glow)
+ writeInt(_staticRes); // 6d 04 00 00 00 - to FIXED
+ writeInt((_clan.getFortId() > 0) || isInFortDefense); // 6d 05 00 00 00 - to fortress
}
else
{
- packet.writeD(0); // 6d 01 00 00 00 - to hide away
- packet.writeD(0); // 6d 02 00 00 00 - to castle
- packet.writeD(0); // 6d 03 00 00 00 - to siege HQ
- packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow)
- packet.writeD(_staticRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED
- packet.writeD(0); // 6d 05 00 00 00 - to fortress
+ writeInt(0); // 6d 01 00 00 00 - to hide away
+ writeInt(0); // 6d 02 00 00 00 - to castle
+ writeInt(0); // 6d 03 00 00 00 - to siege HQ
+ writeInt(_sweepable); // sweepable (blue glow)
+ writeInt(_staticRes); // 6d 04 00 00 00 - to FIXED
+ writeInt(0); // 6d 05 00 00 00 - to fortress
}
// TODO: protocol 152
- // packet.writeC(0); // show die animation
- // packet.writeD(0); // agathion ress button
- // packet.writeD(0); // additional free space
- return true;
+ // writeByte(0); // show die animation
+ // writeInt(0); // agathion ress button
+ // writeInt(0); // additional free space
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
index 5837faec19..e48921ca12 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
index 14d41afee7..8fa42f4029 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 5cae569545..8dd18e834a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,19 +36,18 @@ 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.writeD(_item.isStackable() ? 1 : 0);
- packet.writeQ(_item.getCount());
- packet.writeD(1); // unknown
- return true;
+ writeInt(_item.isStackable());
+ writeLong(_item.getCount());
+ writeInt(1); // unknown
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java
index a5b142c423..ac40d11fd4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.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 Earthquake implements IClientOutgoingPacket
+public class Earthquake extends ServerPacket
{
private final int _x;
private final int _y;
@@ -44,15 +43,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
index 1b45a1e061..f8e7da453d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.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 EnchantResult implements IClientOutgoingPacket
+public class EnchantResult extends ServerPacket
{
private final int _result;
private final int _crystal;
@@ -33,12 +32,11 @@ 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);
- return true;
+ ServerPackets.ENCHANT_RESULT.writeId(this);
+ writeInt(_result);
+ writeInt(_crystal);
+ writeLong(_count);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java
index 96e1ba5b68..dc75c717c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
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 EquipUpdate implements IClientOutgoingPacket
+public class EquipUpdate extends ServerPacket
{
private final Item _item;
private final int _change;
@@ -33,12 +32,12 @@ public class EquipUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
+ ServerPackets.EQUIP_UPDATE.writeId(this);
+ writeInt(_change);
+ writeInt(_item.getObjectId());
int bodypart = 0;
- OutgoingPackets.EQUIP_UPDATE.writeId(packet);
- packet.writeD(_change);
- packet.writeD(_item.getObjectId());
switch (_item.getTemplate().getBodyPart())
{
case ItemTemplate.SLOT_L_EAR:
@@ -122,7 +121,6 @@ public class EquipUpdate implements IClientOutgoingPacket
break;
}
}
- packet.writeD(bodypart);
- return true;
+ writeInt(bodypart);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
index 174b9bc69c..05b1644017 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.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.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;
@@ -34,18 +33,17 @@ public class EtcStatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet);
- packet.writeD(_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.writeD((_player.getMessageRefusal() || _player.isChatBanned() || _player.isSilenceMode()) ? 1 : 0); // 1 = block all chat
- packet.writeD(_player.isInsideZone(ZoneId.DANGER_AREA) ? 1 : 0); // 1 = danger area
- packet.writeD(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4]
- packet.writeD(_player.getExpertiseArmorPenalty()); // Armor Grade Penalty [1-4]
- packet.writeD(_player.hasCharmOfCourage() ? 1 : 0); // 1 = charm of courage (allows resurrection on the same spot upon death on the siege battlefield)
- packet.writeD(_player.getDeathPenaltyBuffLevel()); // 1-15 death penalty, level (combat ability decreased due to death)
- packet.writeD(_player.getChargedSouls());
- return true;
+ ServerPackets.ETC_STATUS_UPDATE.writeId(this);
+ writeInt(_player.getCharges()); // 1-7 increase force, level
+ writeInt(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%)
+ writeInt(_player.getMessageRefusal() || _player.isChatBanned() || _player.isSilenceMode()); // 1 = block all chat
+ writeInt(_player.isInsideZone(ZoneId.DANGER_AREA)); // 1 = danger area
+ writeInt(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4]
+ writeInt(_player.getExpertiseArmorPenalty()); // Armor Grade Penalty [1-4]
+ writeInt(_player.hasCharmOfCourage()); // 1 = charm of courage (allows resurrection on the same spot upon death on the siege battlefield)
+ writeInt(_player.getDeathPenaltyBuffLevel()); // 1-15 death penalty, level (combat ability decreased due to death)
+ writeInt(_player.getChargedSouls());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
index c9463026e0..58c3efead6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
public static final int SUCCESS = 0;
public static final int WRONG_PATTERN = 1;
@@ -35,12 +34,11 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet);
- packet.writeC(0);
- packet.writeD(_response == WRONG_PATTERN ? 1 : 0);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_2ND_PASSWORD_ACK.writeId(this);
+ writeByte(0);
+ writeInt(_response == WRONG_PATTERN);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
index 5f85e645dc..7dfd42d7d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
public static final int PASSWORD_NEW = 0;
public static final int PASSWORD_PROMPT = 1;
@@ -36,11 +35,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
index c01508cf05..2f358d7a28 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
public static final int PASSWORD_OK = 0;
public static final int PASSWORD_WRONG = 1;
@@ -38,11 +37,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
index 0ba502e611..50f7ff1e10 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_AIRSHIP_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_AIRSHIP_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());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
index 120361e3b9..92fe4c21c0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_STOP_MOVE_AIRSHIP.writeId(packet);
- packet.writeD(_airShipId);
- packet.writeD(_playerId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.EX_STOP_MOVE_AIRSHIP.writeId(this);
+ writeInt(_airShipId);
+ writeInt(_playerId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
index f8674acdcf..e7bd1c1dfd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,30 +33,29 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AIRSHIP_TELEPORT_LIST.writeId(packet);
- packet.writeD(_dockId);
+ ServerPackets.EX_AIRSHIP_TELEPORT_LIST.writeId(this);
+ writeInt(_dockId);
if (_teleports != null)
{
- packet.writeD(_teleports.length);
+ writeInt(_teleports.length);
VehiclePathPoint[] path;
VehiclePathPoint dst;
for (int i = 0; i < _teleports.length; i++)
{
- packet.writeD(i - 1);
- packet.writeD(_fuelConsumption[i]);
+ writeInt(i - 1);
+ writeInt(_fuelConsumption[i]);
path = _teleports[i];
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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
index 1990e1e701..2258ac5344 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
index fa8553e595..05eec5f43e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,10 +35,9 @@ 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
- return true;
+ ServerPackets.EX_ASK_JOIN_MPCC.writeId(this);
+ writeString(_requestorName); // name of CCLeader
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
index aa0eda217c..6b2ba75f4d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.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 ExAskJoinPartyRoom implements IClientOutgoingPacket
+public class ExAskJoinPartyRoom extends ServerPacket
{
private final String _charName;
@@ -32,10 +31,9 @@ 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);
- return true;
+ ServerPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(this);
+ writeString(_charName);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
index 1551840013..751db2338d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
index e66a02fcc6..f9870719d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.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 ExAttributeEnchantResult implements IClientOutgoingPacket
+public class ExAttributeEnchantResult extends ServerPacket
{
private final int _result;
@@ -29,10 +28,9 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
index b24750c3d6..278b4921e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
@@ -16,18 +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 ExAutoSoulShot implements IClientOutgoingPacket
+public class ExAutoSoulShot extends ServerPacket
{
private final int _itemId;
private final int _type;
- /**
- * @param itemId
- * @param type
- */
public ExAutoSoulShot(int itemId, int type)
{
_itemId = itemId;
@@ -35,11 +30,10 @@ public class ExAutoSoulShot implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_AUTO_SOULSHOT.writeId(packet);
- packet.writeD(_itemId);
- packet.writeD(_type);
- return true;
+ ServerPackets.EX_AUTO_SOULSHOT.writeId(this);
+ writeInt(_itemId);
+ writeInt(_type);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
index a8137347ec..d79813ff77 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index e0e136c3cf..c43891fde5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 =
@@ -96,14 +95,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
index d722c6677c..98723376a7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
@@ -16,18 +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 Gnat
**/
-public class ExBirthdayPopup implements IClientOutgoingPacket
+public class ExBirthdayPopup extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_NOTIFY_BIRTHDAY.writeId(packet);
- return true;
+ ServerPackets.EX_NOTIFY_BIRTHDAY.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
index 43e525f05f..5cc9fccc40 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
index c0683c8797..7312951925 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuyProduct.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuyProduct.java
index 2fa4aadae7..4810c672a4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuyProduct.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuyProduct.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 ExBrBuyProduct implements IClientOutgoingPacket
+public class ExBrBuyProduct extends ServerPacket
{
public static final int RESULT_OK = 1; // ok
public static final int RESULT_NOT_ENOUGH_POINTS = -1;
@@ -40,10 +39,9 @@ public class ExBrBuyProduct implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet);
- packet.writeD(_result);
- return true;
+ ServerPackets.EX_BR_BUY_PRODUCT.writeId(this);
+ writeInt(_result);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrExtraUserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrExtraUserInfo.java
index e139e97ffa..e72d8ceb3a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrExtraUserInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrExtraUserInfo.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;
/**
* ExBrExtraUserInfo server packet implementation.
* @author Kerberos, Zoey76
*/
-public class ExBrExtraUserInfo implements IClientOutgoingPacket
+public class ExBrExtraUserInfo extends ServerPacket
{
/** Player object ID. */
private final int _objectId;
@@ -41,12 +40,11 @@ public class ExBrExtraUserInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_EXTRA_USER_INFO.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_abnormalVisualEffectsEvent);
- packet.writeC(_lectureMark);
- return true;
+ ServerPackets.EX_BR_EXTRA_USER_INFO.writeId(this);
+ writeInt(_objectId);
+ writeInt(_abnormalVisualEffectsEvent);
+ writeByte(_lectureMark);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java
index 0a98444d1f..cbcbba168f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.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 Mobius
*/
-public class ExBrGamePoint implements IClientOutgoingPacket
+public class ExBrGamePoint extends ServerPacket
{
private final int _playerObj;
private long _points;
@@ -43,12 +42,11 @@ public class ExBrGamePoint implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_GAME_POINT.writeId(packet);
- packet.writeD(_playerObj);
- packet.writeQ(_points);
- packet.writeD(0);
- return true;
+ ServerPackets.EX_BR_GAME_POINT.writeId(this);
+ writeInt(_playerObj);
+ writeLong(_points);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
index 8e009d7b09..7d7e411170 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
index 80415ba802..814d8d1cfb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.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 ExBrPremiumState implements IClientOutgoingPacket
+public class ExBrPremiumState extends ServerPacket
{
private final int _objId;
private final int _state;
@@ -34,11 +33,10 @@ public class ExBrPremiumState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet);
- packet.writeD(_objId);
- packet.writeC(_state);
- return true;
+ ServerPackets.EX_BR_PREMIUM_STATE.writeId(this);
+ writeInt(_objId);
+ writeByte(_state);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java
index a46149782c..adeed63f31 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExBrProductInfo implements IClientOutgoingPacket
+public class ExBrProductInfo extends ServerPacket
{
private final PrimeShopProductHolder _product;
@@ -34,20 +33,20 @@ public class ExBrProductInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_product == null)
{
- return false;
+ return;
}
- OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet);
- packet.writeD(_product.getProductId()); // product id
- packet.writeD(_product.getPrice()); // points
- packet.writeD(1); // components size
- packet.writeD(_product.getItemId()); // item id
- packet.writeD(_product.getItemCount()); // quality
- packet.writeD(_product.getItemWeight()); // weight
- packet.writeD(_product.isTradable() ? 1 : 0); // 0 - dont drop/trade
- return true;
+
+ ServerPackets.EX_BR_PRODUCT_INFO.writeId(this);
+ writeInt(_product.getProductId()); // product id
+ writeInt(_product.getPrice()); // points
+ writeInt(1); // components size
+ writeInt(_product.getItemId()); // item id
+ writeInt(_product.getItemCount()); // quality
+ writeInt(_product.getItemWeight()); // weight
+ writeInt(_product.isTradable()); // 0 - dont drop/trade
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java
index fb52230b20..2e33103496 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java
@@ -18,62 +18,60 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExBrProductList implements IClientOutgoingPacket
+public class ExBrProductList extends ServerPacket
{
private final Collection _itemList = PrimeShopData.getInstance().getAllItems();
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet);
- packet.writeD(_itemList.size());
+ ServerPackets.EX_BR_PRODUCT_LIST.writeId(this);
+ writeInt(_itemList.size());
for (PrimeShopProductHolder product : _itemList)
{
final int category = product.getCategory();
- packet.writeD(product.getProductId()); // product id
- packet.writeH(category); // category id
- packet.writeD(product.getPrice()); // points
+ writeInt(product.getProductId()); // product id
+ writeShort(category); // category id
+ writeInt(product.getPrice()); // points
switch (category)
{
case 6:
{
- packet.writeD(1); // event
+ writeInt(1); // event
break;
}
case 7:
{
- packet.writeD(2); // best
+ writeInt(2); // best
break;
}
case 8:
{
- packet.writeD(3); // event & best
+ writeInt(3); // event & best
break;
}
default:
{
- packet.writeD(0); // normal
+ writeInt(0); // normal
break;
}
}
- packet.writeD(0); // start sale
- packet.writeD(0); // end sale
- packet.writeC(0); // day week
- packet.writeC(0); // start hour
- packet.writeC(0); // start min
- packet.writeC(0); // end hour
- packet.writeC(0); // end min
- packet.writeD(0); // current stock
- packet.writeD(0); // max stock
+ writeInt(0); // start sale
+ writeInt(0); // end sale
+ writeByte(0); // day week
+ writeByte(0); // start hour
+ writeByte(0); // start min
+ writeByte(0); // end hour
+ writeByte(0); // end min
+ writeInt(0); // current stock
+ writeInt(0); // max stock
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java
index b26db6216a..7bd49b98b2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java
@@ -23,17 +23,16 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Mobius
*/
-public class ExBrRecentProductList implements IClientOutgoingPacket
+public class ExBrRecentProductList extends ServerPacket
{
private final List _itemList = new ArrayList<>();
@@ -63,30 +62,30 @@ public class ExBrRecentProductList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_itemList.isEmpty())
{
- return false;
+ return;
}
- OutgoingPackets.EX_BR_RECENT_PRODUCT_LIST.writeId(packet);
- packet.writeD(_itemList.size());
+
+ ServerPackets.EX_BR_RECENT_PRODUCT_LIST.writeId(this);
+ writeInt(_itemList.size());
for (PrimeShopProductHolder product : _itemList)
{
- packet.writeD(product.getProductId());
- packet.writeH(product.getCategory());
- packet.writeD(product.getPrice());
- packet.writeD(0); // category
- packet.writeD(0); // start sale
- packet.writeD(0); // end sale
- packet.writeC(0); // day week
- packet.writeC(0); // start hour
- packet.writeC(0); // start min
- packet.writeC(0); // end hour
- packet.writeC(0); // end min
- packet.writeD(0); // current stock
- packet.writeD(0); // max stock
+ writeInt(product.getProductId());
+ writeShort(product.getCategory());
+ writeInt(product.getPrice());
+ writeInt(0); // category
+ writeInt(0); // start sale
+ writeInt(0); // end sale
+ writeByte(0); // day week
+ writeByte(0); // start hour
+ writeByte(0); // start min
+ writeByte(0); // end hour
+ writeByte(0); // end min
+ writeInt(0); // current stock
+ writeInt(0); // max stock
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
index fdebb1b064..4e48c1147b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
@@ -19,10 +19,9 @@ 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.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author ShanSoft
@@ -44,39 +43,38 @@ public class ExBuySellList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet);
- packet.writeD(1);
+ ServerPackets.EX_BUY_SELL_LIST.writeId(this);
+ writeInt(1);
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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCaptureOrc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCaptureOrc.java
index 5df44767e1..01ca8e4185 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCaptureOrc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCaptureOrc.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 ExCaptureOrc implements IClientOutgoingPacket
+public class ExCaptureOrc extends ServerPacket
{
private static final byte[] _test;
static
@@ -44,10 +43,9 @@ public class ExCaptureOrc implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SEARCH_ORC.writeId(packet);
- packet.writeB(_test);
- return true;
+ ServerPackets.EX_SEARCH_ORC.writeId(this);
+ writeBytes(_test);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
index 95fd54594e..4c4329792a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
index eea59162ee..064766b5a7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
index c8a2dea01f..bf8495fce0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index c442d9741b..41f0f07fa4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Elementals;
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 byte _atribute;
@@ -42,19 +41,18 @@ 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);
+ ServerPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(this);
+ writeInt(_itemId);
// Structure for now
// Must be 0x01 for stone/crystal attribute type
- packet.writeD(_atribute == Elementals.FIRE ? 1 : 0); // Fire
- packet.writeD(_atribute == Elementals.WATER ? 1 : 0); // Water
- packet.writeD(_atribute == Elementals.WIND ? 1 : 0); // Wind
- packet.writeD(_atribute == Elementals.EARTH ? 1 : 0); // Earth
- packet.writeD(_atribute == Elementals.HOLY ? 1 : 0); // Holy
- packet.writeD(_atribute == Elementals.DARK ? 1 : 0); // Unholy
- packet.writeD(_level); // Item max attribute level
- return true;
+ writeInt(_atribute == Elementals.FIRE); // Fire
+ writeInt(_atribute == Elementals.WATER); // Water
+ writeInt(_atribute == Elementals.WIND); // Wind
+ writeInt(_atribute == Elementals.EARTH); // Earth
+ writeInt(_atribute == Elementals.HOLY); // Holy
+ writeInt(_atribute == Elementals.DARK); // Unholy
+ writeInt(_level); // Item max attribute level
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
index b6105ec1f0..c1c925cf52 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
@@ -16,19 +16,17 @@
*/
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
{
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
index 11da236f70..9339994076 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
@@ -16,18 +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 Gnacik
*/
-public class ExClosePartyRoom implements IClientOutgoingPacket
+public class ExClosePartyRoom extends ServerPacket
{
@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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java
index 1d02c972b5..1f8d477597 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
index 5e2c21f67b..260f36b032 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CONFIRM_ADDING_POST_FRIEND.writeId(packet);
- packet.writeS(_charName);
- packet.writeD(_added ? 1 : 0);
- return true;
+ ServerPackets.EX_CONFIRM_ADDING_POST_FRIEND.writeId(this);
+ writeString(_charName);
+ writeInt(_added);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
index 9bd03b9aef..bbe9ec064a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
index 8f551e263b..3b71c99ef0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
index 82bd2919b5..3d7174a099 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
index 4739af9f53..13ef6c217c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
index ae864b02f2..5da77cbadb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
@@ -16,19 +16,17 @@
*/
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 ExCubeGameCloseUI implements IClientOutgoingPacket
+public class ExCubeGameCloseUI extends ServerPacket
{
@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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
index ec74b51ee3..fed76335aa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,11 +36,10 @@ 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);
- return true;
+ ServerPackets.EX_BLOCK_UP_SET_STATE.writeId(this);
+ writeInt(1);
+ writeInt(_isRedTeamWin);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
index 861b2db34f..fd0fc613d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
index 56877eea1b..fda81b64ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
index 81f6f22617..9367a8aa8c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.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;
/**
* Format: (chd)
* @author mrTJO
*/
-public class ExCubeGameRequestReady implements IClientOutgoingPacket
+public class ExCubeGameRequestReady extends ServerPacket
{
@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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
index f919881aae..7c5aa7410f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
index fafc52e4db..97f4ad6e6d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
@@ -18,13 +18,12 @@ 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;
/**
* @author -Wooden-
*/
-public class ExCursedWeaponList implements IClientOutgoingPacket
+public class ExCursedWeaponList extends ServerPacket
{
private final List _cursedWeaponIds;
@@ -34,14 +33,13 @@ public class ExCursedWeaponList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet);
- packet.writeD(_cursedWeaponIds.size());
+ ServerPackets.EX_CURSED_WEAPON_LIST.writeId(this);
+ writeInt(_cursedWeaponIds.size());
for (int i : _cursedWeaponIds)
{
- packet.writeD(i);
+ writeInt(i);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
index ce4b6eb68d..8d2a96fde5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,27 +35,26 @@ 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);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
}
- return true;
}
public static class CursedWeaponInfo
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarEnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarEnd.java
index 8f7725b9e1..26787ce7a5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarEnd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarEnd.java
@@ -16,19 +16,17 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Possibly trigger packet only, need to be verified.
* @author JIV
*/
-public class ExDominionWarEnd implements IClientOutgoingPacket
+public class ExDominionWarEnd extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DOMINION_WAR_END.writeId(packet);
- return true;
+ ServerPackets.EX_DOMINION_WAR_END.writeId(this);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java
index ed1e9403f7..15336c4180 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExDominionWarStart implements IClientOutgoingPacket
+public class ExDominionWarStart extends ServerPacket
{
private final int _objId;
private final int _terId;
@@ -38,14 +37,13 @@ public class ExDominionWarStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DOMINION_WAR_START.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(1); // ??
- packet.writeD(_terId);
- packet.writeD(_isDisguised ? 1 : 0);
- packet.writeD(_isDisguised ? _terId : 0);
- return true;
+ ServerPackets.EX_DOMINION_WAR_START.writeId(this);
+ writeInt(_objId);
+ writeInt(1); // ??
+ writeInt(_terId);
+ writeInt(_isDisguised);
+ writeInt(_isDisguised ? _terId : 0);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
index c731b7c7a9..ee3d16209a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
index abc0e13db9..e1cb56ffda 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
@@ -16,30 +16,28 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Duel End packet implementation.
* @author KenM, Zoey76
*/
-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;
private 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
index 46c2eca887..e9637ee21e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.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;
/**
* Duel Ready packet implementation.
* @author KenM, Zoey76
*/
-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);
@@ -36,10 +35,9 @@ public class ExDuelReady implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DUEL_READY.writeId(packet);
- packet.writeD(_partyDuel ? 1 : 0);
- return true;
+ ServerPackets.EX_DUEL_READY.writeId(this);
+ writeInt(_partyDuel);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
index ffdc236011..92c1f890ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.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;
/**
* Duel Start packet implementation.
* @author KenM, Zoey76
*/
-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);
@@ -36,10 +35,9 @@ public class ExDuelStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_DUEL_START.writeId(packet);
- packet.writeD(_partyDuel ? 1 : 0);
- return true;
+ ServerPackets.EX_DUEL_START.writeId(this);
+ writeInt(_partyDuel);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
index 5ed0c09675..d09ce0dcdd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
index fad1f28daf..c1bc8a1936 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
@@ -19,13 +19,12 @@ 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.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder;
import org.l2jmobius.gameserver.model.EnchantSkillLearn;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ExEnchantSkillInfo implements IClientOutgoingPacket
+public class ExEnchantSkillInfo extends ServerPacket
{
private final List _routes = new ArrayList<>(); // skill levels for each route
private final int _id;
@@ -76,18 +75,17 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet);
- packet.writeD(_id);
- packet.writeD(_level);
- packet.writeD(_maxEnchanted ? 0 : 1);
- packet.writeD(_level > 100 ? 1 : 0); // enchanted?
- packet.writeD(_routes.size());
+ ServerPackets.EX_ENCHANT_SKILL_INFO.writeId(this);
+ writeInt(_id);
+ writeInt(_level);
+ writeInt(!_maxEnchanted);
+ writeInt(_level > 100); // enchanted?
+ writeInt(_routes.size());
for (int level : _routes)
{
- packet.writeD(level);
+ writeInt(level);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
index 7c2fd38fab..047fba500c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.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.data.xml.EnchantSkillGroupsData;
import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder;
import org.l2jmobius.gameserver.model.EnchantSkillLearn;
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;
/**
* @author KenM
*/
-public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket
+public class ExEnchantSkillInfoDetail extends ServerPacket
{
private static final int TYPE_NORMAL_ENCHANT = 0;
private static final int TYPE_SAFE_ENCHANT = 1;
@@ -36,7 +35,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket
private static final int TYPE_CHANGE_ENCHANT = 3;
private int bookId = 0;
- private int reqCount = 0;
+ private boolean reqCount = false;
private int multi = 1;
private final int _type;
private final int _skillId;
@@ -88,25 +87,25 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket
case TYPE_NORMAL_ENCHANT:
{
bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK;
- reqCount = (((_skillLevel % 100) > 1) ? 0 : 1);
+ reqCount = (_skillLevel % 100) < 2;
break;
}
case TYPE_SAFE_ENCHANT:
{
bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK;
- reqCount = 1;
+ reqCount = true;
break;
}
case TYPE_UNTRAIN_ENCHANT:
{
bookId = EnchantSkillGroupsData.UNTRAIN_ENCHANT_BOOK;
- reqCount = 1;
+ reqCount = true;
break;
}
case TYPE_CHANGE_ENCHANT:
{
bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK;
- reqCount = 1;
+ reqCount = true;
break;
}
default:
@@ -116,24 +115,23 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket
}
if ((type != TYPE_SAFE_ENCHANT) && !Config.ES_SP_BOOK_NEEDED)
{
- reqCount = 0;
+ reqCount = false;
}
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet);
- packet.writeD(_type);
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- packet.writeD(_sp * multi); // sp
- packet.writeD(_chance); // exp
- packet.writeD(2); // items count?
- packet.writeD(Inventory.ADENA_ID); // Adena
- packet.writeD(_adenacount); // Adena count
- packet.writeD(bookId); // ItemId Required
- packet.writeD(reqCount);
- return true;
+ ServerPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(this);
+ writeInt(_type);
+ writeInt(_skillId);
+ writeInt(_skillLevel);
+ writeInt(_sp * multi); // sp
+ writeInt(_chance); // exp
+ writeInt(2); // items count?
+ writeInt(Inventory.ADENA_ID); // Adena
+ writeInt(_adenacount); // Adena count
+ writeInt(bookId); // ItemId Required
+ writeInt(reqCount);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
index 10088b7cf0..27d68aea65 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.EnchantSkillType;
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 EnchantSkillType _type;
private final List _skills = new LinkedList<>();
@@ -40,16 +39,15 @@ 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.writeD(skill.getLevel());
+ writeInt(skill.getId());
+ writeInt(skill.getLevel());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
index 8f15fd38c5..3071f89eac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
private static final ExEnchantSkillResult STATIC_PACKET_TRUE = new ExEnchantSkillResult(true);
private static final ExEnchantSkillResult STATIC_PACKET_FALSE = new ExEnchantSkillResult(false);
@@ -40,10 +39,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
index 410bf16510..3fce68a4b0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingEnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingEnd.java
index 9d3a873f43..aa82ec0527 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingEnd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingEnd.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.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class ExFishingEnd implements IClientOutgoingPacket
+public class ExFishingEnd extends ServerPacket
{
private final boolean _win;
private final Creature _creature;
@@ -36,11 +35,10 @@ public class ExFishingEnd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_FISHING_END.writeId(packet);
- packet.writeD(_creature.getObjectId());
- packet.writeC(_win ? 1 : 0);
- return true;
+ ServerPackets.EX_FISHING_END.writeId(this);
+ writeInt(_creature.getObjectId());
+ writeByte(_win);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java
index c9e712b700..44933c67f7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.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 -Wooden-
*/
-public class ExFishingHpRegen implements IClientOutgoingPacket
+public class ExFishingHpRegen extends ServerPacket
{
private final Creature _creature;
private final int _time;
@@ -47,17 +46,16 @@ public class ExFishingHpRegen implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_FISHING_HP_REGEN.writeId(packet);
- packet.writeD(_creature.getObjectId());
- packet.writeD(_time);
- packet.writeD(_fishHP);
- packet.writeC(_hpMode); // 0 = HP stop, 1 = HP raise
- packet.writeC(_goodUse); // 0 = none, 1 = success, 2 = failed
- packet.writeC(_anim); // Anim: 0 = none, 1 = reeling, 2 = pumping
- packet.writeD(_penalty); // Penalty
- packet.writeC(_hpBarColor); // 0 = normal hp bar, 1 = purple hp bar
- return true;
+ ServerPackets.EX_FISHING_HP_REGEN.writeId(this);
+ writeInt(_creature.getObjectId());
+ writeInt(_time);
+ writeInt(_fishHP);
+ writeByte(_hpMode); // 0 = HP stop, 1 = HP raise
+ writeByte(_goodUse); // 0 = none, 1 = success, 2 = failed
+ writeByte(_anim); // Anim: 0 = none, 1 = reeling, 2 = pumping
+ writeInt(_penalty); // Penalty
+ writeByte(_hpBarColor); // 0 = normal hp bar, 1 = purple hp bar
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java
index 5f25b56135..21ab7e9fd5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.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 -Wooden-
*/
-public class ExFishingStart implements IClientOutgoingPacket
+public class ExFishingStart extends ServerPacket
{
private final Creature _creature;
private final int _x;
@@ -43,16 +42,15 @@ public class ExFishingStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_FISHING_START.writeId(packet);
- packet.writeD(_creature.getObjectId());
- packet.writeD(_fishType); // fish type
- packet.writeD(_x); // x position
- packet.writeD(_y); // y position
- packet.writeD(_z); // z position
- packet.writeC(_isNightLure ? 1 : 0); // night lure
- packet.writeC(0); // show fish rank result button
- return true;
+ ServerPackets.EX_FISHING_START.writeId(this);
+ writeInt(_creature.getObjectId());
+ writeInt(_fishType); // fish type
+ writeInt(_x); // x position
+ writeInt(_y); // y position
+ writeInt(_z); // z position
+ writeByte(_isNightLure); // night lure
+ writeByte(0); // show fish rank result button
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java
index 2082ba98e6..6432a7ac0a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.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 -Wooden-
*/
-public class ExFishingStartCombat implements IClientOutgoingPacket
+public class ExFishingStartCombat extends ServerPacket
{
private final Creature _creature;
private final int _time;
@@ -43,15 +42,14 @@ public class ExFishingStartCombat implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_FISHING_START_COMBAT.writeId(packet);
- packet.writeD(_creature.getObjectId());
- packet.writeD(_time);
- packet.writeD(_hp);
- packet.writeC(_mode); // mode: 0 = resting, 1 = fighting
- packet.writeC(_lureType); // 0 = newbie lure, 1 = normal lure, 2 = night lure
- packet.writeC(_deceptiveMode); // Fish Deceptive Mode: 0 = no, 1 = yes
- return true;
+ ServerPackets.EX_FISHING_START_COMBAT.writeId(this);
+ writeInt(_creature.getObjectId());
+ writeInt(_time);
+ writeInt(_hp);
+ writeByte(_mode); // mode: 0 = resting, 1 = fighting
+ writeByte(_lureType); // 0 = newbie lure, 1 = normal lure, 2 = night lure
+ writeByte(_deceptiveMode); // Fish Deceptive Mode: 0 = no, 1 = yes
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
index 27c4bf08d9..f9a7b992d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_BOOKMARK_INFO.writeId(packet);
- packet.writeD(0); // Dummy
- packet.writeD(_player.getBookmarkSlot());
- packet.writeD(_player.getTeleportBookmarks().size());
+ ServerPackets.EX_GET_BOOKMARK_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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
index 201e8eb49b..7f5ae791b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
index 5a68a72f68..e9b96d3ebc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_AIRSHIP.writeId(packet);
- packet.writeD(_playerId);
- packet.writeD(_airShipId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.EX_GET_OFF_AIRSHIP.writeId(this);
+ writeInt(_playerId);
+ writeInt(_airShipId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
index 3e30858325..bc5da767d7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_AIRSHIP.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_AIRSHIP.writeId(this);
+ writeInt(_playerId);
+ writeInt(_airShipId);
+ writeInt(_pos.getX());
+ writeInt(_pos.getY());
+ writeInt(_pos.getZ());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
index 74485f3fe2..3d847b2f2e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
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;
@@ -36,20 +35,19 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet);
- packet.writeD(_player.getPremiumItemList().size());
+ ServerPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(this);
+ writeInt(_player.getPremiumItemList().size());
for (Entry entry : _player.getPremiumItemList().entrySet())
{
final PremiumItem item = entry.getValue();
- packet.writeD(entry.getKey());
- packet.writeD(_player.getObjectId());
- packet.writeD(item.getItemId());
- packet.writeQ(item.getCount());
- packet.writeD(0); // ?
- packet.writeS(item.getSender());
+ writeInt(entry.getKey());
+ writeInt(_player.getObjectId());
+ writeInt(item.getItemId());
+ writeLong(item.getCount());
+ writeInt(0); // ?
+ writeString(item.getSender());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
index 66d3004b9f..0ed4083131 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.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.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;
@@ -37,20 +36,19 @@ 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(hero.getInt(Hero.CLAN_CREST, 0));
- packet.writeS(hero.getString(Hero.ALLY_NAME, ""));
- packet.writeD(hero.getInt(Hero.ALLY_CREST, 0));
- packet.writeD(hero.getInt(Hero.COUNT));
+ writeString(hero.getString(Olympiad.CHAR_NAME));
+ writeInt(hero.getInt(Olympiad.CLASS_ID));
+ writeString(hero.getString(Hero.CLAN_NAME, ""));
+ writeInt(hero.getInt(Hero.CLAN_CREST, 0));
+ writeString(hero.getString(Hero.ALLY_NAME, ""));
+ writeInt(hero.getInt(Hero.ALLY_CREST, 0));
+ writeInt(hero.getInt(Hero.COUNT));
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
index 2bb41036c3..b8f5008465 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
index 760be71208..2b3f2ee47d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.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.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList;
-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 final Player _player;
// private final int _page;
@@ -47,15 +46,16 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet);
+ ServerPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(this);
if (_mode == 0)
{
- packet.writeD(0);
- packet.writeD(0);
- return true;
+ writeInt(0);
+ writeInt(0);
+ return;
}
+
for (Player cha : PartyMatchWaitingList.getInstance().getPlayers())
{
if ((cha == null) || (cha == _player))
@@ -73,14 +73,13 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket
}
_members.add(cha);
}
- packet.writeD(1); // Page?
- packet.writeD(_members.size());
+ writeInt(1); // Page?
+ writeInt(_members.size());
for (Player member : _members)
{
- packet.writeS(member.getName());
- packet.writeD(member.getActiveClass());
- packet.writeD(member.getLevel());
+ writeString(member.getName());
+ writeInt(member.getActiveClass());
+ writeInt(member.getLevel());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
index efbd946f7f..fcbef29b5b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_MPCC_PARTY_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_MPCC_PARTY_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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
index abbf8702c7..f9deafb7a4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_MPCC_SHOW_PARTY_MEMBER_INFO.writeId(packet);
- packet.writeD(_party.getMemberCount());
+ ServerPackets.EX_MPCC_SHOW_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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
index 1aaa5b6520..bb70c40aba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java
index 4667a50010..4f30d80f6f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Mode:
@@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*
* @author Gnacik
*/
-public class ExManagePartyRoomMember implements IClientOutgoingPacket
+public class ExManagePartyRoomMember extends ServerPacket
{
private final Player _player;
private final PartyMatchRoom _room;
@@ -44,30 +43,29 @@ public class ExManagePartyRoomMember implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet);
- packet.writeD(_mode);
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getName());
- packet.writeD(_player.getActiveClass());
- packet.writeD(_player.getLevel());
- packet.writeD(_room.getLocation());
+ ServerPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(this);
+ writeInt(_mode);
+ writeInt(_player.getObjectId());
+ writeString(_player.getName());
+ writeInt(_player.getActiveClass());
+ writeInt(_player.getLevel());
+ writeInt(_room.getLocation());
if (_room.getOwner().equals(_player))
{
- packet.writeD(1);
+ writeInt(1);
}
else
{
if ((_room.getOwner().isInParty() && _player.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == _player.getParty().getLeaderObjectId()))
{
- packet.writeD(2);
+ writeInt(2);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
index 59c138e215..d90dac1ad3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_AIRSHIP.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_AIRSHIP.writeId(this);
+ writeInt(_objId);
+ writeInt(_tx);
+ writeInt(_ty);
+ writeInt(_tz);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
index 64acdb4494..56891e5efb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_AIRSHIP.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_AIRSHIP.writeId(this);
+ writeInt(_objectId);
+ writeInt(_airShipId);
+ writeInt(_destination.getX());
+ writeInt(_destination.getY());
+ writeInt(_destination.getZ());
+ writeInt(_heading);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
index 2775a1ca79..e1a022ec83 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
@@ -34,23 +33,23 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_channel == null)
{
- return false;
+ return;
}
- 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
index f2a32bb6e8..e4a37f7234 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
index 56df634287..e28e3796bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_NAVIT_ADVENT_EFFECT.writeId(packet);
- packet.writeD(_timeLeft);
- return true;
+ ServerPackets.EX_NAVIT_ADVENT_EFFECT.writeId(this);
+ writeInt(_timeLeft);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
index 64a5b056ef..14ece2a8ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_NAVIT_ADVENT_POINT_INFO.writeId(packet);
- packet.writeD(_points); // 72 = 1%, max 7200 = 100%
- return true;
+ ServerPackets.EX_NAVIT_ADVENT_POINT_INFO.writeId(this);
+ writeInt(_points); // 72 = 1%, max 7200 = 100%
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
index 949e1ed934..81948fd909 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_NAVIT_ADVENT_TIME_CHANGE.writeId(packet);
+ ServerPackets.EX_NAVIT_ADVENT_TIME_CHANGE.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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
index f2ce8614dc..cb7d098b0b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
index 05f2a0c6cd..6804abf65d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_NOTICE_POST_SENT.writeId(packet);
- packet.writeD(_showAnim ? 1 : 0);
- return true;
+ ServerPackets.EX_NOTICE_POST_SENT.writeId(this);
+ writeInt(_showAnim);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
index e0bd08d39a..87c9a92b58 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
index 1db79859d8..9bb956941a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
index 9256ef6f70..87617c84e8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
@@ -19,19 +19,18 @@ 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.model.olympiad.OlympiadGameTeams;
-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<>();
@@ -53,39 +52,38 @@ 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 if (game instanceof OlympiadGameTeams)
{
- packet.writeD(-1);
+ writeInt(-1);
}
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
index fecab74e40..9ed7b36d86 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,36 +49,35 @@ 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());
+ writeString(info.getName());
+ writeString(info.getClanName());
+ writeInt(info.getClanId());
+ writeInt(info.getClassId());
+ writeInt(info.getDamage());
+ writeInt(info.getCurrentPoints());
+ writeInt(info.getDiffPoints());
}
- 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());
+ writeString(info.getName());
+ writeString(info.getClanName());
+ writeInt(info.getClanId());
+ writeInt(info.getClassId());
+ writeInt(info.getDamage());
+ writeInt(info.getCurrentPoints());
+ writeInt(info.getDiffPoints());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
index 712b9e06c6..734c56e2c7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
index 47ee283598..2f4f8cd0e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.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.actor.Player;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
-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<>();
@@ -43,20 +42,19 @@ 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());
+ ServerPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(this);
+ writeInt(_playerId);
+ writeInt(_effects.size());
for (BuffInfo info : _effects)
{
if ((info != null) && info.isInUse())
{
- packet.writeD(info.getSkill().getDisplayId());
- packet.writeH(info.getSkill().getDisplayLevel());
- packet.writeD(info.getTime());
+ writeInt(info.getSkill().getDisplayId());
+ writeShort(info.getSkill().getDisplayLevel());
+ writeInt(info.getTime());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
index 7c0eae6ce4..56954fbcd4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
index 7ec64cc8c3..7df8985714 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
index b9b16d3a56..4a363f2740 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.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 ExPCCafePointInfo implements IClientOutgoingPacket
+public class ExPCCafePointInfo extends ServerPacket
{
private final int _points;
private final int _mAddPoint;
@@ -52,15 +51,14 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PC_CAFE_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_PC_CAFE_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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCMyRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCMyRecord.java
index 4d91ac620a..4874a05208 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCMyRecord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CC_MY_RECORD.writeId(packet);
- packet.writeD(_points);
- return true;
+ ServerPackets.EX_PVP_MATCH_CC_MY_RECORD.writeId(this);
+ writeInt(_points);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java
index f45a50dba4..9136dfd870 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CC_RECORD.writeId(packet);
- packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish
- packet.writeD(Math.min(_players.size(), 25));
+ ServerPackets.EX_PVP_MATCH_CC_RECORD.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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
index c58ae4505e..c844645d31 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,19 +32,18 @@ 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.writeD(_summon.getSummonType());
- packet.writeD(_summon.getOwner().getObjectId());
- packet.writeS(_summon.getName());
- packet.writeD((int) _summon.getCurrentHp());
- packet.writeD(_summon.getMaxHp());
- packet.writeD((int) _summon.getCurrentMp());
- packet.writeD(_summon.getMaxMp());
- packet.writeD(_summon.getLevel());
- return true;
+ ServerPackets.EX_PARTY_PET_WINDOW_ADD.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+ writeInt(_summon.getSummonType());
+ writeInt(_summon.getOwner().getObjectId());
+ writeString(_summon.getName());
+ writeInt((int) _summon.getCurrentHp());
+ writeInt(_summon.getMaxHp());
+ writeInt((int) _summon.getCurrentMp());
+ writeInt(_summon.getMaxMp());
+ writeInt(_summon.getLevel());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
index 35f3ee8870..a2b5005be5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.writeD(_summon.getOwner().getObjectId());
- packet.writeS(_summon.getName());
- return true;
+ ServerPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getOwner().getObjectId());
+ writeString(_summon.getName());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
index 7aca5b18a7..b9ee133415 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,19 +32,18 @@ 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.writeD(_summon.getSummonType());
- packet.writeD(_summon.getOwner().getObjectId());
- packet.writeS(_summon.getName());
- packet.writeD((int) _summon.getCurrentHp());
- packet.writeD(_summon.getMaxHp());
- packet.writeD((int) _summon.getCurrentMp());
- packet.writeD(_summon.getMaxMp());
- packet.writeD(_summon.getLevel());
- return true;
+ ServerPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(this);
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+ writeInt(_summon.getSummonType());
+ writeInt(_summon.getOwner().getObjectId());
+ writeString(_summon.getName());
+ writeInt((int) _summon.getCurrentHp());
+ writeInt(_summon.getMaxHp());
+ writeInt((int) _summon.getCurrentMp());
+ writeInt(_summon.getMaxMp());
+ writeInt(_summon.getLevel());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
index be2726b328..defaf3b47e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.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.partymatching.PartyMatchRoom;
-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 PartyMatchRoom _room;
private final int _mode;
@@ -36,35 +35,34 @@ public class ExPartyRoomMember implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet);
- packet.writeD(_mode);
- packet.writeD(_room.getMembers());
+ ServerPackets.EX_PARTY_ROOM_MEMBER.writeId(this);
+ writeInt(_mode);
+ writeInt(_room.getMembers());
for (Player member : _room.getPartyMembers())
{
- packet.writeD(member.getObjectId());
- packet.writeS(member.getName());
- packet.writeD(member.getActiveClass());
- packet.writeD(member.getLevel());
- packet.writeD(_room.getLocation());
+ writeInt(member.getObjectId());
+ writeString(member.getName());
+ writeInt(member.getActiveClass());
+ writeInt(member.getLevel());
+ writeInt(_room.getLocation());
if (_room.getOwner().equals(member))
{
- packet.writeD(1);
+ writeInt(1);
}
else
{
if ((_room.getOwner().isInParty() && member.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId()))
{
- packet.writeD(2);
+ writeInt(2);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
}
- packet.writeD(0); // TODO: Instance datas there is more if that is not 0!
+ writeInt(0); // TODO: Instance datas there is more if that is not 0!
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
index 0f72c05a3a..c91d6f0dba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
index b4b54a6315..bd06d6b2f8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
/**
* @author -Wooden-
*/
-public class ExPledgeEmblem implements IClientOutgoingPacket
+public class ExPledgeEmblem extends ServerPacket
{
private final int _crestId;
private final byte[] _data;
@@ -43,20 +42,19 @@ public class ExPledgeEmblem implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet);
- packet.writeD(0);
- packet.writeD(_crestId);
+ ServerPackets.EX_PLEDGE_EMBLEM.writeId(this);
+ writeInt(0);
+ 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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
index 1a987f8616..61bbb36944 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_PACKAGE_MSG.writeId(packet);
- packet.writeD(_objectId);
- packet.writeS(_msg);
- return true;
+ ServerPackets.EX_PRIVATE_STORE_PACKAGE_MSG.writeId(this);
+ writeInt(_objectId);
+ writeString(_msg);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
index 1d54157b43..3536e5c2f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -39,15 +38,14 @@ 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.writeD(_unk1);
- packet.writeD(_unk2);
- packet.writeD(_unk3);
- return true;
+ ServerPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(this);
+ writeInt(_gemstoneObjId);
+ writeInt(_itemId);
+ writeLong(_gemstoneCount);
+ writeInt(_unk1);
+ writeInt(_unk2);
+ writeInt(_unk3);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
index 6bbd36fb7a..38b16a221d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -35,10 +34,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
index 7a96f302c8..0d9ce47861 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -35,10 +34,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
index b88b1b2d3f..f5ead79038 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
index 2313d5fb46..74dd897fe4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
index c25dd16b01..99a97e6814 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
index c4d27d1728..06b34779a7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
@@ -45,15 +44,14 @@ public class ExQuestItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet);
- packet.writeH(_items.size());
+ ServerPackets.EX_QUEST_ITEM_LIST.writeId(this);
+ writeShort(_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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
index 91beb93c6c..1319e6f4e1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
@@ -19,13 +19,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
-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 _npcs = new ArrayList<>();
@@ -46,18 +45,17 @@ 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(_npcs.size());
+ ServerPackets.EX_QUEST_NPC_LOG_LIST.writeId(this);
+ writeInt(_questId);
+ writeByte(_npcs.size());
for (NpcHolder holder : _npcs)
{
- packet.writeD((holder.getNpcId() + 1000000));
- packet.writeC(holder.getUnknown());
- packet.writeD(holder.getCount());
+ writeInt((holder.getNpcId() + 1000000));
+ writeByte(holder.getUnknown());
+ writeInt(holder.getCount());
}
- return true;
}
private class NpcHolder
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
index 60616b256d..76405e1965 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
index 163faff855..ee8756cdee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyDominionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyDominionInfo.java
index bd7a3c2149..6fd591fece 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyDominionInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyDominionInfo.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.CastleManager;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager.Territory;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author JIV
*/
-public class ExReplyDominionInfo implements IClientOutgoingPacket
+public class ExReplyDominionInfo extends ServerPacket
{
public static final ExReplyDominionInfo STATIC_PACKET = new ExReplyDominionInfo();
@@ -36,23 +35,22 @@ public class ExReplyDominionInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_DOMINION_INFO.writeId(packet);
+ ServerPackets.EX_REPLY_DOMINION_INFO.writeId(this);
final List territoryList = TerritoryWarManager.getInstance().getAllTerritories();
- packet.writeD(territoryList.size()); // Territory Count
+ writeInt(territoryList.size()); // Territory Count
for (Territory t : territoryList)
{
- packet.writeD(t.getTerritoryId()); // Territory Id
- packet.writeS(CastleManager.getInstance().getCastleById(t.getCastleId()).getName().toLowerCase() + "_dominion"); // territory name
- packet.writeS(t.getOwnerClan().getName());
- packet.writeD(t.getOwnedWardIds().size()); // Emblem Count
+ writeInt(t.getTerritoryId()); // Territory Id
+ writeString(CastleManager.getInstance().getCastleById(t.getCastleId()).getName().toLowerCase() + "_dominion"); // territory name
+ writeString(t.getOwnerClan().getName());
+ writeInt(t.getOwnedWardIds().size()); // Emblem Count
for (int i : t.getOwnedWardIds())
{
- packet.writeD(i); // Emblem ID - should be in for loop for emblem count
+ writeInt(i); // Emblem ID - should be in for loop for emblem count
}
- packet.writeD((int) (TerritoryWarManager.getInstance().getTWStartTimeInMillis() / 1000));
+ writeInt((int) (TerritoryWarManager.getInstance().getTWStartTimeInMillis() / 1000));
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
index d2f27b9074..b2101309c7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
@@ -38,14 +37,13 @@ public class ExReplyPostItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet);
- packet.writeD(_itemList.size());
+ ServerPackets.EX_REPLY_POST_ITEM_LIST.writeId(this);
+ writeInt(_itemList.size());
for (Item item : _itemList)
{
- writeItem(packet, item);
+ writeItem(item);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
index 04fe99aeb9..56d1beee9a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.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.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;
/**
* @author Migi, DS
@@ -51,31 +50,30 @@ public class ExReplyReceivedPost extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet);
- 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());
+ ServerPackets.EX_REPLY_RECEIVED_POST.writeId(this);
+ 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.getSendBySystem());
- return true;
+ writeLong(_msg.getReqAdena());
+ writeInt(_msg.hasAttachments());
+ writeInt(_msg.getSendBySystem());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
index 0afc1a6dd6..ec394cbe73 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.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.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;
/**
* ExReplySentPost packet implementation.
@@ -52,30 +51,29 @@ public class ExReplySentPost extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet);
- 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(_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());
}
- packet.writeQ(_msg.getReqAdena());
- packet.writeD(_msg.getSendBySystem());
+ writeLong(_msg.getReqAdena());
+ writeInt(_msg.getSendBySystem());
}
else
{
- packet.writeD(0);
- packet.writeQ(_msg.getReqAdena());
+ writeInt(0);
+ writeLong(_msg.getReqAdena());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
index 05a98deddc..6ffb470d57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 _itemObjectId;
@@ -32,10 +31,9 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_REQUEST_CHANGE_NICKNAME_COLOR.writeId(packet);
- packet.writeD(_itemObjectId);
- return true;
+ ServerPackets.EX_REQUEST_CHANGE_NICKNAME_COLOR.writeId(this);
+ writeInt(_itemObjectId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
index 60201b177f..c1520c1a84 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 1a46ff3b2e..3eeec6cfb6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java
index a230033d67..8ef6ef5750 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
index 4369ddd3ab..f3b3900220 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
@@ -16,14 +16,13 @@
*/
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
*/
-public class ExRpItemLink implements IClientOutgoingPacket
+public class ExRpItemLink extends ServerPacket
{
private final Item _item;
@@ -33,40 +32,39 @@ public class ExRpItemLink implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet);
- packet.writeD(_item.getObjectId());
- packet.writeD(_item.getDisplayId());
- packet.writeD(_item.getLocationSlot());
- packet.writeQ(_item.getCount());
- packet.writeH(_item.getTemplate().getType2());
- packet.writeH(_item.getCustomType1());
- packet.writeH(_item.isEquipped() ? 1 : 0);
- packet.writeD(_item.getTemplate().getBodyPart());
- packet.writeH(_item.getEnchantLevel());
- packet.writeH(_item.getCustomType2());
+ ServerPackets.EX_RP_ITEM_LINK.writeId(this);
+ writeInt(_item.getObjectId());
+ writeInt(_item.getDisplayId());
+ writeInt(_item.getLocationSlot());
+ writeLong(_item.getCount());
+ writeShort(_item.getTemplate().getType2());
+ writeShort(_item.getCustomType1());
+ writeShort(_item.isEquipped());
+ writeInt(_item.getTemplate().getBodyPart());
+ writeShort(_item.getEnchantLevel());
+ writeShort(_item.getCustomType2());
if (_item.isAugmented())
{
- packet.writeD(_item.getAugmentation().getAugmentationId());
+ writeInt(_item.getAugmentation().getAugmentationId());
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(_item.getMana());
- packet.writeD(_item.isTimeLimitedItem() ? (int) (_item.getRemainingTime() / 1000) : -9999);
- packet.writeH(_item.getAttackElementType());
- packet.writeH(_item.getAttackElementPower());
+ writeInt(_item.getMana());
+ writeInt(_item.isTimeLimitedItem() ? (int) (_item.getRemainingTime() / 1000) : -9999);
+ writeShort(_item.getAttackElementType());
+ writeShort(_item.getAttackElementPower());
for (byte i = 0; i < 6; i++)
{
- packet.writeH(_item.getElementDefAttr(i));
+ writeShort(_item.getElementDefAttr(i));
}
// Enchant Effects
for (int op : _item.getEnchantOptions())
{
- packet.writeH(op);
+ writeShort(op);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
index 761104f91b..d427974beb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
index 59b6379871..4634fee1f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
@@ -19,28 +19,26 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Comparator;
import java.util.List;
-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
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final List castles = CastleManager.getInstance().getCastles();
castles.sort(Comparator.comparing(Castle::getResidenceId));
- OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet);
- packet.writeD(castles.size());
+ ServerPackets.EX_SEND_MANOR_LIST.writeId(this);
+ writeInt(castles.size());
for (Castle castle : castles)
{
- packet.writeD(castle.getResidenceId());
- packet.writeS(castle.getName().toLowerCase());
+ writeInt(castle.getResidenceId());
+ writeString(castle.getName().toLowerCase());
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
index 4ce4b27720..f0da28a867 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
private final int _objectId;
private final boolean _type;
@@ -82,27 +81,26 @@ public class ExSendUIEvent implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SEND_UI_EVENT.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_type ? 1 : 0); // 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(_countUp ? "1" : "0"); // 0 = count down, 1 = count up
+ ServerPackets.EX_SEND_UI_EVENT.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(_countUp ? "1" : "0"); // 0 = count down, 1 = count up
// timer always disappears 10 seconds before end
- packet.writeS(String.valueOf(_startTime / 60));
- packet.writeS(String.valueOf(_startTime % 60));
- packet.writeS(String.valueOf(_endTime / 60));
- packet.writeS(String.valueOf(_endTime % 60));
- packet.writeD(_npcstringId);
+ writeString(String.valueOf(_startTime / 60));
+ writeString(String.valueOf(_startTime % 60));
+ writeString(String.valueOf(_endTime / 60));
+ writeString(String.valueOf(_endTime % 60));
+ writeInt(_npcstringId);
if (_params != null)
{
for (String param : _params)
{
- packet.writeS(param);
+ writeString(param);
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 3778d7e57c..9cd8bcfd53 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 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;
@@ -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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
index 9ddf763c24..d648769802 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
public static final int ALTEREDZONE = 0x08;
public static final int SIEGEWARZONE1 = 0x0A;
@@ -40,10 +39,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
index 34dee8bda0..33516c7ac2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
index 4e491af9d1..73c7868428 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
index 0722db1826..f7e00da521 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
@@ -18,30 +18,28 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Map;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanHallTable;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.residences.AuctionableHall;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExShowAgitInfo implements IClientOutgoingPacket
+public class ExShowAgitInfo extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet);
+ ServerPackets.EX_SHOW_AGIT_INFO.writeId(this);
final Map clannhalls = ClanHallTable.getInstance().getAllAuctionableClanHalls();
- packet.writeD(clannhalls.size());
+ writeInt(clannhalls.size());
for (AuctionableHall ch : clannhalls.values())
{
- packet.writeD(ch.getId());
- packet.writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getName()); // owner clan name
- packet.writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getLeaderName()); // leader name
- packet.writeD(ch.getGrade() > 0 ? 0 : 1); // 0 - auction 1 - war clanhall 2 - ETC (rainbow spring clanhall)
+ writeInt(ch.getId());
+ writeString(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getName()); // owner clan name
+ writeString(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getLeaderName()); // leader name
+ writeInt(ch.getGrade() < 1); // 0 - auction 1 - war clanhall 2 - ETC (rainbow spring clanhall)
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
index 0c814d7ff9..78395ce885 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.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.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Weapon;
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 Collection- _items;
private long _price;
@@ -35,16 +34,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
index 1a110025a6..23fa135423 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
@@ -18,46 +18,44 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExShowCastleInfo implements IClientOutgoingPacket
+public class ExShowCastleInfo extends ServerPacket
{
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet);
+ ServerPackets.EX_SHOW_CASTLE_INFO.writeId(this);
final List 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());
- packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000));
+ writeInt(castle.getTaxPercent());
+ writeInt((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000));
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
index 0ca7cb3b21..8e30ece1a6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,14 +34,13 @@ 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());
+ ServerPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(this);
+ writeInt(_contacts.size());
for (String name : _contacts)
{
- packet.writeS(name);
+ writeString(name);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
index 9d90f816d1..08c9780296 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,43 +41,43 @@ 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(0);
- return true;
+ writeInt(0);
+ return;
}
- 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
index 992ab59eb8..5762d89564 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,55 +58,54 @@ 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
CropProcure cp;
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()))
{
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()))
{
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java
index aef4b2bc2b..a6fadc8571 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java
@@ -18,25 +18,24 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager.Territory;
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;
/**
* @author GodKratos
*/
-public class ExShowDominionRegistry implements IClientOutgoingPacket
+public class ExShowDominionRegistry extends ServerPacket
{
private static final int MINID = 80;
private final int _castleId;
- private int _clanReq = 0x00;
- private int _mercReq = 0x00;
- private int _isMercRegistered = 0x00;
- private int _isClanRegistered = 0x00;
+ private int _clanReq = 0;
+ private int _mercReq = 0;
+ private boolean _isMercRegistered = false;
+ private boolean _isClanRegistered = false;
private int _warTime = (int) (System.currentTimeMillis() / 1000);
private final int _currentTime = (int) (System.currentTimeMillis() / 1000);
@@ -48,28 +47,28 @@ public class ExShowDominionRegistry implements IClientOutgoingPacket
_clanReq = TerritoryWarManager.getInstance().getRegisteredClans(castleId).size();
if (player.getClan() != null)
{
- _isClanRegistered = (TerritoryWarManager.getInstance().getRegisteredClans(castleId).contains(player.getClan()) ? 1 : 0);
+ _isClanRegistered = (TerritoryWarManager.getInstance().getRegisteredClans(castleId).contains(player.getClan()));
}
}
if (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId) != null)
{
_mercReq = TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).size();
- _isMercRegistered = (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).contains(player.getObjectId()) ? 1 : 0);
+ _isMercRegistered = (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).contains(player.getObjectId()));
}
_warTime = (int) (TerritoryWarManager.getInstance().getTWStartTimeInMillis() / 1000);
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_DOMINION_REGISTRY.writeId(packet);
- packet.writeD(MINID + _castleId); // Current Territory Id
+ ServerPackets.EX_SHOW_DOMINION_REGISTRY.writeId(this);
+ writeInt(MINID + _castleId); // Current Territory Id
if (TerritoryWarManager.getInstance().getTerritory(_castleId) == null)
{
// something is wrong
- packet.writeS("No Owner"); // Owners Clan
- packet.writeS("No Owner"); // Owner Clan Leader
- packet.writeS("No Ally"); // Owner Alliance
+ writeString("No Owner"); // Owners Clan
+ writeString("No Owner"); // Owner Clan Leader
+ writeString("No Ally"); // Owner Alliance
}
else
{
@@ -77,35 +76,34 @@ public class ExShowDominionRegistry implements IClientOutgoingPacket
if (clan == null)
{
// something is wrong
- packet.writeS("No Owner"); // Owners Clan
- packet.writeS("No Owner"); // Owner Clan Leader
- packet.writeS("No Ally"); // Owner Alliance
+ writeString("No Owner"); // Owners Clan
+ writeString("No Owner"); // Owner Clan Leader
+ writeString("No Ally"); // Owner Alliance
}
else
{
- packet.writeS(clan.getName()); // Owners Clan
- packet.writeS(clan.getLeaderName()); // Owner Clan Leader
- packet.writeS(clan.getAllyName()); // Owner Alliance
+ writeString(clan.getName()); // Owners Clan
+ writeString(clan.getLeaderName()); // Owner Clan Leader
+ writeString(clan.getAllyName()); // Owner Alliance
}
}
- packet.writeD(_clanReq); // Clan Request
- packet.writeD(_mercReq); // Merc Request
- packet.writeD(_warTime); // War Time
- packet.writeD(_currentTime); // Current Time
- packet.writeD(_isClanRegistered); // is Cancel clan registration
- packet.writeD(_isMercRegistered); // is Cancel mercenaries registration
- packet.writeD(1); // unknown
+ writeInt(_clanReq); // Clan Request
+ writeInt(_mercReq); // Merc Request
+ writeInt(_warTime); // War Time
+ writeInt(_currentTime); // Current Time
+ writeInt(_isClanRegistered); // is Cancel clan registration
+ writeInt(_isMercRegistered); // is Cancel mercenaries registration
+ writeInt(1); // unknown
final List territoryList = TerritoryWarManager.getInstance().getAllTerritories();
- packet.writeD(territoryList.size()); // Territory Count
+ writeInt(territoryList.size()); // Territory Count
for (Territory t : territoryList)
{
- packet.writeD(t.getTerritoryId()); // Territory Id
- packet.writeD(t.getOwnedWardIds().size()); // Emblem Count
+ writeInt(t.getTerritoryId()); // Territory Id
+ writeInt(t.getOwnedWardIds().size()); // Emblem Count
for (int i : t.getOwnedWardIds())
{
- packet.writeD(i); // Emblem ID - should be in for loop for emblem count
+ writeInt(i); // Emblem ID - should be in for loop for emblem count
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
index 2d5cdb4a7e..f7274a96e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.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.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 List 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
index b6200b96f3..49b4176bb4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.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.Spawn;
import org.l2jmobius.gameserver.model.siege.Fort;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author KenM
*/
-public class ExShowFortressMapInfo implements IClientOutgoingPacket
+public class ExShowFortressMapInfo extends ServerPacket
{
private final Fort _fortress;
@@ -38,12 +37,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())
{
@@ -55,11 +54,11 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket
{
if (isSpawned(spawn.getId()))
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
- packet.writeD(1);
+ writeInt(1);
}
}
break;
@@ -72,15 +71,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;
@@ -91,10 +90,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
index ffff6ce908..2dab6849ed 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.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.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;
/**
* @author KenM
*/
-public class ExShowFortressSiegeInfo implements IClientOutgoingPacket
+public class ExShowFortressSiegeInfo extends ServerPacket
{
private final int _fortId;
private final int _size;
@@ -47,11 +46,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)
@@ -62,22 +61,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;
}
}
@@ -87,30 +86,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;
}
}
@@ -122,9 +121,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
index 912839e242..2cdf16e4d9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java
index 1b2940db30..e9d05c4840 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.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.TerritoryWarManager;
import org.l2jmobius.gameserver.model.TerritoryWard;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Gigiikun-
*/
-public class ExShowOwnthingPos implements IClientOutgoingPacket
+public class ExShowOwnthingPos extends ServerPacket
{
public static final ExShowOwnthingPos STATIC_PACKET = new ExShowOwnthingPos();
@@ -35,40 +34,39 @@ public class ExShowOwnthingPos implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_OWNTHING_POS.writeId(packet);
+ ServerPackets.EX_SHOW_OWNTHING_POS.writeId(this);
if (TerritoryWarManager.getInstance().isTWInProgress())
{
final Collection territoryWardList = TerritoryWarManager.getInstance().getAllTerritoryWards();
- packet.writeD(territoryWardList.size());
+ writeInt(territoryWardList.size());
for (TerritoryWard ward : territoryWardList)
{
- packet.writeD(ward.getTerritoryId());
+ writeInt(ward.getTerritoryId());
if (ward.getNpc() != null)
{
- packet.writeD(ward.getNpc().getX());
- packet.writeD(ward.getNpc().getY());
- packet.writeD(ward.getNpc().getZ());
+ writeInt(ward.getNpc().getX());
+ writeInt(ward.getNpc().getY());
+ writeInt(ward.getNpc().getZ());
}
else if (ward.getPlayer() != null)
{
- packet.writeD(ward.getPlayer().getX());
- packet.writeD(ward.getPlayer().getY());
- packet.writeD(ward.getPlayer().getZ());
+ writeInt(ward.getPlayer().getX());
+ writeInt(ward.getPlayer().getY());
+ writeInt(ward.getPlayer().getZ());
}
else
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
index d03ce2a5fd..f36f439c60 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
index f41999329f..ccb14b50df 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
index 93eebbf908..b718c21df5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -32,10 +31,9 @@ public class ExShowQuestMark implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet);
- packet.writeD(_questId);
- return true;
+ ServerPackets.EX_SHOW_QUEST_MARK.writeId(this);
+ writeInt(_questId);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
index 5922e9376c..de3fc6254f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.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 ExShowReceivedPostList implements IClientOutgoingPacket
+public class ExShowReceivedPostList extends ServerPacket
{
private final List _inbox;
@@ -36,32 +35,31 @@ 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.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(1);
- packet.writeD(msg.hasAttachments() ? 1 : 0);
- packet.writeD(msg.isReturned() ? 1 : 0);
- packet.writeD(msg.getSendBySystem());
- packet.writeD(0);
+ writeInt(msg.getId());
+ writeString(msg.getSubject());
+ writeString(msg.getSenderName());
+ writeInt(msg.isLocked());
+ writeInt(msg.getExpirationSeconds());
+ writeInt(msg.isUnread());
+ writeInt(1);
+ writeInt(msg.hasAttachments());
+ writeInt(msg.isReturned());
+ writeInt(msg.getSendBySystem());
+ writeInt(0);
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
index 5e069233af..dbf9b84457 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -235,9 +234,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)
{
@@ -249,19 +248,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;
}
}
}
@@ -273,45 +272,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
index 6123b08991..f2d741b2df 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
index 5a3ea4211f..99c1e5615b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.SoDManager;
import org.l2jmobius.gameserver.instancemanager.SoIManager;
import org.l2jmobius.gameserver.model.Location;
-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();
@@ -37,29 +36,28 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet);
- packet.writeD(ENTRANCES.length);
+ ServerPackets.EX_SHOW_SEED_MAP_INFO.writeId(this);
+ writeInt(ENTRANCES.length);
for (Location loc : ENTRANCES)
{
- packet.writeD(loc.getX());
- packet.writeD(loc.getY());
- packet.writeD(loc.getZ());
+ writeInt(loc.getX());
+ writeInt(loc.getY());
+ writeInt(loc.getZ());
switch (loc.getHeading())
{
case 1: // Seed of Destruction
{
- packet.writeD(2770 + SoDManager.getInstance().getSoDState());
+ writeInt(2770 + SoDManager.getInstance().getSoDState());
break;
}
case 2: // Seed of Immortality
{
- packet.writeD(SoIManager.getCurrentStage() + 2765);
+ writeInt(SoIManager.getCurrentStage() + 2765);
break;
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
index 44a1cbea69..e8257305bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,51 +58,50 @@ 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
SeedProduction sp;
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()))
{
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()))
{
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
index 269bec5b97..59911bba04 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
index 31057e9afe..3b57b4e61f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,29 +35,28 @@ 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);
+ writeInt(msg.getId());
+ writeString(msg.getSubject());
+ writeString(msg.getReceiverName());
+ writeInt(msg.isLocked());
+ writeInt(msg.getExpirationSeconds());
+ writeInt(msg.isUnread());
+ writeInt(1);
+ writeInt(msg.hasAttachments());
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
index 0dca57f2f8..e5fa2eba8d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
index 86e1009bbf..608b6f0239 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
index 1f1a14c31b..86b1f3430f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
index 9870424e26..cb9a0a91d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
index 86211c8d97..68b41a8c87 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
index 534549b4fe..b04b0e9337 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
index dbaa596aa1..8859544226 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_AIRSHIP.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- return true;
+ ServerPackets.EX_STOP_MOVE_AIRSHIP.writeId(this);
+ writeInt(_objectId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
index 59e83f5107..4dda08c6bf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.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;
/**
* 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;
@@ -44,15 +43,14 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_STOP_MOVE_IN_AIRSHIP.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(_shipObjId);
- packet.writeD(x);
- packet.writeD(y);
- packet.writeD(z);
- packet.writeD(h);
- return true;
+ ServerPackets.EX_STOP_MOVE_IN_AIRSHIP.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_shipObjId);
+ writeInt(x);
+ writeInt(y);
+ writeInt(z);
+ writeInt(h);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
index e43eea2904..8d6c562744 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 final int _inventory;
private final int _warehouse;
@@ -51,18 +50,17 @@ public class ExStorageMaxCount implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet);
- packet.writeD(_inventory);
- packet.writeD(_warehouse);
- 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);
- return true;
+ ServerPackets.EX_STORAGE_MAX_COUNT.writeId(this);
+ writeInt(_inventory);
+ writeInt(_warehouse);
+ writeInt(_clan);
+ writeInt(_privateSell);
+ writeInt(_privateBuy);
+ writeInt(_receipeD);
+ writeInt(_recipe);
+ writeInt(_inventoryExtraSlots); // Belt inventory slots increase count
+ writeInt(_inventoryQuestItems);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
index 43427c7e4b..e220d7c54c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_PLEDGE_SKILL_ADD.writeId(packet);
- packet.writeD(_type);
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- return true;
+ ServerPackets.EX_SUB_PLEDGE_SKILL_ADD.writeId(this);
+ writeInt(_type);
+ writeInt(_skillId);
+ writeInt(_skillLevel);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java
index 405b32c3fb..084864ecbe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.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.ActionKey;
import org.l2jmobius.gameserver.model.UIKeysSettings;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author mrTJO
*/
-public class ExUISetting implements IClientOutgoingPacket
+public class ExUISetting extends ServerPacket
{
private final UIKeysSettings _uiSettings;
private int buffsize;
@@ -72,64 +71,63 @@ public class ExUISetting implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_UI_SETTING.writeId(packet);
- packet.writeD(buffsize);
- packet.writeD(categories);
+ ServerPackets.EX_UI_SETTING.writeId(this);
+ writeInt(buffsize);
+ writeInt(categories);
int category = 0;
final int numKeyCt = _uiSettings.getKeys().size();
- packet.writeD(numKeyCt);
+ writeInt(numKeyCt);
for (int i = 0; i < numKeyCt; i++)
{
if (_uiSettings.getCategories().containsKey(category))
{
final List catElList1 = _uiSettings.getCategories().get(category);
- packet.writeC(catElList1.size());
+ writeByte(catElList1.size());
for (int cmd : catElList1)
{
- packet.writeC(cmd);
+ writeByte(cmd);
}
}
else
{
- packet.writeC(0);
+ writeByte(0);
}
category++;
if (_uiSettings.getCategories().containsKey(category))
{
final List catElList2 = _uiSettings.getCategories().get(category);
- packet.writeC(catElList2.size());
+ writeByte(catElList2.size());
for (int cmd : catElList2)
{
- packet.writeC(cmd);
+ writeByte(cmd);
}
}
else
{
- packet.writeC(0);
+ writeByte(0);
}
category++;
if (_uiSettings.getKeys().containsKey(i))
{
final List keyElList = _uiSettings.getKeys().get(i);
- packet.writeD(keyElList.size());
+ writeInt(keyElList.size());
for (ActionKey akey : keyElList)
{
- packet.writeD(akey.getCommandId());
- packet.writeD(akey.getKeyId());
- packet.writeD(akey.getToogleKey1());
- packet.writeD(akey.getToogleKey2());
- packet.writeD(akey.getShowStatus());
+ writeInt(akey.getCommandId());
+ writeInt(akey.getKeyId());
+ writeInt(akey.getToogleKey1());
+ writeInt(akey.getToogleKey2());
+ writeInt(akey.getShowStatus());
}
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
}
- packet.writeD(0x11);
- packet.writeD(16);
- return true;
+ writeInt(0x11);
+ writeInt(16);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
index e59c651371..3b47dc4f03 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
index 1da7753d60..bbc2d9afb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.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;
/**
* 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;
@@ -44,15 +43,14 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIRSHIP.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD(shipId);
- packet.writeD(x);
- packet.writeD(y);
- packet.writeD(z);
- packet.writeD(h);
- return true;
+ ServerPackets.EX_VALIDATE_LOCATION_IN_AIRSHIP.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(shipId);
+ writeInt(x);
+ writeInt(y);
+ writeInt(z);
+ writeInt(h);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
index be624ab2be..5ec53b8eb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
private final int _result;
@@ -29,10 +28,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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
index 42d24fad34..d194763108 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.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;
/**
* Format: (ch)ddd
*/
-public class ExVariationResult implements IClientOutgoingPacket
+public class ExVariationResult extends ServerPacket
{
private final int _stat12;
private final int _stat34;
@@ -36,12 +35,11 @@ public class ExVariationResult implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_VARIATION_RESULT.writeId(packet);
- packet.writeD(_stat12);
- packet.writeD(_stat34);
- packet.writeD(_unk3);
- return true;
+ ServerPackets.EX_VARIATION_RESULT.writeId(this);
+ writeInt(_stat12);
+ writeInt(_stat34);
+ writeInt(_unk3);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
index 9a401c2321..a369035786 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
index eba57b1adb..3ae57f0221 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index 475ba76f28..d333166e7e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
@@ -24,12 +23,12 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.FakePlayerHolder;
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;
@@ -52,6 +51,8 @@ public class FakePlayerInfo implements IClientOutgoingPacket
public FakePlayerInfo(Npc npc)
{
+ super(256);
+
_npc = npc;
_objId = npc.getObjectId();
_x = npc.getX();
@@ -73,119 +74,118 @@ public class FakePlayerInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHAR_INFO.writeId(packet);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(0); // vehicleId
- packet.writeD(_objId);
- packet.writeS(_npc.getName());
- packet.writeD(_npc.getRace().ordinal());
- packet.writeD(_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());
- packet.writeD(0); // Inventory.PAPERDOLL_RBRACELET
- packet.writeD(0); // Inventory.PAPERDOLL_LBRACELET
- packet.writeD(0); // Inventory.PAPERDOLL_DECO1
- packet.writeD(0); // Inventory.PAPERDOLL_DECO2
- packet.writeD(0); // Inventory.PAPERDOLL_DECO3
- packet.writeD(0); // Inventory.PAPERDOLL_DECO4
- packet.writeD(0); // Inventory.PAPERDOLL_DECO5
- packet.writeD(0); // Inventory.PAPERDOLL_DECO6
- packet.writeD(0); // Inventory.PAPERDOLL_BELT
+ ServerPackets.CHAR_INFO.writeId(this);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(0); // vehicleId
+ writeInt(_objId);
+ writeString(_npc.getName());
+ writeInt(_npc.getRace().ordinal());
+ writeInt(_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());
+ writeInt(0); // Inventory.PAPERDOLL_RBRACELET
+ writeInt(0); // Inventory.PAPERDOLL_LBRACELET
+ writeInt(0); // Inventory.PAPERDOLL_DECO1
+ writeInt(0); // Inventory.PAPERDOLL_DECO2
+ writeInt(0); // Inventory.PAPERDOLL_DECO3
+ writeInt(0); // Inventory.PAPERDOLL_DECO4
+ writeInt(0); // Inventory.PAPERDOLL_DECO5
+ writeInt(0); // Inventory.PAPERDOLL_DECO6
+ writeInt(0); // Inventory.PAPERDOLL_BELT
for (int i = 0; i < 21; i++)
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(0); // getTalismanSlots
- packet.writeD(1); // canEquipCloak
- packet.writeD(_npc.getScriptValue()); // getPvpFlag()
- packet.writeD(_npc.getKarma());
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- packet.writeD(0); // ?
- 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(_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());
+ writeInt(0); // getTalismanSlots
+ writeInt(1); // canEquipCloak
+ writeInt(_npc.getScriptValue()); // getPvpFlag()
+ writeInt(_npc.getKarma());
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeInt(0); // ?
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_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() (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); // isInPartyMatchRoom
- packet.writeD(_npc.getAbnormalVisualEffects());
- packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0);
- packet.writeH(_fpcHolder.getRecommends()); // Blue value for name (0 = white, 255 = pure blue)
- 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.writeD(_fpcHolder.getPledgeStatus());
- packet.writeD(0); // getPledgeType()
- packet.writeD(_fpcHolder.getTitleColor());
- packet.writeD(0); // isCursedWeaponEquipped
- packet.writeD(0); // getClanId() > 0 ? getClan().getReputationScore() : 0
+ writeByte(0); // isInPartyMatchRoom
+ writeInt(_npc.getAbnormalVisualEffects());
+ writeByte(_npc.isInsideZone(ZoneId.WATER));
+ writeShort(_fpcHolder.getRecommends()); // Blue value for name (0 = white, 255 = pure blue)
+ 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);
+ writeInt(_fpcHolder.getPledgeStatus());
+ writeInt(0); // getPledgeType()
+ writeInt(_fpcHolder.getTitleColor());
+ writeInt(0); // isCursedWeaponEquipped
+ writeInt(0); // getClanId() > 0 ? getClan().getReputationScore() : 0
// T1
- packet.writeD(0); // getTransformationDisplayId()
- packet.writeD(_fpcHolder.getAgathionId());
+ writeInt(0); // getTransformationDisplayId()
+ writeInt(_fpcHolder.getAgathionId());
// T2
- packet.writeD(1);
+ writeInt(1);
// T2.3
- packet.writeD(_npc.getAbnormalVisualEffectSpecial());
- return true;
+ writeInt(_npc.getAbnormalVisualEffectSpecial());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
index a5415d396c..4d4d1078e5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -58,17 +57,16 @@ 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());
- 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());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
index 4d9654a4af..29ee3f3b35 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.writeS(_requestorName);
- packet.writeD(0);
- return true;
+ ServerPackets.FRIEND_ADD_REQUEST.writeId(this);
+ writeString(_requestorName);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java
index cfca3fd549..773d7f2e1b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.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.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;
/**
* Support for "Chat with Friends" dialog.
* This packet is sent only at login.
* @author Tempy
*/
-public class FriendList implements IClientOutgoingPacket
+public class FriendList extends ServerPacket
{
private final List _info;
@@ -65,17 +64,16 @@ public class FriendList 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
+ writeInt(info._objId); // character id
+ writeString(info._name);
+ writeInt(info._online); // online
+ writeInt(info._online ? info._objId : 0); // object id if online
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java
index 2a6c90febd..405a571bf2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java
@@ -23,18 +23,17 @@ import java.util.ArrayList;
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;
/**
* Support for "Chat with Friends" dialog.
* This packet is sent only at login.
* @author mrTJO, UnAfraid
*/
-public class FriendListExtended implements IClientOutgoingPacket
+public class FriendListExtended extends ServerPacket
{
private final List _info;
@@ -97,19 +96,18 @@ public class FriendListExtended 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendPacket.java
index 2a433d94af..590cb0a665 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendPacket.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
/**
* Support for "Chat with Friends" dialog.
* Add new friend or delete.
* @author JIV
*/
-public class FriendPacket implements IClientOutgoingPacket
+public class FriendPacket extends ServerPacket
{
private final boolean _action;
private final boolean _online;
@@ -46,14 +45,13 @@ public class FriendPacket 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendStatusPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendStatusPacket.java
index 345929b1f8..34d63082a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendStatusPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendStatusPacket.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
/**
* Support for "Chat with Friends" dialog.
* Inform player about friend online status change
* @author JIV
*/
-public class FriendStatusPacket implements IClientOutgoingPacket
+public class FriendStatusPacket extends ServerPacket
{
private final boolean _online;
private final int _objid;
@@ -40,12 +39,11 @@ public class FriendStatusPacket implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.L2_FRIEND_STATUS.writeId(packet);
- packet.writeD(_online ? 1 : 0);
- packet.writeS(_name);
- packet.writeD(_objid);
- return true;
+ ServerPackets.L2_FRIEND_STATUS.writeId(this);
+ writeInt(_online);
+ writeString(_name);
+ writeInt(_objid);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
index 95b2857ac8..fb1727bd34 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.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.item.Henna;
-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<>();
@@ -46,22 +45,21 @@ public class GMHennaInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_HENNA_INFO.writeId(packet);
- packet.writeC(_player.getHennaStatINT()); // equip INT
- packet.writeC(_player.getHennaStatSTR()); // equip STR
- packet.writeC(_player.getHennaStatCON()); // equip CON
- packet.writeC(_player.getHennaStatMEN()); // equip MEN
- packet.writeC(_player.getHennaStatDEX()); // equip DEX
- packet.writeC(_player.getHennaStatWIT()); // equip WIT
- packet.writeD(3); // Slots
- packet.writeD(_hennas.size()); // Size
+ ServerPackets.GM_HENNA_INFO.writeId(this);
+ writeByte(_player.getHennaStatINT()); // equip INT
+ writeByte(_player.getHennaStatSTR()); // equip STR
+ writeByte(_player.getHennaStatCON()); // equip CON
+ writeByte(_player.getHennaStatMEN()); // equip MEN
+ writeByte(_player.getHennaStatDEX()); // equip DEX
+ writeByte(_player.getHennaStatWIT()); // equip WIT
+ writeInt(3); // Slots
+ writeInt(_hennas.size()); // Size
for (Henna henna : _hennas)
{
- packet.writeD(henna.getDyeId());
- packet.writeD(1);
+ writeInt(henna.getDyeId());
+ writeInt(1);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java
index 59bf0d9d93..a1b8556c8f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
index d5351e99ba..5fd251bc97 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.ExperienceData;
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;
@@ -45,108 +44,107 @@ 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(_player.getMaxHp());
- packet.writeD((int) _player.getCurrentHp());
- packet.writeD(_player.getMaxMp());
- packet.writeD((int) _player.getCurrentMp());
- packet.writeD((int) _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(_player.getMaxHp());
+ writeInt((int) _player.getCurrentHp());
+ writeInt(_player.getMaxMp());
+ writeInt((int) _player.getCurrentMp());
+ writeInt((int) _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 : getPaperdollOrder())
{
- packet.writeD(_player.getInventory().getPaperdollAugmentationId(slot));
+ writeInt(_player.getInventory().getPaperdollAugmentationId(slot));
}
- packet.writeD(_player.getInventory().getTalismanSlots()); // CT2.3
- packet.writeD(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3
- packet.writeD((int) _player.getPAtk(null));
- packet.writeD((int) _player.getPAtkSpd());
- packet.writeD((int) _player.getPDef(null));
- packet.writeD(_player.getEvasionRate(null));
- packet.writeD(_player.getAccuracy());
- packet.writeD(_player.getCriticalHit(null, null));
- packet.writeD((int) _player.getMAtk(null, null));
- packet.writeD(_player.getMAtkSpd());
- packet.writeD((int) _player.getPAtkSpd());
- packet.writeD((int) _player.getMDef(null, null));
- packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name
- packet.writeD(_player.getKarma());
- 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());
+ writeInt(_player.getInventory().getTalismanSlots()); // CT2.3
+ writeInt(_player.getInventory().canEquipCloak()); // CT2.3
+ writeInt((int) _player.getPAtk(null));
+ writeInt((int) _player.getPAtkSpd());
+ writeInt((int) _player.getPDef(null));
+ writeInt(_player.getEvasionRate(null));
+ writeInt(_player.getAccuracy());
+ writeInt(_player.getCriticalHit(null, null));
+ writeInt((int) _player.getMAtk(null, null));
+ writeInt(_player.getMAtkSpd());
+ writeInt((int) _player.getPAtkSpd());
+ writeInt((int) _player.getMDef(null, null));
+ writeInt(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name
+ writeInt(_player.getKarma());
+ 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 byte attackAttribute = _player.getAttackElement();
- packet.writeH(attackAttribute);
- packet.writeH(_player.getAttackElementValue(attackAttribute));
+ writeShort(attackAttribute);
+ writeShort(_player.getAttackElementValue(attackAttribute));
for (byte i = 0; i < 6; i++)
{
- packet.writeH(_player.getDefenseElementValue(i));
+ writeShort(_player.getDefenseElementValue(i));
}
- packet.writeD(_player.getFame());
- packet.writeD(_player.getVitalityPoints());
- return true;
+ writeInt(_player.getFame());
+ writeInt(_player.getVitalityPoints());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
index 41f151be6f..1ddbd84e87 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
@@ -52,17 +51,16 @@ public class GMViewItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet);
- packet.writeS(_playerName);
- packet.writeD(_limit); // inventory limit
- packet.writeH(1); // show window ??
- packet.writeH(_items.size());
+ ServerPackets.GM_VIEW_ITEM_LIST.writeId(this);
+ writeString(_playerName);
+ writeInt(_limit); // inventory limit
+ writeShort(1); // show window ??
+ writeShort(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
+ writeItem(item);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
index fb1dc32aec..211f39092f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,42 +33,41 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet);
- 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(_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().length);
+ ServerPackets.GM_VIEW_PLEDGE_INFO.writeId(this);
+ 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(_clan.getAllyId()); // c2
+ writeString(_clan.getAllyName()); // c2
+ writeInt(_clan.getAllyCrestId()); // c2
+ writeInt(_clan.isAtWar()); // c3
+ writeInt(0); // T3 Unknown
+ writeInt(_clan.getMembers().length);
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
index dbb8844755..e0f8d7a453 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.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.data.xml.SkillData;
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;
@@ -36,20 +35,19 @@ 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) : false;
for (Skill skill : _skills)
{
- packet.writeD(skill.isPassive() ? 1 : 0);
- packet.writeD(skill.getDisplayLevel());
- packet.writeD(skill.getDisplayId());
- packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0);
- packet.writeC(SkillData.getInstance().isEnchantable(skill.getDisplayId()) ? 1 : 0);
+ writeInt(skill.isPassive());
+ writeInt(skill.getDisplayLevel());
+ writeInt(skill.getDisplayId());
+ writeByte(isDisabled && skill.isClanSkill());
+ writeByte(SkillData.getInstance().isEnchantable(skill.getDisplayId()));
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
index c14caa76e0..5ae6b73620 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
@@ -45,17 +44,16 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet);
- packet.writeS(_playerName);
- packet.writeQ(_money);
- packet.writeH(_items.size());
+ ServerPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(this);
+ writeString(_playerName);
+ writeLong(_money);
+ writeShort(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
index 449271993b..1fb55b8874 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java
index 037b2e6b6b..b95d15eb8a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
index 5f4d7bf3ca..f6ec7ea5c0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
index 77d1e6ba28..ad424462b9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
index 5b0c45dfff..38681950c7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -37,30 +36,30 @@ 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());
+ ServerPackets.GM_VIEW_QUEST_INFO.writeId(this);
+ writeString(_player.getName());
final List questList = _player.getAllActiveQuests();
if (questList.isEmpty())
{
- packet.writeC(0);
- packet.writeH(0);
- packet.writeH(0);
- return true;
+ writeByte(0);
+ writeShort(0);
+ writeShort(0);
+ return;
}
- packet.writeH(questList.size()); // quest count
+
+ writeShort(questList.size()); // quest count
for (Quest q : questList)
{
- packet.writeD(q.getId());
+ writeInt(q.getId());
final QuestState qs = _player.getQuestState(q.getName());
if (qs == null)
{
- packet.writeD(0);
+ writeInt(0);
continue;
}
- packet.writeD(qs.getCond()); // stage of quest progress
+ writeInt(qs.getCond()); // stage of quest progress
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
index 0b7edbbd7f..35e5bf3cf9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,25 +44,24 @@ 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
+ 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
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
index 94e4bd1530..005ca4440b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.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.item.Henna;
-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<>();
@@ -46,22 +45,21 @@ public class HennaInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.HENNA_INFO.writeId(packet);
- packet.writeC(_player.getHennaStatINT()); // equip INT
- packet.writeC(_player.getHennaStatSTR()); // equip STR
- packet.writeC(_player.getHennaStatCON()); // equip CON
- packet.writeC(_player.getHennaStatMEN()); // equip MEN
- packet.writeC(_player.getHennaStatDEX()); // equip DEX
- packet.writeC(_player.getHennaStatWIT()); // equip WIT
- packet.writeD(3); // Slots
- packet.writeD(_hennas.size()); // Size
+ ServerPackets.HENNA_INFO.writeId(this);
+ writeByte(_player.getHennaStatINT()); // equip INT
+ writeByte(_player.getHennaStatSTR()); // equip STR
+ writeByte(_player.getHennaStatCON()); // equip CON
+ writeByte(_player.getHennaStatMEN()); // equip MEN
+ writeByte(_player.getHennaStatDEX()); // equip DEX
+ writeByte(_player.getHennaStatWIT()); // equip WIT
+ writeInt(3); // Slots
+ writeInt(_hennas.size()); // Size
for (Henna henna : _hennas)
{
- packet.writeD(henna.getDyeId());
- packet.writeD(1);
+ writeInt(henna.getDyeId());
+ writeInt(1);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
index 96723d8e59..cf1484a290 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.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 HennaItemDrawInfo implements IClientOutgoingPacket
+public class HennaItemDrawInfo extends ServerPacket
{
private final Player _player;
private final Henna _henna;
@@ -36,27 +35,26 @@ 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.writeC(_player.getINT() + _henna.getStatINT()); // equip INT
- packet.writeD(_player.getSTR()); // current STR
- packet.writeC(_player.getSTR() + _henna.getStatSTR()); // equip STR
- packet.writeD(_player.getCON()); // current CON
- packet.writeC(_player.getCON() + _henna.getStatCON()); // equip CON
- packet.writeD(_player.getMEN()); // current MEN
- packet.writeC(_player.getMEN() + _henna.getStatMEN()); // equip MEN
- packet.writeD(_player.getDEX()); // current DEX
- packet.writeC(_player.getDEX() + _henna.getStatDEX()); // equip DEX
- packet.writeD(_player.getWIT()); // current WIT
- packet.writeC(_player.getWIT() + _henna.getStatWIT()); // equip WIT
- 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
+ writeByte(_player.getINT() + _henna.getStatINT()); // equip INT
+ writeInt(_player.getSTR()); // current STR
+ writeByte(_player.getSTR() + _henna.getStatSTR()); // equip STR
+ writeInt(_player.getCON()); // current CON
+ writeByte(_player.getCON() + _henna.getStatCON()); // equip CON
+ writeInt(_player.getMEN()); // current MEN
+ writeByte(_player.getMEN() + _henna.getStatMEN()); // equip MEN
+ writeInt(_player.getDEX()); // current DEX
+ writeByte(_player.getDEX() + _henna.getStatDEX()); // equip DEX
+ writeInt(_player.getWIT()); // current WIT
+ writeByte(_player.getWIT() + _henna.getStatWIT()); // equip WIT
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
index d98b9295e0..4aa2593c4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.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 HennaItemRemoveInfo implements IClientOutgoingPacket
+public class HennaItemRemoveInfo extends ServerPacket
{
private final Player _player;
private final Henna _henna;
@@ -36,27 +35,26 @@ 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.writeC(_player.getINT() - _henna.getStatINT()); // equip INT
- packet.writeD(_player.getSTR()); // current STR
- packet.writeC(_player.getSTR() - _henna.getStatSTR()); // equip STR
- packet.writeD(_player.getCON()); // current CON
- packet.writeC(_player.getCON() - _henna.getStatCON()); // equip CON
- packet.writeD(_player.getMEN()); // current MEN
- packet.writeC(_player.getMEN() - _henna.getStatMEN()); // equip MEN
- packet.writeD(_player.getDEX()); // current DEX
- packet.writeC(_player.getDEX() - _henna.getStatDEX()); // equip DEX
- packet.writeD(_player.getWIT()); // current WIT
- packet.writeC(_player.getWIT() - _henna.getStatWIT()); // equip WIT
- 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
+ writeByte(_player.getINT() - _henna.getStatINT()); // equip INT
+ writeInt(_player.getSTR()); // current STR
+ writeByte(_player.getSTR() - _henna.getStatSTR()); // equip STR
+ writeInt(_player.getCON()); // current CON
+ writeByte(_player.getCON() - _henna.getStatCON()); // equip CON
+ writeInt(_player.getMEN()); // current MEN
+ writeByte(_player.getMEN() - _henna.getStatMEN()); // equip MEN
+ writeInt(_player.getDEX()); // current DEX
+ writeByte(_player.getDEX() - _henna.getStatDEX()); // equip DEX
+ writeInt(_player.getWIT()); // current WIT
+ writeByte(_player.getWIT() - _henna.getStatWIT()); // equip WIT
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
index 921240fbbf..f42941efce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,25 +33,24 @@ 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(0);
- packet.writeD(3 - _player.getHennaEmptySlots());
+ ServerPackets.HENNA_UNEQUIP_LIST.writeId(this);
+ writeLong(_player.getAdena());
+ writeInt(0);
+ writeInt(3 - _player.getHennaEmptySlots());
for (Henna henna : _player.getHennaList())
{
if (henna != null)
{
- packet.writeD(henna.getDyeId());
- packet.writeD(henna.getDyeItemId());
- packet.writeD(henna.getCancelCount());
- packet.writeD(0);
- packet.writeD(henna.getCancelFee());
- packet.writeD(0);
- packet.writeD(1);
+ writeInt(henna.getDyeId());
+ writeInt(henna.getDyeItemId());
+ writeInt(henna.getCancelCount());
+ writeInt(0);
+ writeInt(henna.getCancelFee());
+ writeInt(0);
+ writeInt(1);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
index 3378827f34..1f349f8bf9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java
index 7372d89f23..27328eea0c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,21 +43,20 @@ public class ItemList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ITEM_LIST.writeId(packet);
- packet.writeH(_showWindow ? 1 : 0);
- packet.writeH(_items.size());
+ ServerPackets.ITEM_LIST.writeId(this);
+ writeShort(_showWindow);
+ writeShort(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
+ writeItem(item);
}
- writeInventoryBlock(packet, _player.getInventory());
- return true;
+ writeInventoryBlock(_player.getInventory());
}
@Override
- public void runImpl(Player player)
+ public void run(Player player)
{
player.sendPacket(new ExQuestItemList(_player));
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java
index a21bd14e0a..2828ea0e3d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.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 JoinParty implements IClientOutgoingPacket
+public class JoinParty extends ServerPacket
{
private final int _response;
@@ -32,10 +31,9 @@ public class JoinParty implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.JOIN_PARTY.writeId(packet);
- packet.writeD(_response);
- return true;
+ ServerPackets.JOIN_PARTY.writeId(this);
+ writeInt(_response);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
index f347f7efcd..240003b4ad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
index aa15a065c2..7d9e07830b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,18 +31,17 @@ 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
- return true;
+ writeInt(Config.PACKET_ENCRYPTION); // use blowfish encryption
+ writeInt(Config.SERVER_ID); // server id
+ writeByte(1);
+ writeInt(0); // obfuscation key
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
index 62424fd03a..6dffae77c8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
index 14eb7fbe10..4efda950e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java
index 9d23424aad..3ec35522b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.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.partymatching.PartyMatchRoom;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class ListPartyWating implements IClientOutgoingPacket
+public class ListPartyWating extends ServerPacket
{
private final Player _player;
private final int _loc;
@@ -44,7 +43,7 @@ public class ListPartyWating implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
for (PartyMatchRoom room : PartyMatchRoomList.getInstance().getRooms())
{
@@ -64,40 +63,39 @@ public class ListPartyWating implements IClientOutgoingPacket
_rooms.add(room);
}
final int size = _rooms.size();
- OutgoingPackets.LIST_PARTY_WAITING.writeId(packet);
+ ServerPackets.LIST_PARTY_WAITING.writeId(this);
if (size > 0)
{
- packet.writeD(1);
+ writeInt(1);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(_rooms.size());
+ writeInt(_rooms.size());
for (PartyMatchRoom 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.getOwner().getName());
- packet.writeD(room.getMembers());
+ writeInt(room.getId());
+ writeString(room.getTitle());
+ writeInt(room.getLocation());
+ writeInt(room.getMinLevel());
+ writeInt(room.getMaxLevel());
+ writeInt(room.getMaxMembers());
+ writeString(room.getOwner().getName());
+ writeInt(room.getMembers());
for (Player member : room.getPartyMembers())
{
if (member != null)
{
- packet.writeD(member.getClassId().getId());
- packet.writeS(member.getName());
+ writeInt(member.getClassId().getId());
+ writeString(member.getName());
}
else
{
- packet.writeD(0);
- packet.writeS("Not Found");
+ writeInt(0);
+ writeString("Not Found");
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java
index f76dfc9530..2432636253 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -44,10 +43,9 @@ public class LoginFail implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.LOGIN_FAIL.writeId(packet);
- packet.writeD(_reason);
- return true;
+ ServerPackets.LOGIN_FAIL.writeId(this);
+ writeInt(_reason);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceled.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceled.java
index 0985562155..74fe8044b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceled.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceled.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 MagicSkillCanceled implements IClientOutgoingPacket
+public class MagicSkillCanceled extends ServerPacket
{
private final int _objectId;
@@ -29,10 +28,9 @@ public class MagicSkillCanceled 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 5f5448f0e6..18fc581125 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -20,16 +20,15 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-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;
/**
* MagicSkillLaunched server packet implementation.
* @author UnAfraid
*/
-public class MagicSkillLaunched implements IClientOutgoingPacket
+public class MagicSkillLaunched extends ServerPacket
{
private final int _objectId;
private final int _skillId;
@@ -55,17 +54,16 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- packet.writeD(_targets.size());
+ ServerPackets.MAGIC_SKILL_LAUNCHED.writeId(this);
+ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
index 6c6929d34c..13302daf57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
@@ -20,17 +20,16 @@ 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.actor.Creature;
import org.l2jmobius.gameserver.model.interfaces.IPositionable;
-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;
@@ -43,6 +42,7 @@ public class MagicSkillUse implements IClientOutgoingPacket
public MagicSkillUse(Creature creature, Creature target, int skillId, int skillLevel, int hitTime, int reuseDelay)
{
+ super(55);
_creature = creature;
_target = target;
_skillId = skillId;
@@ -58,33 +58,32 @@ public class MagicSkillUse implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_SKILL_USE.writeId(packet);
- packet.writeD(_creature.getObjectId());
- packet.writeD(_target.getObjectId());
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- packet.writeD(_hitTime);
- 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(_creature.getObjectId());
+ writeInt(_target.getObjectId());
+ writeInt(_skillId);
+ writeInt(_skillLevel);
+ writeInt(_hitTime);
+ 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());
- return true;
+ writeInt(_target.getX());
+ writeInt(_target.getY());
+ writeInt(_target.getZ());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
index ae8e5cda63..64da6c0359 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,15 +33,14 @@ public class ManagePledgePower implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_action == 1)
{
- OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(_clan.getRankPrivs(_rank).getBitmask());
+ ServerPackets.MANAGE_PLEDGE_POWER.writeId(this);
+ writeInt(0);
+ writeInt(0);
+ writeInt(_clan.getRankPrivs(_rank).getBitmask());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
index 0f547e86a1..55d2cdb8e5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,39 +38,38 @@ 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);
}
}
- packet.writeD(0);
- packet.writeD(0); // CT2.3 special effect
+ writeInt(0);
+ writeInt(0); // CT2.3 special effect
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
index e6386921ff..f2587795b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
index 59103c6c4c..69654c8613 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
index 07fe545ed6..c257d0040b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.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 MoveToPawn implements IClientOutgoingPacket
+public class MoveToPawn extends ServerPacket
{
private final int _objectId;
private final int _targetId;
@@ -46,18 +45,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index da3d9160de..cd582025d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -18,13 +18,12 @@ 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.model.multisell.Entry;
import org.l2jmobius.gameserver.model.multisell.Ingredient;
import org.l2jmobius.gameserver.model.multisell.ListContainer;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class MultiSellList implements IClientOutgoingPacket
+public class MultiSellList extends ServerPacket
{
private int _size;
private int _index;
@@ -48,112 +47,111 @@ public class MultiSellList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MULTI_SELL_LIST.writeId(packet);
- packet.writeD(_list.getListId()); // list id
- 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
+ ServerPackets.MULTI_SELL_LIST.writeId(this);
+ writeInt(_list.getListId()); // list id
+ writeInt(1 + (_index / PAGE_SIZE)); // page started from 1
+ writeInt(_finished); // finished
+ writeInt(PAGE_SIZE); // size of pages
+ writeInt(_size); // list length
Entry ent;
while (_size-- > 0)
{
ent = _list.getEntries().get(_index++);
- packet.writeD(ent.getEntryId());
- packet.writeC(ent.isStackable() ? 1 : 0);
- packet.writeH(0); // C6
- packet.writeD(0); // C6
- packet.writeD(0); // T1
- packet.writeH(65534); // T1
- packet.writeH(0); // T1
- packet.writeH(0); // T1
- packet.writeH(0); // T1
- packet.writeH(0); // T1
- packet.writeH(0); // T1
- packet.writeH(0); // T1
- packet.writeH(0); // T1
- packet.writeH(ent.getProducts().size());
- packet.writeH(ent.getIngredients().size());
+ writeInt(ent.getEntryId());
+ writeByte(ent.isStackable());
+ writeShort(0); // C6
+ writeInt(0); // C6
+ writeInt(0); // T1
+ writeShort(65534); // T1
+ writeShort(0); // T1
+ writeShort(0); // T1
+ writeShort(0); // T1
+ writeShort(0); // T1
+ writeShort(0); // T1
+ writeShort(0); // T1
+ writeShort(0); // T1
+ writeShort(ent.getProducts().size());
+ writeShort(ent.getIngredients().size());
for (Ingredient ing : ent.getProducts())
{
if (ing.getTemplate() != null)
{
- packet.writeD(ing.getTemplate().getDisplayId());
- packet.writeD(ing.getTemplate().getBodyPart());
- packet.writeH(ing.getTemplate().getType2());
+ writeInt(ing.getTemplate().getDisplayId());
+ writeInt(ing.getTemplate().getBodyPart());
+ writeShort(ing.getTemplate().getType2());
}
else
{
- packet.writeD(ing.getItemId());
- packet.writeD(0);
- packet.writeH(65535);
+ writeInt(ing.getItemId());
+ writeInt(0);
+ writeShort(65535);
}
- packet.writeQ(ing.getItemCount());
+ writeLong(ing.getItemCount());
if (ing.getItemInfo() != null)
{
- packet.writeH(ing.getItemInfo().getEnchantLevel()); // enchant level
- packet.writeD(ing.getItemInfo().getAugmentId()); // augment id
- packet.writeD(0); // mana
- packet.writeH(ing.getItemInfo().getElementId()); // attack element
- packet.writeH(ing.getItemInfo().getElementPower()); // element power
- packet.writeH(ing.getItemInfo().getElementals()[0]); // fire
- packet.writeH(ing.getItemInfo().getElementals()[1]); // water
- packet.writeH(ing.getItemInfo().getElementals()[2]); // wind
- packet.writeH(ing.getItemInfo().getElementals()[3]); // earth
- packet.writeH(ing.getItemInfo().getElementals()[4]); // holy
- packet.writeH(ing.getItemInfo().getElementals()[5]); // dark
+ writeShort(ing.getItemInfo().getEnchantLevel()); // enchant level
+ writeInt(ing.getItemInfo().getAugmentId()); // augment id
+ writeInt(0); // mana
+ writeShort(ing.getItemInfo().getElementId()); // attack element
+ writeShort(ing.getItemInfo().getElementPower()); // element power
+ writeShort(ing.getItemInfo().getElementals()[0]); // fire
+ writeShort(ing.getItemInfo().getElementals()[1]); // water
+ writeShort(ing.getItemInfo().getElementals()[2]); // wind
+ writeShort(ing.getItemInfo().getElementals()[3]); // earth
+ writeShort(ing.getItemInfo().getElementals()[4]); // holy
+ writeShort(ing.getItemInfo().getElementals()[5]); // dark
}
else
{
- packet.writeH(ing.getEnchantLevel()); // enchant level
- packet.writeD(0); // augment id
- packet.writeD(0); // mana
- packet.writeH(0); // attack element
- packet.writeH(0); // element power
- packet.writeH(0); // fire
- packet.writeH(0); // water
- packet.writeH(0); // wind
- packet.writeH(0); // earth
- packet.writeH(0); // holy
- packet.writeH(0); // dark
+ writeShort(ing.getEnchantLevel()); // enchant level
+ writeInt(0); // augment id
+ writeInt(0); // mana
+ writeShort(0); // attack element
+ writeShort(0); // element power
+ writeShort(0); // fire
+ writeShort(0); // water
+ writeShort(0); // wind
+ writeShort(0); // earth
+ writeShort(0); // holy
+ writeShort(0); // dark
}
}
for (Ingredient ing : ent.getIngredients())
{
- packet.writeD(ing.getTemplate() != null ? ing.getTemplate().getDisplayId() : ing.getItemId());
- packet.writeH(ing.getTemplate() != null ? ing.getTemplate().getType2() : 65535);
- packet.writeQ(ing.getItemCount());
+ writeInt(ing.getTemplate() != null ? ing.getTemplate().getDisplayId() : ing.getItemId());
+ writeShort(ing.getTemplate() != null ? ing.getTemplate().getType2() : 65535);
+ writeLong(ing.getItemCount());
if (ing.getItemInfo() != null)
{
- packet.writeH(ing.getItemInfo().getEnchantLevel()); // enchant level
- packet.writeD(ing.getItemInfo().getAugmentId()); // augment id
- packet.writeD(0); // mana
- packet.writeH(ing.getItemInfo().getElementId()); // attack element
- packet.writeH(ing.getItemInfo().getElementPower()); // element power
- packet.writeH(ing.getItemInfo().getElementals()[0]); // fire
- packet.writeH(ing.getItemInfo().getElementals()[1]); // water
- packet.writeH(ing.getItemInfo().getElementals()[2]); // wind
- packet.writeH(ing.getItemInfo().getElementals()[3]); // earth
- packet.writeH(ing.getItemInfo().getElementals()[4]); // holy
- packet.writeH(ing.getItemInfo().getElementals()[5]); // dark
+ writeShort(ing.getItemInfo().getEnchantLevel()); // enchant level
+ writeInt(ing.getItemInfo().getAugmentId()); // augment id
+ writeInt(0); // mana
+ writeShort(ing.getItemInfo().getElementId()); // attack element
+ writeShort(ing.getItemInfo().getElementPower()); // element power
+ writeShort(ing.getItemInfo().getElementals()[0]); // fire
+ writeShort(ing.getItemInfo().getElementals()[1]); // water
+ writeShort(ing.getItemInfo().getElementals()[2]); // wind
+ writeShort(ing.getItemInfo().getElementals()[3]); // earth
+ writeShort(ing.getItemInfo().getElementals()[4]); // holy
+ writeShort(ing.getItemInfo().getElementals()[5]); // dark
}
else
{
- packet.writeH(ing.getEnchantLevel()); // enchant level
- packet.writeD(0); // augment id
- packet.writeD(0); // mana
- packet.writeH(0); // attack element
- packet.writeH(0); // element power
- packet.writeH(0); // fire
- packet.writeH(0); // water
- packet.writeH(0); // wind
- packet.writeH(0); // earth
- packet.writeH(0); // holy
- packet.writeH(0); // dark
+ writeShort(ing.getEnchantLevel()); // enchant level
+ writeInt(0); // augment id
+ writeInt(0); // mana
+ writeShort(0); // attack element
+ writeShort(0); // element power
+ writeShort(0); // fire
+ writeShort(0); // water
+ writeShort(0); // wind
+ writeShort(0); // earth
+ writeShort(0); // holy
+ writeShort(0); // dark
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
index 29265f5734..3e8ce8d64f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,12 +41,11 @@ public class MyTargetSelected implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MY_TARGET_SELECTED.writeId(packet);
- packet.writeD(_objectId);
- packet.writeH(_color);
- packet.writeD(0);
- return true;
+ ServerPackets.MY_TARGET_SELECTED.writeId(this);
+ writeInt(_objectId);
+ writeShort(_color);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
index 590e561339..f548b5f34e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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(0x46);
- packet.writeD(chr.getBaseSTR());
- packet.writeD(0x0A);
- packet.writeD(0x46);
- packet.writeD(chr.getBaseDEX());
- packet.writeD(0x0A);
- packet.writeD(0x46);
- packet.writeD(chr.getBaseCON());
- packet.writeD(0x0A);
- packet.writeD(0x46);
- packet.writeD(chr.getBaseINT());
- packet.writeD(0x0A);
- packet.writeD(0x46);
- packet.writeD(chr.getBaseWIT());
- packet.writeD(0x0A);
- packet.writeD(0x46);
- packet.writeD(chr.getBaseMEN());
- packet.writeD(0x0A);
+ writeInt(chr.getRace().ordinal());
+ writeInt(chr.getClassId().getId());
+ writeInt(0x46);
+ writeInt(chr.getBaseSTR());
+ writeInt(0x0A);
+ writeInt(0x46);
+ writeInt(chr.getBaseDEX());
+ writeInt(0x0A);
+ writeInt(0x46);
+ writeInt(chr.getBaseCON());
+ writeInt(0x0A);
+ writeInt(0x46);
+ writeInt(chr.getBaseINT());
+ writeInt(0x0A);
+ writeInt(0x46);
+ writeInt(chr.getBaseWIT());
+ writeInt(0x0A);
+ writeInt(0x46);
+ writeInt(chr.getBaseMEN());
+ writeInt(0x0A);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
index 6061ea26ef..0e2947b0f1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
index 153cab1b4c..b57db9bfbc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
@@ -16,17 +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;
-public class NormalCamera implements IClientOutgoingPacket
+public class NormalCamera extends ServerPacket
{
public static final NormalCamera STATIC_PACKET = new NormalCamera();
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
index eee0eb718e..14807c1029 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.
@@ -72,13 +71,12 @@ 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);
- return true;
+ ServerPackets.NPC_HTML_MESSAGE.writeId(this);
+ writeInt(getNpcObjId());
+ writeString(getHtml());
+ writeInt(_itemId);
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
index 2a0ba41eeb..d8abc6b50e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java
index fc6d0d4a3a..290e7f2a87 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
index 141348fdcc..39d38d97d2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,15 +29,14 @@ 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.writeC(0); // ?
- packet.writeC(0xc0); // ?
- packet.writeC(0); // ?
- return true;
+ ServerPackets.OBSERVER_START.writeId(this);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeByte(0); // ?
+ writeByte(0xc0); // ?
+ writeByte(0); // ?
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
index 896ccea02b..25d7104df4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
index 4c58902306..0e05793fb1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
@@ -16,36 +16,34 @@
*/
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;
/**
* @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(Door door, boolean enabled)
{
_emitterId = door.getEmitter();
- _enabled = enabled ? 1 : 0;
+ _enabled = enabled;
}
public OnEventTrigger(int id, boolean enabled)
{
_emitterId = id;
- _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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
index 84e6084c8e..196888a50a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
@@ -18,9 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
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;
/**
* @author -Wooden-
@@ -40,17 +39,16 @@ public class PackageSendableList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet);
- packet.writeD(_playerObjId);
- packet.writeQ(_adena);
- packet.writeD(_items.size());
+ ServerPackets.PACKAGE_SENDABLE_LIST.writeId(this);
+ writeInt(_playerObjId);
+ writeLong(_adena);
+ writeInt(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java
index e24d63f717..54c7da587e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java
index 133d5b4a3d..df4818403f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Gnacik
*/
-public class PartyMatchDetail implements IClientOutgoingPacket
+public class PartyMatchDetail extends ServerPacket
{
private final PartyMatchRoom _room;
@@ -33,17 +32,16 @@ public class PartyMatchDetail 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());
- packet.writeH(59064);
- 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());
+ writeShort(59064);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
index 44b23b37f4..b46688dfd3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
index 1e296625ad..2c488c3e7c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,23 +32,22 @@ 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()); // packet.writeD(4); ?? //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.getLevel());
- packet.writeD(_member.getClassId().getId());
- packet.writeD(0); // ?
- packet.writeD(0); // ?
- return true;
+ ServerPackets.PARTY_SMALL_WINDOW_ADD.writeId(this);
+ writeInt(_party.getLeaderObjectId()); // c3
+ writeInt(_party.getDistributionType().getId()); // writeInt(4); ?? //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.getLevel());
+ writeInt(_member.getClassId().getId());
+ writeInt(0); // ?
+ writeInt(0); // ?
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
index a1a3a3a3a5..b1b6930b8a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.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 PartySmallWindowAll implements IClientOutgoingPacket
+public class PartySmallWindowAll extends ServerPacket
{
private final Party _party;
private final Player _exclude;
@@ -33,48 +32,47 @@ 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.writeD(_party.getDistributionType().getId());
- packet.writeD(_party.getMemberCount() - 1);
+ ServerPackets.PARTY_SMALL_WINDOW_ALL.writeId(this);
+ writeInt(_party.getLeaderObjectId());
+ writeInt(_party.getDistributionType().getId());
+ writeInt(_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.getLevel());
- packet.writeD(member.getClassId().getId());
- packet.writeD(0); // packet.writeD(1); ??
- packet.writeD(member.getRace().ordinal());
- packet.writeD(0); // T2.3
- packet.writeD(0); // T2.3
+ 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.getLevel());
+ writeInt(member.getClassId().getId());
+ writeInt(0); // writeInt(1); ??
+ writeInt(member.getRace().ordinal());
+ writeInt(0); // T2.3
+ writeInt(0); // T2.3
if (member.hasSummon())
{
- packet.writeD(member.getSummon().getObjectId());
- packet.writeD(member.getSummon().getId() + 1000000);
- packet.writeD(member.getSummon().getSummonType());
- packet.writeS(member.getSummon().getName());
- packet.writeD((int) member.getSummon().getCurrentHp());
- packet.writeD(member.getSummon().getMaxHp());
- packet.writeD((int) member.getSummon().getCurrentMp());
- packet.writeD(member.getSummon().getMaxMp());
- packet.writeD(member.getSummon().getLevel());
+ writeInt(member.getSummon().getObjectId());
+ writeInt(member.getSummon().getId() + 1000000);
+ writeInt(member.getSummon().getSummonType());
+ writeString(member.getSummon().getName());
+ writeInt((int) member.getSummon().getCurrentHp());
+ writeInt(member.getSummon().getMaxHp());
+ writeInt((int) member.getSummon().getCurrentMp());
+ writeInt(member.getSummon().getMaxMp());
+ writeInt(member.getSummon().getLevel());
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
index 09ce132af4..2784d3a3d1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
index 11f803350c..3c7d5da53d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
index eba85303cb..a53fdda5fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.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 PartySmallWindowUpdate implements IClientOutgoingPacket
+public class PartySmallWindowUpdate extends ServerPacket
{
private final Player _member;
@@ -30,19 +29,18 @@ public class PartySmallWindowUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SMALL_WINDOW_UPDATE.writeId(packet);
- 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.getLevel());
- packet.writeD(_member.getClassId().getId());
- return true;
+ ServerPackets.PARTY_SMALL_WINDOW_UPDATE.writeId(this);
+ 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.getLevel());
+ writeInt(_member.getClassId().getId());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java
index f0ebfe5356..e0b7a575f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.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 PartySpelled implements IClientOutgoingPacket
+public class PartySpelled extends ServerPacket
{
private final List _effects = new ArrayList<>();
private final Creature _creature;
@@ -40,21 +39,20 @@ 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());
+ ServerPackets.PARTY_SPELLED.writeId(this);
+ writeInt(_creature.isServitor() ? 2 : _creature.isPet() ? 1 : 0);
+ writeInt(_creature.getObjectId());
+ writeInt(_effects.size());
for (BuffInfo info : _effects)
{
if ((info != null) && info.isInUse())
{
- packet.writeD(info.getSkill().getDisplayId());
- packet.writeH(info.getSkill().getDisplayLevel());
- packet.writeD(info.getTime());
+ writeInt(info.getSkill().getDisplayId());
+ writeShort(info.getSkill().getDisplayLevel());
+ writeInt(info.getTime());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java
index 65bfbb2982..0c39e41336 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.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 PetDelete implements IClientOutgoingPacket
+public class PetDelete extends ServerPacket
{
private final int _petType;
private final int _petObjId;
@@ -31,11 +30,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
index c0ccab3314..9914d6d141 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.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.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.actor.instance.Servitor;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PetInfo implements IClientOutgoingPacket
+public class PetInfo extends ServerPacket
{
private final Summon _summon;
private final int _x;
@@ -81,94 +80,93 @@ public class PetInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_INFO.writeId(packet);
- packet.writeD(_summon.getSummonType());
- packet.writeD(_summon.getObjectId());
- packet.writeD(_summon.getTemplate().getDisplayId() + 1000000);
- packet.writeD(0); // 1=attackable
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- packet.writeD(0);
- packet.writeD(_mAtkSpd);
- packet.writeD(_pAtkSpd);
- 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(_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.getOwner() != null ? 1 : 0); // when pet is dead and player exit game, pet doesn't show master name
- packet.writeC(_summon.isRunning() ? 1 : 0); // running=1 (it is always 1, walking mode is calculated from multiplier)
- packet.writeC(_summon.isInCombat() ? 1 : 0); // attacking 1=true
- packet.writeC(_summon.isAlikeDead() ? 1 : 0); // dead 1=true
- packet.writeC(_isSummoned ? 2 : _value); // 0=teleported 1=default 2=summoned
- packet.writeD(-1); // High Five NPCString ID
+ ServerPackets.PET_INFO.writeId(this);
+ writeInt(_summon.getSummonType());
+ writeInt(_summon.getObjectId());
+ writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+ writeInt(0); // 1=attackable
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
+ writeInt(0);
+ writeInt(_mAtkSpd);
+ writeInt(_pAtkSpd);
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_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.getOwner() != null); // when pet is dead and player exit game, pet doesn't show master name
+ writeByte(_summon.isRunning()); // running=1 (it is always 1, walking mode is calculated from multiplier)
+ writeByte(_summon.isInCombat()); // attacking 1=true
+ writeByte(_summon.isAlikeDead()); // dead 1=true
+ writeByte(_isSummoned ? 2 : _value); // 0=teleported 1=default 2=summoned
+ 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.writeD(1);
- packet.writeD(_summon.getPvpFlag()); // 0 = white,2= purpleblink, if its greater then karma = purple
- packet.writeD(_summon.getKarma()); // karma
- packet.writeD(_curFed); // how fed it is
- packet.writeD(_maxFed); // max fed it can be
- packet.writeD((int) _summon.getCurrentHp()); // current hp
- packet.writeD(_maxHp); // max hp
- packet.writeD((int) _summon.getCurrentMp()); // current mp
- packet.writeD(_maxMp); // max mp
- packet.writeD((int) _summon.getStat().getSp()); // sp
- packet.writeD(_summon.getLevel()); // level
- packet.writeQ(_summon.getStat().getExp());
+ writeInt(-1); // High Five NPCString ID
+ writeString(_summon.getTitle()); // owner name
+ writeInt(1);
+ writeInt(_summon.getPvpFlag()); // 0 = white,2= purpleblink, if its greater then karma = purple
+ writeInt(_summon.getKarma()); // karma
+ writeInt(_curFed); // how fed it is
+ writeInt(_maxFed); // max fed it can be
+ writeInt((int) _summon.getCurrentHp()); // current hp
+ writeInt(_maxHp); // max hp
+ writeInt((int) _summon.getCurrentMp()); // current mp
+ writeInt(_maxMp); // max mp
+ writeInt((int) _summon.getStat().getSp()); // sp
+ writeInt(_summon.getLevel()); // level
+ writeLong(_summon.getStat().getExp());
if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
{
- packet.writeQ(_summon.getStat().getExp()); // 0% absolute value
+ writeLong(_summon.getStat().getExp()); // 0% absolute value
}
else
{
- packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value
+ writeLong(_summon.getExpForThisLevel()); // 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((int) _summon.getPAtk(null)); // patk
- packet.writeD((int) _summon.getPDef(null)); // pdef
- packet.writeD((int) _summon.getMAtk(null, null)); // matk
- packet.writeD((int) _summon.getMDef(null, null)); // mdef
- packet.writeD(_summon.getAccuracy()); // accuracy
- packet.writeD(_summon.getEvasionRate(null)); // evasion
- packet.writeD(_summon.getCriticalHit(null, null)); // critical
- packet.writeD((int) _summon.getMoveSpeed()); // speed
- packet.writeD((int) _summon.getPAtkSpd()); // atkspeed
- packet.writeD(_summon.getMAtkSpd()); // casting speed
- packet.writeD(_summon.getAbnormalVisualEffects()); // c2 abnormal visual effect... bleed=1; poison=2; poison & bleed=3; flame=4;
- packet.writeH(_summon.isMountable() ? 1 : 0); // c2 ride button
- packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // c2
+ writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+ writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+ writeInt(_summon.getMaxLoad()); // max weight it can carry
+ writeInt((int) _summon.getPAtk(null)); // patk
+ writeInt((int) _summon.getPDef(null)); // pdef
+ writeInt((int) _summon.getMAtk(null, null)); // matk
+ writeInt((int) _summon.getMDef(null, null)); // mdef
+ writeInt(_summon.getAccuracy()); // accuracy
+ writeInt(_summon.getEvasionRate(null)); // evasion
+ writeInt(_summon.getCriticalHit(null, null)); // critical
+ writeInt((int) _summon.getMoveSpeed()); // speed
+ writeInt((int) _summon.getPAtkSpd()); // atkspeed
+ writeInt(_summon.getMAtkSpd()); // casting speed
+ writeInt(_summon.getAbnormalVisualEffects()); // c2 abnormal visual effect... bleed=1; poison=2; poison & bleed=3; flame=4;
+ writeShort(_summon.isMountable()); // c2 ride button
+ writeByte(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // c2
// Following all added in C4.
- packet.writeH(0); // ??
- packet.writeC(_summon.getTeam().getId());
- packet.writeD(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit
- packet.writeD(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit
- packet.writeD(_summon.getFormId()); // CT1.5 Pet form and skills
- packet.writeD(_summon.getAbnormalVisualEffectSpecial());
- return true;
+ writeShort(0); // ??
+ writeByte(_summon.getTeam().getId());
+ writeInt(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit
+ writeInt(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit
+ writeInt(_summon.getFormId()); // CT1.5 Pet form and skills
+ writeInt(_summon.getAbnormalVisualEffectSpecial());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
index 1f60ec39d1..fa0d9f1e4d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.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 Yme, Advi, UnAfraid
@@ -43,10 +42,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java
index 3c20c5f0f1..a6e2d9665a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java
@@ -18,9 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
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;
public class PetItemList extends AbstractItemPacket
{
@@ -32,14 +31,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
index 017a9b76a6..5c289132d0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.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 Yme
*/
-public class PetStatusShow implements IClientOutgoingPacket
+public class PetStatusShow extends ServerPacket
{
private final int _summonType;
@@ -33,10 +32,9 @@ public class PetStatusShow implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_STATUS_SHOW.writeId(packet);
- packet.writeD(_summonType);
- return true;
+ ServerPackets.PET_STATUS_SHOW.writeId(this);
+ writeInt(_summonType);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
index 3e998a47ef..8007aaa896 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
/**
* @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;
@@ -49,25 +48,24 @@ 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
- 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
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
index c9d5d59e8b..253891329d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java
index 0898b01f67..10099fec1f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
index 5b93dca07b..d66b90a22c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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;
@@ -40,19 +39,18 @@ public class PledgeCrest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_CREST.writeId(packet);
- packet.writeD(_crestId);
+ ServerPackets.PLEDGE_CREST.writeId(this);
+ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
index c2e0be9e05..2720b1fe41 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.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 PledgeInfo implements IClientOutgoingPacket
+public class PledgeInfo extends ServerPacket
{
private final Clan _clan;
@@ -30,12 +29,11 @@ public class PledgeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_INFO.writeId(packet);
- packet.writeD(_clan.getId());
- packet.writeS(_clan.getName());
- packet.writeS(_clan.getAllyName());
- return true;
+ ServerPackets.PLEDGE_INFO.writeId(this);
+ writeInt(_clan.getId());
+ writeString(_clan.getName());
+ writeString(_clan.getAllyName());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
index 3c33a41b39..d37f853889 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-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 RankPrivs[] _privs;
@@ -30,15 +29,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.length);
+ ServerPackets.PLEDGE_POWER_GRADE_LIST.writeId(this);
+ writeInt(_privs.length);
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
index 570988be83..d31196311d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -36,23 +35,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
index 15003778cb..f432d05956 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -36,12 +35,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
index 6032065546..6bedc61a16 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -41,14 +40,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
index 67358d749b..502f14d903 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.clan.Clan;
-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;
@@ -36,12 +35,12 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet);
- packet.writeD(_tab); // type : 0 = Declared, 1 = Under Attack
- packet.writeD(0); // page
- packet.writeD(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size());
+ ServerPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(this);
+ writeInt(_tab); // type : 0 = Declared, 1 = Under Attack
+ writeInt(0); // page
+ writeInt(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size());
for (Integer i : _tab == 0 ? _clan.getWarList() : _clan.getAttackerList())
{
final Clan clan = ClanTable.getInstance().getClan(i);
@@ -49,10 +48,9 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket
{
continue;
}
- packet.writeS(clan.getName());
- packet.writeD(_tab); // ??
- packet.writeD(_tab); // ??
+ writeString(clan.getName());
+ writeInt(_tab); // ??
+ writeInt(_tab); // ??
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
index 3a7961af78..6541f18c84 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.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 PledgeShowInfoUpdate implements IClientOutgoingPacket
+public class PledgeShowInfoUpdate extends ServerPacket
{
private final Clan _clan;
@@ -30,24 +29,23 @@ 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(_clan.getCrestId());
- packet.writeD(_clan.getLevel()); // clan level
- packet.writeD(_clan.getCastleId());
- 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
- return true;
+ writeInt(_clan.getId());
+ writeInt(_clan.getCrestId());
+ writeInt(_clan.getLevel()); // clan level
+ writeInt(_clan.getCastleId());
+ 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
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
index 2fa9f26d4a..e74bba06ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
index dac1207398..a617333a93 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.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.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 Player _player;
@@ -38,11 +37,11 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
_pledgeType = 0;
// FIXME: That's wrong on retail sends this whole packet few times (depending how much sub pledges it has)
- writePledge(packet, 0);
+ writePledge(0);
for (SubPledge subPledge : _clan.getAllSubPledges())
{
_player.sendPacket(new PledgeReceiveSubPledgeCreated(subPledge, _clan));
@@ -58,54 +57,53 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
// unless this is sent sometimes, the client doesn't recognise the player as the leader
_player.sendPacket(new UserInfo(_player));
_player.sendPacket(new ExBrExtraUserInfo(_player));
- return true;
}
- private void writePledge(PacketWriter packet, int mainOrSubpledge)
+ private void writePledge(int mainOrSubpledge)
{
- OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet);
- packet.writeD(mainOrSubpledge);
- packet.writeD(_clan.getId());
- packet.writeD(_pledgeType);
- packet.writeS(_clan.getName());
- packet.writeS(_clan.getLeaderName());
- packet.writeD(_clan.getCrestId()); // crest id .. is used again
- 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); // 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(_pledgeType));
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(this);
+ writeInt(mainOrSubpledge);
+ writeInt(_clan.getId());
+ writeInt(_pledgeType);
+ writeString(_clan.getName());
+ writeString(_clan.getLeaderName());
+ writeInt(_clan.getCrestId()); // crest id .. is used again
+ writeInt(_clan.getLevel());
+ writeInt(_clan.getCastleId());
+ 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(_pledgeType));
for (ClanMember m : _members)
{
if (m.getPledgeType() != _pledgeType)
{
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);
+ writeInt(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline
+ writeInt(m.getSponsor() != 0);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
index 154bcc610d..11a8076a81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
index 55415b6d4d..a648a72816 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
index cb840ae8dc..ca0fb9e804 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -16,43 +16,42 @@
*/
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 boolean _isOnline;
private final int _race;
- private final int _sex;
+ private final boolean _female;
public PledgeShowMemberListUpdate(Player player)
{
_pledgeType = player.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
- _hasSponsor = player.getSponsor() != 0 ? 1 : 0;
+ _hasSponsor = player.getSponsor() != 0;
}
else
{
- _hasSponsor = 0;
+ _hasSponsor = false;
}
_name = player.getName();
_level = player.getLevel();
_classId = player.getClassId().getId();
_race = player.getRace().ordinal();
- _sex = player.getAppearance().isFemale() ? 1 : 0;
+ _female = player.getAppearance().isFemale();
_objectId = player.getObjectId();
_isOnline = player.isOnline();
}
@@ -66,38 +65,37 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_isOnline = member.isOnline();
_pledgeType = member.getPledgeType();
_race = member.getRaceOrdinal();
- _sex = member.getSex() ? 1 : 0;
+ _female = member.getSex();
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(_female);
+ writeInt(_race);
if (_isOnline)
{
- 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);
- return true;
+ writeInt(_hasSponsor);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
index 14757b12db..1fd9b65aee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.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.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 Skill[] _skills;
private final List _subSkills;
@@ -39,7 +38,6 @@ public class PledgeSkillList implements IClientOutgoingPacket
public SubPledgeSkill(int subType, int skillId, int skillLevel)
{
- super();
_subType = subType;
_skillId = skillId;
_skillLevel = skillLevel;
@@ -53,22 +51,21 @@ public class PledgeSkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet);
- packet.writeD(_skills.length);
- packet.writeD(_subSkills.size()); // Squad skill length
+ ServerPackets.PLEDGE_SKILL_LIST.writeId(this);
+ writeInt(_skills.length);
+ writeInt(_subSkills.size()); // Squad skill length
for (Skill sk : _skills)
{
- packet.writeD(sk.getDisplayId());
- packet.writeD(sk.getDisplayLevel());
+ writeInt(sk.getDisplayId());
+ writeInt(sk.getDisplayLevel());
}
for (SubPledgeSkill sk : _subSkills)
{
- packet.writeD(sk._subType); // Clan Sub-unit types
- packet.writeD(sk._skillId);
- packet.writeD(sk._skillLevel);
+ writeInt(sk._subType); // Clan Sub-unit types
+ writeInt(sk._skillId);
+ writeInt(sk._skillLevel);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
index a94601294f..f27dab88ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
index ba7c9a8bfb..0425893dfb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,16 +29,15 @@ public class PledgeStatusChanged implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet);
- packet.writeD(_clan.getLeaderId());
- packet.writeD(_clan.getId());
- packet.writeD(_clan.getCrestId());
- packet.writeD(_clan.getAllyId());
- packet.writeD(_clan.getAllyCrestId());
- packet.writeD(0);
- packet.writeD(0);
- return true;
+ ServerPackets.PLEDGE_STATUS_CHANGED.writeId(this);
+ writeInt(_clan.getLeaderId());
+ writeInt(_clan.getId());
+ writeInt(_clan.getCrestId());
+ writeInt(_clan.getAllyId());
+ writeInt(_clan.getAllyCrestId());
+ writeInt(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PremiumState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PremiumState.java
index 5b99d44f8e..43c9b8d2e1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PremiumState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PremiumState.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 PremiumState implements IClientOutgoingPacket
+public class PremiumState extends ServerPacket
{
private final int _objectId;
private final int _state;
@@ -34,11 +33,10 @@ public class PremiumState implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeC(_state);
- return true;
+ ServerPackets.EX_BR_PREMIUM_STATE.writeId(this);
+ writeInt(_objectId);
+ writeByte(_state);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
index 8f813f3dab..397eddd989 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
public class PrivateStoreListBuy extends AbstractItemPacket
{
@@ -38,20 +37,19 @@ 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(_items.size());
+ ServerPackets.PRIVATE_STORE_BUY_LIST.writeId(this);
+ writeInt(_objId);
+ writeLong(_playerAdena);
+ writeInt(_items.size());
for (TradeItem item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
- packet.writeQ(item.getPrice());
- packet.writeQ(item.getItem().getReferencePrice() * 2);
- packet.writeQ(item.getStoreCount());
+ writeItem(item);
+ writeInt(item.getObjectId());
+ writeLong(item.getPrice());
+ writeLong(item.getItem().getReferencePrice() * 2);
+ writeLong(item.getStoreCount());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
index 1eeaead18d..40ff53733c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,18 +41,17 @@ public class PrivateStoreListSell extends AbstractItemPacket
}
else
{
- OutgoingPackets.PRIVATE_STORE_SELL_LIST.writeId(packet);
- packet.writeD(_seller.getObjectId());
- packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0);
- packet.writeQ(_player.getAdena());
- packet.writeD(_seller.getSellList().getItems().size());
+ ServerPackets.PRIVATE_STORE_SELL_LIST.writeId(this);
+ writeInt(_seller.getObjectId());
+ writeInt(_seller.getSellList().isPackaged());
+ writeLong(_player.getAdena());
+ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
index 09d76fc8ca..e566a725e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
@@ -40,28 +39,27 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet);
+ ServerPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(this);
// section 1
- packet.writeD(_objId);
- packet.writeQ(_playerAdena);
+ writeInt(_objId);
+ writeLong(_playerAdena);
// section2
- packet.writeD(_itemList.size()); // inventory items for potential buy
+ writeInt(_itemList.size()); // inventory items for potential buy
for (Item item : _itemList)
{
- writeItem(packet, item);
- packet.writeQ(item.getTemplate().getReferencePrice() * 2);
+ writeItem(item);
+ writeLong(item.getTemplate().getReferencePrice() * 2);
}
// section 3
- packet.writeD(_buyList.size()); // count for all items already added for buy
+ writeInt(_buyList.size()); // count for all items already added for buy
for (TradeItem item : _buyList)
{
- writeItem(packet, item);
- packet.writeQ(item.getPrice());
- packet.writeQ(item.getItem().getReferencePrice() * 2);
- packet.writeQ(item.getCount());
+ writeItem(item);
+ writeLong(item.getPrice());
+ writeLong(item.getItem().getReferencePrice() * 2);
+ writeLong(item.getCount());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
index a13d00465b..5d531654a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
@@ -42,28 +41,27 @@ public class PrivateStoreManageListSell extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_SELL_MANAGE_LIST.writeId(packet);
+ ServerPackets.PRIVATE_STORE_SELL_MANAGE_LIST.writeId(this);
// section 1
- packet.writeD(_objId);
- packet.writeD(_packageSale ? 1 : 0); // Package sell
- packet.writeQ(_playerAdena);
+ writeInt(_objId);
+ writeInt(_packageSale); // Package sell
+ writeLong(_playerAdena);
// section2
- packet.writeD(_itemList.size()); // for potential sells
+ writeInt(_itemList.size()); // for potential sells
for (TradeItem item : _itemList)
{
- writeItem(packet, item);
- packet.writeQ(item.getItem().getReferencePrice() * 2);
+ writeItem(item);
+ writeLong(item.getItem().getReferencePrice() * 2);
}
// section 3
- packet.writeD(_sellList.size()); // count for any items already added for sell
+ writeInt(_sellList.size()); // count for any items already added for sell
for (TradeItem item : _sellList)
{
- 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
index 0d7bcbea16..35bbaadecf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
index 684bf89b33..a6e373f92f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_SELL_MSG.writeId(packet);
- packet.writeD(_objId);
- packet.writeS(_storeMsg);
- return true;
+ ServerPackets.PRIVATE_STORE_SELL_MSG.writeId(this);
+ writeInt(_objId);
+ writeString(_storeMsg);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
index ff5087c1a7..21275ae124 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
@@ -18,13 +18,12 @@ 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;
-public class QuestList implements IClientOutgoingPacket
+public class QuestList extends ServerPacket
{
final Player _player;
@@ -34,7 +33,7 @@ public class QuestList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
/**
*
@@ -69,28 +68,27 @@ public class QuestList implements IClientOutgoingPacket
*
*/
final List quests = _player.getAllActiveQuests();
- OutgoingPackets.QUEST_LIST.writeId(packet);
- packet.writeH(quests.size());
+ ServerPackets.QUEST_LIST.writeId(this);
+ writeShort(quests.size());
for (Quest q : quests)
{
- packet.writeD(q.getId());
+ writeInt(q.getId());
final QuestState qs = _player.getQuestState(q.getName());
if (qs == null)
{
- packet.writeD(0);
+ writeInt(0);
continue;
}
final int states = qs.getInt("__compltdStateFlags");
if (states > 0)
{
- packet.writeD(states);
+ writeInt(states);
}
else
{
- packet.writeD(qs.getCond());
+ writeInt(qs.getCond());
}
}
- packet.writeB(new byte[128]);
- return true;
+ writeBytes(new byte[128]);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java
index b7282a599e..b78aacbe9b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -44,14 +43,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
index 5d67413b6f..0c4d7d327f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,25 @@ 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
+ writeInt(_recipes.size()); // number of items in recipe book
int count = 0;
for (RecipeList recipe : _recipes)
{
count++;
- packet.writeD(recipe.getId());
- packet.writeD(count);
+ writeInt(recipe.getId());
+ writeInt(count);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
index 37f018ccd3..dd13abc30d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
@@ -16,14 +16,13 @@
*/
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.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;
@@ -44,22 +43,20 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final RecipeList recipe = RecipeData.getInstance().getRecipeList(_id);
- 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 success/failed
- }
- else
+ if (recipe == null)
{
PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id);
+ return;
}
- return true;
+
+ 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 success/failed
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
index 84430c3983..eeea7decac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.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 RecipeShopItemInfo implements IClientOutgoingPacket
+public class RecipeShopItemInfo extends ServerPacket
{
private final Player _player;
private final int _recipeId;
@@ -32,14 +31,13 @@ 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);
- return true;
+ ServerPackets.RECIPE_SHOP_ITEM_INFO.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt(_recipeId);
+ writeInt((int) _player.getCurrentMp());
+ writeInt(_player.getMaxMp());
+ writeInt(0xffffffff);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
index 38b0b8ea4e..dfac382cd6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,40 @@ 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
+ writeInt(_recipes.size()); // number of items in recipe book
int count = 0;
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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
index 2b9bc5b6e7..5813c246b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
index 8b3cb42f47..e19c39d24b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
@@ -16,12 +16,11 @@
*/
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.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;
@@ -33,27 +32,26 @@ 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());
+ writeInt(_manufacturer.getManufactureItems().size());
for (ManufactureItem temp : _manufacturer.getManufactureItems().values())
{
- packet.writeD(temp.getRecipeId());
- packet.writeD(0); // unknown
- packet.writeQ(temp.getCost());
+ writeInt(temp.getRecipeId());
+ writeInt(0); // unknown
+ writeLong(temp.getCost());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
index 5eeeb2b92b..5630f152a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
@@ -19,14 +19,13 @@ 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.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 = 0x00001; // party member
public static final int RELATION_PARTY2 = 0x00002; // party member
@@ -50,7 +49,7 @@ public class RelationChanged implements IClientOutgoingPacket
{
int _objId;
int _relation;
- int _autoAttackable;
+ boolean _autoAttackable;
int _karma;
int _pvpFlag;
}
@@ -63,7 +62,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._karma = activeChar.getKarma();
_singled._pvpFlag = activeChar.getPvpFlag();
}
@@ -82,38 +81,37 @@ 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._karma = activeChar.getKarma();
r._pvpFlag = activeChar.getPvpFlag();
_multi.add(r);
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RELATION_CHANGED.writeId(packet);
+ ServerPackets.RELATION_CHANGED.writeId(this);
if (_multi == null)
{
- packet.writeD(1);
- writeRelation(packet, _singled);
+ writeInt(1);
+ writeRelation(_singled);
}
else
{
- packet.writeD(_multi.size());
- for (Relation r : _multi)
+ writeInt(_multi.size());
+ for (Relation relation : _multi)
{
- writeRelation(packet, r);
+ writeRelation(relation);
}
}
- return true;
}
- private void writeRelation(PacketWriter packet, Relation relation)
+ private void writeRelation(Relation relation)
{
- packet.writeD(relation._objId);
- packet.writeD(relation._relation);
- packet.writeD(relation._autoAttackable);
- packet.writeD(relation._karma);
- packet.writeD(relation._pvpFlag);
+ writeInt(relation._objId);
+ writeInt(relation._relation);
+ writeInt(relation._autoAttackable);
+ writeInt(relation._karma);
+ writeInt(relation._pvpFlag);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
index 51256b4c97..003849ca54 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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 _unk;
@@ -35,10 +34,9 @@ public class RequestEnchant implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet);
- packet.writeD(_unk);
- return true;
+ ServerPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(this);
+ writeInt(_unk);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
index c74b801731..86d044aa00 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true);
private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false);
@@ -37,10 +36,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
index 7a0a6cbe58..24b97e4d67 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java
index b9ddf7733f..c5a8ddd759 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQInfo.java
index 4b40638221..99db443b20 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQInfo.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Changes the sky color depending on the outcome of the Seven Signs competition.
* @author Tempy
*/
-public class SSQInfo implements IClientOutgoingPacket
+public class SSQInfo extends ServerPacket
{
private int _state = 0;
@@ -50,10 +49,9 @@ public class SSQInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SSQ_INFO.writeId(packet);
- packet.writeH(256 + _state);
- return true;
+ ServerPackets.SSQ_INFO.writeId(this);
+ writeShort(256 + _state);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
index 0e43f1f423..81ee749a6b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.SystemMessageId;
/**
@@ -28,7 +27,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
* @author Tempy
* @editor shansoft
*/
-public class SSQStatus implements IClientOutgoingPacket
+public class SSQStatus extends ServerPacket
{
private final int _objectId;
private final int _page;
@@ -40,14 +39,14 @@ public class SSQStatus implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final int winningCabal = SevenSigns.getInstance().getCabalHighestScore();
final int totalDawnMembers = SevenSigns.getInstance().getTotalMembers(SevenSigns.CABAL_DAWN);
final int totalDuskMembers = SevenSigns.getInstance().getTotalMembers(SevenSigns.CABAL_DUSK);
- OutgoingPackets.SSQ_STATUS.writeId(packet);
- packet.writeC(_page);
- packet.writeC(SevenSigns.getInstance().getCurrentPeriod()); // current period?
+ ServerPackets.SSQ_STATUS.writeId(this);
+ writeByte(_page);
+ writeByte(SevenSigns.getInstance().getCurrentPeriod()); // current period?
int dawnPercent = 0;
int duskPercent = 0;
switch (_page)
@@ -55,28 +54,28 @@ public class SSQStatus implements IClientOutgoingPacket
case 1:
{
// [ddd cc dd ddd c ddd c]
- packet.writeD(SevenSigns.getInstance().getCurrentCycle());
+ writeInt(SevenSigns.getInstance().getCurrentCycle());
final int currentPeriod = SevenSigns.getInstance().getCurrentPeriod();
switch (currentPeriod)
{
case SevenSigns.PERIOD_COMP_RECRUITING:
{
- packet.writeD(SystemMessageId.THIS_IS_THE_INITIAL_PERIOD.getId());
+ writeInt(SystemMessageId.THIS_IS_THE_INITIAL_PERIOD.getId());
break;
}
case SevenSigns.PERIOD_COMPETITION:
{
- packet.writeD(SystemMessageId.THE_SSQ_COMPETITION_PERIOD_IS_UNDERWAY.getId());
+ writeInt(SystemMessageId.THE_SSQ_COMPETITION_PERIOD_IS_UNDERWAY.getId());
break;
}
case SevenSigns.PERIOD_COMP_RESULTS:
{
- packet.writeD(SystemMessageId.THIS_IS_A_PERIOD_WHEN_SERVER_STATISTICS_ARE_CALCULATED.getId());
+ writeInt(SystemMessageId.THIS_IS_A_PERIOD_WHEN_SERVER_STATISTICS_ARE_CALCULATED.getId());
break;
}
case SevenSigns.PERIOD_SEAL_VALIDATION:
{
- packet.writeD(SystemMessageId.THIS_IS_THE_SEAL_VALIDATION_PERIOD.getId());
+ writeInt(SystemMessageId.THIS_IS_THE_SEAL_VALIDATION_PERIOD.getId());
break;
}
}
@@ -85,20 +84,20 @@ public class SSQStatus implements IClientOutgoingPacket
case SevenSigns.PERIOD_COMP_RECRUITING:
case SevenSigns.PERIOD_COMP_RESULTS:
{
- packet.writeD(SystemMessageId.UNTIL_TODAY_AT_6_00_P_M.getId());
+ writeInt(SystemMessageId.UNTIL_TODAY_AT_6_00_P_M.getId());
break;
}
case SevenSigns.PERIOD_COMPETITION:
case SevenSigns.PERIOD_SEAL_VALIDATION:
{
- packet.writeD(SystemMessageId.UNTIL_NEXT_MONDAY_AT_6_00_P_M.getId());
+ writeInt(SystemMessageId.UNTIL_NEXT_MONDAY_AT_6_00_P_M.getId());
break;
}
}
- packet.writeC(SevenSigns.getInstance().getPlayerCabal(_objectId));
- packet.writeC(SevenSigns.getInstance().getPlayerSeal(_objectId));
- packet.writeQ(SevenSigns.getInstance().getPlayerStoneContrib(_objectId)); // Seal Stones Turned-In
- packet.writeQ(SevenSigns.getInstance().getPlayerAdenaCollect(_objectId)); // Ancient Adena to Collect
+ writeByte(SevenSigns.getInstance().getPlayerCabal(_objectId));
+ writeByte(SevenSigns.getInstance().getPlayerSeal(_objectId));
+ writeLong(SevenSigns.getInstance().getPlayerStoneContrib(_objectId)); // Seal Stones Turned-In
+ writeLong(SevenSigns.getInstance().getPlayerAdenaCollect(_objectId)); // Ancient Adena to Collect
final double dawnStoneScore = SevenSigns.getInstance().getCurrentStoneScore(SevenSigns.CABAL_DAWN);
final int dawnFestivalScore = SevenSigns.getInstance().getCurrentFestivalScore(SevenSigns.CABAL_DAWN);
final double duskStoneScore = SevenSigns.getInstance().getCurrentStoneScore(SevenSigns.CABAL_DUSK);
@@ -123,59 +122,59 @@ public class SSQStatus implements IClientOutgoingPacket
duskPercent = Math.round(((float) duskTotalScore / totalOverallScore) * 100);
}
/* DUSK */
- packet.writeQ(duskStoneScoreProp); // Seal Stone Score
- packet.writeQ(duskFestivalScore); // Festival Score
- packet.writeQ(duskTotalScore); // Total Score
- packet.writeC(duskPercent); // Dusk %
+ writeLong(duskStoneScoreProp); // Seal Stone Score
+ writeLong(duskFestivalScore); // Festival Score
+ writeLong(duskTotalScore); // Total Score
+ writeByte(duskPercent); // Dusk %
/* DAWN */
- packet.writeQ(dawnStoneScoreProp); // Seal Stone Score
- packet.writeQ(dawnFestivalScore); // Festival Score
- packet.writeQ(dawnTotalScore); // Total Score
- packet.writeC(dawnPercent); // Dawn %
+ writeLong(dawnStoneScoreProp); // Seal Stone Score
+ writeLong(dawnFestivalScore); // Festival Score
+ writeLong(dawnTotalScore); // Total Score
+ writeByte(dawnPercent); // Dawn %
break;
}
case 2:
{
// c cc hc [cd (dc (S))]
- packet.writeH(1);
- packet.writeC(5); // Total number of festivals
+ writeShort(1);
+ writeByte(5); // Total number of festivals
for (int i = 0; i < 5; i++)
{
- packet.writeC(i + 1); // Current client-side festival ID
- packet.writeD(SevenSignsFestival.FESTIVAL_LEVEL_SCORES[i]);
+ writeByte(i + 1); // Current client-side festival ID
+ writeInt(SevenSignsFestival.FESTIVAL_LEVEL_SCORES[i]);
final int duskScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DUSK, i);
final int dawnScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DAWN, i);
// Dusk Score \\
- packet.writeQ(duskScore);
+ writeLong(duskScore);
StatSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i);
String[] partyMembers = highScoreData.getString("members").split(",");
if (partyMembers != null)
{
- packet.writeC(partyMembers.length);
+ writeByte(partyMembers.length);
for (String partyMember : partyMembers)
{
- packet.writeS(partyMember);
+ writeString(partyMember);
}
}
else
{
- packet.writeC(0);
+ writeByte(0);
}
// Dawn Score \\
- packet.writeQ(dawnScore);
+ writeLong(dawnScore);
highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, i);
partyMembers = highScoreData.getString("members").split(",");
if (partyMembers != null)
{
- packet.writeC(partyMembers.length);
+ writeByte(partyMembers.length);
for (String partyMember : partyMembers)
{
- packet.writeS(partyMember);
+ writeString(partyMember);
}
}
else
{
- packet.writeC(0);
+ writeByte(0);
}
}
break;
@@ -183,39 +182,39 @@ public class SSQStatus implements IClientOutgoingPacket
case 3:
{
// c cc [ccc (cccc)]
- packet.writeC(10); // Minimum limit for winning cabal to retain their seal
- packet.writeC(35); // Minimum limit for winning cabal to claim a seal
- packet.writeC(3); // Total number of seals
+ writeByte(10); // Minimum limit for winning cabal to retain their seal
+ writeByte(35); // Minimum limit for winning cabal to claim a seal
+ writeByte(3); // Total number of seals
for (int i = 1; i < 4; i++)
{
final int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN);
final int duskProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DUSK);
- packet.writeC(i);
- packet.writeC(SevenSigns.getInstance().getSealOwner(i));
+ writeByte(i);
+ writeByte(SevenSigns.getInstance().getSealOwner(i));
if (totalDuskMembers == 0)
{
if (totalDawnMembers == 0)
{
- packet.writeC(0);
- packet.writeC(0);
+ writeByte(0);
+ writeByte(0);
}
else
{
- packet.writeC(0);
- packet.writeC(Math.round(((float) dawnProportion / totalDawnMembers) * 100));
+ writeByte(0);
+ writeByte(Math.round(((float) dawnProportion / totalDawnMembers) * 100));
}
}
else
{
if (totalDawnMembers == 0)
{
- packet.writeC(Math.round(((float) duskProportion / totalDuskMembers) * 100));
- packet.writeC(0);
+ writeByte(Math.round(((float) duskProportion / totalDuskMembers) * 100));
+ writeByte(0);
}
else
{
- packet.writeC(Math.round(((float) duskProportion / totalDuskMembers) * 100));
- packet.writeC(Math.round(((float) dawnProportion / totalDawnMembers) * 100));
+ writeByte(Math.round(((float) duskProportion / totalDuskMembers) * 100));
+ writeByte(Math.round(((float) dawnProportion / totalDawnMembers) * 100));
}
}
}
@@ -224,8 +223,8 @@ public class SSQStatus implements IClientOutgoingPacket
case 4:
{
// c cc [cc (ccD)] CT 2.3 update
- packet.writeC(winningCabal); // Overall predicted winner
- packet.writeC(3); // Total number of seals
+ writeByte(winningCabal); // Overall predicted winner
+ writeByte(3); // Total number of seals
for (int i = 1; i < 4; i++)
{
final int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN);
@@ -233,7 +232,7 @@ public class SSQStatus implements IClientOutgoingPacket
dawnPercent = Math.round((dawnProportion / (totalDawnMembers == 0 ? 1 : (float) totalDawnMembers)) * 100);
duskPercent = Math.round((duskProportion / (totalDuskMembers == 0 ? 1 : (float) totalDuskMembers)) * 100);
final int sealOwner = SevenSigns.getInstance().getSealOwner(i);
- packet.writeC(i);
+ writeByte(i);
switch (sealOwner)
{
case SevenSigns.CABAL_NULL:
@@ -242,21 +241,21 @@ public class SSQStatus implements IClientOutgoingPacket
{
case SevenSigns.CABAL_NULL:
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
break;
}
case SevenSigns.CABAL_DAWN:
{
if (dawnPercent >= 35)
{
- packet.writeC(SevenSigns.CABAL_DAWN);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -264,13 +263,13 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 35)
{
- packet.writeC(SevenSigns.CABAL_DUSK);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(SevenSigns.CABAL_DUSK);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -285,13 +284,13 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (dawnPercent >= 10)
{
- packet.writeC(SevenSigns.CABAL_DAWN);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
}
break;
}
@@ -299,13 +298,13 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (dawnPercent >= 10)
{
- packet.writeC(sealOwner);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(sealOwner);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -313,18 +312,18 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 35)
{
- packet.writeC(SevenSigns.CABAL_DUSK);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(SevenSigns.CABAL_DUSK);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else if (dawnPercent >= 10)
{
- packet.writeC(SevenSigns.CABAL_DAWN);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -339,13 +338,13 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 10)
{
- packet.writeC(SevenSigns.CABAL_DUSK);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(SevenSigns.CABAL_DUSK);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
}
break;
}
@@ -353,18 +352,18 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (dawnPercent >= 35)
{
- packet.writeC(SevenSigns.CABAL_DAWN);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_35_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else if (duskPercent >= 10)
{
- packet.writeC(sealOwner);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(sealOwner);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -372,13 +371,13 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 10)
{
- packet.writeC(sealOwner);
- packet.writeD(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
+ writeByte(sealOwner);
+ writeInt(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_OR_MORE_PEOPLE_HAVE_PARTICIPATED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeInt(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -390,6 +389,5 @@ public class SSQStatus implements IClientOutgoingPacket
break;
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
index ba507d82d3..fe440c99c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
index b21bfacf0c..065289319e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
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 _rev;
private final int _count;
@@ -35,31 +34,30 @@ public class SendMacroList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MACRO_LIST.writeId(packet);
- packet.writeD(_rev); // macro change revision (changes after each macro edition)
- packet.writeC(0); // unknown
- packet.writeC(_count); // count of Macros
- packet.writeC(_macro != null ? 1 : 0); // unknown
+ ServerPackets.MACRO_LIST.writeId(this);
+ writeInt(_rev); // macro change revision (changes after each macro edition)
+ writeByte(0); // unknown
+ writeByte(_count); // count of Macros
+ writeByte(_macro != null); // unknown
if (_macro != null)
{
- packet.writeD(_macro.getId()); // Macro ID
- packet.writeS(_macro.getName()); // Macro Name
- packet.writeS(_macro.getDescr()); // Desc
- packet.writeS(_macro.getAcronym()); // acronym
- packet.writeC(_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
+ writeByte(_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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
index 497ae8f354..4da6f9850e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java
index 2dc3b7db02..583b7cbb26 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.SERVER_CLOSE.writeId(packet);
- return true;
+ ServerPackets.SERVER_CLOSE.writeId(this);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
index 1513a0e3d1..1bd4eecbb2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
similarity index 70%
rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
index 9d3bb66b00..c14c96ad28 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
@@ -16,16 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
+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,
@@ -55,12 +55,33 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
Inventory.PAPERDOLL_BELT
};
- default int[] getPaperdollOrder()
+ protected int[] getPaperdollOrder()
{
return PAPERDOLL_ORDER;
}
- 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)
{
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
index 0164e5c4a2..a89f88c45a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
index 0da4e68f6e..27d051f3a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
index 016f5a0c9a..63dfee6ddb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
index ab6507f0c7..ad7684c872 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.BuyListHolder;
import org.l2jmobius.gameserver.model.buylist.Product;
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;
@@ -48,15 +47,15 @@ public class ShopPreviewList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet);
- packet.writeC(0xC0); // ?
- packet.writeC(0x13); // ?
- packet.writeC(0); // ?
- packet.writeC(0); // ?
- packet.writeQ(_money); // current money
- packet.writeD(_listId);
+ ServerPackets.SHOP_PREVIEW_LIST.writeId(this);
+ writeByte(0xC0); // ?
+ writeByte(0x13); // ?
+ writeByte(0); // ?
+ writeByte(0); // ?
+ writeLong(_money); // current money
+ writeInt(_listId);
int newlength = 0;
for (Product product : _list)
{
@@ -65,24 +64,23 @@ public class ShopPreviewList implements IClientOutgoingPacket
newlength++;
}
}
- packet.writeH(newlength);
+ writeShort(newlength);
for (Product product : _list)
{
if ((product.getItem().getCrystalType().getLevel() <= _expertise) && 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.writeH(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
+ writeShort(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.writeH(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
+ writeShort(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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
index d50b70db23..7642f0d12d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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);
@@ -35,12 +34,11 @@ 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.writeD(_skillLevel);
- packet.writeD(_duration);
- return true;
+ ServerPackets.SHORT_BUFF_STATUS_UPDATE.writeId(this);
+ writeInt(_skillId);
+ writeInt(_skillLevel);
+ writeInt(_duration);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 4cc3d06565..d9080e6ade 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,33 +36,33 @@ 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));
+ writeInt(sc.getType().ordinal());
+ writeInt(sc.getSlot() + (sc.getPage() * 12));
switch (sc.getType())
{
case ITEM:
{
- packet.writeD(sc.getId());
- packet.writeD(1);
- packet.writeD(sc.getSharedReuseGroup());
- packet.writeD(0);
- packet.writeD(0);
- packet.writeH(0);
- packet.writeH(0);
+ writeInt(sc.getId());
+ writeInt(1);
+ writeInt(sc.getSharedReuseGroup());
+ writeInt(0);
+ writeInt(0);
+ writeShort(0);
+ writeShort(0);
break;
}
case SKILL:
{
- packet.writeD(sc.getId());
- packet.writeD(sc.getLevel());
- packet.writeC(0); // C5
- packet.writeD(1); // C6
+ writeInt(sc.getId());
+ writeInt(sc.getLevel());
+ writeByte(0); // C5
+ writeInt(1); // C6
break;
}
case ACTION:
@@ -71,11 +70,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index dac2bd8488..091dd55919 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,29 +33,29 @@ 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
+ ServerPackets.SHORT_CUT_REGISTER.writeId(this);
+ writeInt(_shortcut.getType().ordinal());
+ writeInt(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client
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
+ writeInt(_shortcut.getId());
+ writeInt(_shortcut.getCharacterType());
+ writeInt(_shortcut.getSharedReuseGroup());
+ writeInt(0); // unknown
+ writeInt(0); // unknown
+ writeInt(0); // item augment id
break;
}
case SKILL:
{
- packet.writeD(_shortcut.getId());
- packet.writeD(_shortcut.getLevel());
- packet.writeC(0); // C5
- packet.writeD(_shortcut.getCharacterType());
+ writeInt(_shortcut.getId());
+ writeInt(_shortcut.getLevel());
+ writeByte(0); // C5
+ writeInt(_shortcut.getCharacterType());
break;
}
case ACTION:
@@ -64,10 +63,9 @@ public class ShortCutRegister implements IClientOutgoingPacket
case RECIPE:
case BOOKMARK:
{
- packet.writeD(_shortcut.getId());
- packet.writeD(_shortcut.getCharacterType());
+ writeInt(_shortcut.getId());
+ writeInt(_shortcut.getCharacterType());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
index ef99f084c6..19713a1718 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
index a650d455b1..5836046989 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -32,10 +31,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
index e054e4267a..10b1bb7f34 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
-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;
@@ -33,11 +32,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(SevenSigns.getInstance().getCurrentPeriod());
- return true;
+ ServerPackets.SHOW_MINIMAP.writeId(this);
+ writeInt(_mapId);
+ writeByte(SevenSigns.getInstance().getCurrentPeriod());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
index 5d8466057a..4594594cc5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_PC_CAFE_COUPON_SHOW_UI.writeId(packet);
- return true;
+ ServerPackets.SHOW_PC_CAFE_COUPON_SHOW_UI.writeId(this);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
index 411bc27834..c23f1f2602 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -38,12 +37,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
index 0a0f3ae861..79fdbe0ba5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
index 5bfc6166b2..a697f85f2d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.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.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.SiegeClan;
import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Populates the Siege Attacker List in the SiegeInfo Window
@@ -48,7 +47,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
* d = AllyCrestID
* @author KenM
*/
-public class SiegeAttackerList implements IClientOutgoingPacket
+public class SiegeAttackerList extends ServerPacket
{
private Castle _castle;
private SiegableHall _hall;
@@ -64,21 +63,21 @@ public class SiegeAttackerList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet);
+ ServerPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(this);
if (_castle != null)
{
- packet.writeD(_castle.getResidenceId());
- packet.writeD(0); // 0
- packet.writeD(1); // 1
- packet.writeD(0); // 0
+ 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());
@@ -86,35 +85,35 @@ 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);
}
}
else
{
- packet.writeD(_hall.getId());
- packet.writeD(0); // 0
- packet.writeD(1); // 1
- packet.writeD(0); // 0
+ writeInt(_hall.getId());
+ writeInt(0); // 0
+ writeInt(1); // 1
+ writeInt(0); // 0
final Collection attackers = _hall.getSiege().getAttackerClans();
final int size = attackers.size();
if (size > 0)
{
- packet.writeD(size);
- packet.writeD(size);
+ writeInt(size);
+ writeInt(size);
for (SiegeClan sClan : attackers)
{
final Clan clan = ClanTable.getInstance().getClan(sClan.getClanId());
@@ -122,23 +121,22 @@ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index ded541237c..eaa149fc82 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.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.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.SiegeClan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Populates the Siege Defender List in the SiegeInfo Window
@@ -46,7 +45,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;
@@ -56,19 +55,19 @@ 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); // 0
- packet.writeD(1); // 1
- packet.writeD(0); // 0
+ ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
+ writeInt(_castle.getResidenceId());
+ writeInt(0); // 0
+ writeInt(1); // 1
+ writeInt(0); // 0
final int size = _castle.getSiege().getDefenderClans().size() + _castle.getSiege().getDefenderWaitingClans().size();
if (size > 0)
{
Clan clan;
- packet.writeD(size);
- packet.writeD(size);
+ writeInt(size);
+ writeInt(size);
// Listing the Lord and the approved clans
for (SiegeClan siegeclan : _castle.getSiege().getDefenderClans())
{
@@ -77,59 +76,58 @@ public class SiegeDefenderList 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)
+ writeInt(clan.getId());
+ writeString(clan.getName());
+ writeString(clan.getLeaderName());
+ writeInt(clan.getCrestId());
+ writeInt(0); // signed time (seconds) (not storated by L2J)
switch (siegeclan.getType())
{
case OWNER:
{
- packet.writeD(1); // owner
+ writeInt(1); // owner
break;
}
case DEFENDER_PENDING:
{
- packet.writeD(2); // approved
+ writeInt(2); // approved
break;
}
case DEFENDER:
{
- packet.writeD(3); // waiting approved
+ writeInt(3); // waiting approved
break;
}
default:
{
- packet.writeD(0);
+ writeInt(0);
break;
}
}
- packet.writeD(clan.getAllyId());
- packet.writeS(clan.getAllyName());
- packet.writeS(""); // AllyLeaderName
- packet.writeD(clan.getAllyCrestId());
+ writeInt(clan.getAllyId());
+ writeString(clan.getAllyName());
+ writeString(""); // AllyLeaderName
+ writeInt(clan.getAllyCrestId());
}
for (SiegeClan siegeclan : _castle.getSiege().getDefenderWaitingClans())
{
clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
- 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(2); // waiting approval
- 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(2); // waiting approval
+ 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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
index 2061247649..a62e43fc0f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
@@ -19,15 +19,14 @@ 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.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.residences.ClanHall;
import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Shows the Siege Info
@@ -45,7 +44,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 Castle _castle;
private ClanHall _hall;
@@ -64,24 +63,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
{
@@ -90,47 +89,47 @@ 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);
}
}
else
{
- packet.writeD(_hall.getId());
+ writeInt(_hall.getId());
final int ownerId = _hall.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
{
@@ -139,15 +138,14 @@ 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));
- packet.writeD((int) ((CHSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000));
- packet.writeD(0); // number of choices?
+ writeInt((int) (System.currentTimeMillis() / 1000));
+ writeInt((int) ((CHSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000));
+ writeInt(0); // number of choices?
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
index b9877d2c78..a251c04e51 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.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.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<>();
@@ -46,17 +45,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(ts.getSkillLevel());
- packet.writeD((int) ts.getReuse() / 1000);
- packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000);
+ writeInt(ts.getSkillId());
+ writeInt(ts.getSkillLevel());
+ writeInt((int) ts.getReuse() / 1000);
+ writeInt((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
index f482f8541f..41ea2dbe61 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
@@ -19,13 +19,37 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
-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<>();
+ public SkillList()
+ {
+ super(1024);
+ }
+
+ public void addSkill(int id, int level, boolean passive, boolean disabled, boolean enchanted)
+ {
+ _skills.add(new Skill(id, level, passive, disabled, enchanted));
+ }
+
+ @Override
+ public void write()
+ {
+ ServerPackets.SKILL_LIST.writeId(this);
+ writeInt(_skills.size());
+ for (Skill temp : _skills)
+ {
+ writeInt(temp.passive);
+ writeInt(temp.level);
+ writeInt(temp.id);
+ writeByte(temp.disabled);
+ writeByte(temp.enchanted);
+ }
+ }
+
static class Skill
{
public int id;
@@ -43,25 +67,4 @@ public class SkillList implements IClientOutgoingPacket
enchanted = pEnchanted;
}
}
-
- public void addSkill(int id, int level, boolean passive, boolean disabled, boolean enchanted)
- {
- _skills.add(new Skill(id, level, passive, disabled, enchanted));
- }
-
- @Override
- public boolean write(PacketWriter packet)
- {
- OutgoingPackets.SKILL_LIST.writeId(packet);
- packet.writeD(_skills.size());
- for (Skill temp : _skills)
- {
- packet.writeD(temp.passive ? 1 : 0);
- packet.writeD(temp.level);
- packet.writeD(temp.id);
- packet.writeC(temp.disabled ? 1 : 0);
- packet.writeC(temp.enchanted ? 1 : 0);
- }
- return true;
- }
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
index ed4615c403..1a16cb569b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java
index bdc8007239..a914642e3e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
public static final int LEVEL_UP = 2122;
@@ -37,11 +36,10 @@ 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);
- return true;
+ ServerPackets.SOCIAL_ACTION.writeId(this);
+ writeInt(_objectId);
+ writeInt(_actionId);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
index 13f91eae0e..2357469ab1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.RecipeData;
import org.l2jmobius.gameserver.enums.WarehouseListType;
import org.l2jmobius.gameserver.model.RecipeList;
@@ -33,10 +32,10 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.CrystalType;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.model.item.type.MaterialType;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
+public class SortedWareHouseWithdrawalList extends ServerPacket
{
public static final int PRIVATE = 1;
public static final int CLAN = 2;
@@ -684,50 +683,49 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet);
+ ServerPackets.WAREHOUSE_WITHDRAW_LIST.writeId(this);
/*
* 0x01-Private Warehouse 0x02-Clan Warehouse 0x03-Castle Warehouse 0x04-Warehouse
*/
- packet.writeH(_whType);
- packet.writeQ(_playerAdena);
- packet.writeH(_objects.size());
+ writeShort(_whType);
+ writeLong(_playerAdena);
+ writeShort(_objects.size());
for (WarehouseItem item : _objects)
{
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItem().getDisplayId());
- packet.writeD(item.getLocationSlot());
- packet.writeQ(item.getCount());
- packet.writeH(item.getItem().getType2());
- packet.writeH(item.getCustomType1());
- packet.writeH(0); // Can't be equipped in WH
- packet.writeD(item.getItem().getBodyPart());
- packet.writeH(item.getEnchantLevel());
- packet.writeH(item.getCustomType2());
+ writeInt(item.getObjectId());
+ writeInt(item.getItem().getDisplayId());
+ writeInt(item.getLocationSlot());
+ writeLong(item.getCount());
+ writeShort(item.getItem().getType2());
+ writeShort(item.getCustomType1());
+ writeShort(0); // Can't be equipped in WH
+ writeInt(item.getItem().getBodyPart());
+ writeShort(item.getEnchantLevel());
+ writeShort(item.getCustomType2());
if (item.isAugmented())
{
- packet.writeD(item.getAugmentationId());
+ writeInt(item.getAugmentationId());
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(item.getMana());
- packet.writeD(item.getTime());
- packet.writeH(item.getAttackElementType());
- packet.writeH(item.getAttackElementPower());
+ writeInt(item.getMana());
+ writeInt(item.getTime());
+ writeShort(item.getAttackElementType());
+ writeShort(item.getAttackElementPower());
for (byte i = 0; i < 6; i++)
{
- packet.writeH(item.getElementDefAttr(i));
+ writeShort(item.getElementDefAttr(i));
}
// Enchant Effects
for (int op : item.getEnchantOptions())
{
- packet.writeH(op);
+ writeShort(op);
}
- packet.writeD(item.getObjectId());
+ writeInt(item.getObjectId());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index bbaecd7b30..796c04d48d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,19 +29,18 @@ 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.writeD(0); // freya unk
- return true;
+ writeInt(_item.isStackable());
+ writeLong(_item.getCount());
+ writeInt(0); // c2
+ writeInt(0); // freya unk
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
index 04f3ad716c..115f77a029 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpecialString.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpecialString.java
index eaeb804ef3..e981d37780 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpecialString.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpecialString.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 SpecialString implements IClientOutgoingPacket
+public class SpecialString extends ServerPacket
{
private final int _strId;
private final int _fontSize;
@@ -41,16 +40,15 @@ public class SpecialString implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SERVER_CLOSE_SOCKET.writeId(packet);
- packet.writeC(_strId); // string ID
- packet.writeC(_isDraw ? 1 : 0); // 1 - draw / 0 - hide
- packet.writeC(_fontSize); // -1 to 3 (font size)
- packet.writeD(_x); // ClientRight - x
- packet.writeD(_y); // ClientTop + y
- packet.writeD(_color); // AARRGGBB
- packet.writeS(_text); // wide string max len = 63
- return true;
+ ServerPackets.SERVER_CLOSE_SOCKET.writeId(this);
+ writeByte(_strId); // string ID
+ writeByte(_isDraw); // 1 - draw / 0 - hide
+ writeByte(_fontSize); // -1 to 3 (font size)
+ writeInt(_x); // ClientRight - x
+ writeInt(_y); // ClientTop + y
+ writeInt(_color); // AARRGGBB
+ writeString(_text); // wide string max len = 63
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
index 281756e793..cb3303c7b5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java
index 27fb4f606b..486aa63bf4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
index 067bdeb082..f78c0f040b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
index 417f278a96..a18a0d426b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.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.WorldObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StatusUpdate implements IClientOutgoingPacket
+public class StatusUpdate extends ServerPacket
{
public static final int LEVEL = 0x01;
public static final int EXP = 0x02;
@@ -101,16 +100,15 @@ public class StatusUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.STATUS_UPDATE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_attributes.size());
+ ServerPackets.STATUS_UPDATE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_attributes.size());
for (Attribute temp : _attributes)
{
- packet.writeD(temp.id);
- packet.writeD(temp.value);
+ writeInt(temp.id);
+ writeInt(temp.value);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java
index cf2b71df5a..4ea1bdf2e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
index 78fdb5d70c..14d01f9217 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
index b254cad8b1..e5ad3b5baf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java
index 9a6f9dff29..d84ba4760f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.writeC(0); // ?
- return true;
+ ServerPackets.FINISH_ROTATING.writeId(this);
+ writeInt(_objectId);
+ writeInt(_degree);
+ writeInt(_speed);
+ writeByte(0); // ?
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java
index 57307169dc..3cba1f2b4a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SunRise.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.SUNRISE.writeId(packet);
- return true;
+ ServerPackets.SUNRISE.writeId(this);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java
index 6d291a5708..8662055190 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SunSet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.SUNSET.writeId(packet);
- return true;
+ ServerPackets.SUNSET.writeId(this);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
index 6f88551204..8708599430 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index d32332bae5..953b01d07e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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];
@@ -338,9 +337,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)
{
@@ -352,15 +351,16 @@ public class SystemMessage implements IClientOutgoingPacket
{
params[i] = _params[i].getValue();
}
- packet.writeD(SystemMessageId.S1_2.getId());
- packet.writeD(1);
- packet.writeD(TYPE_TEXT);
- packet.writeS(sml.getLocalisation(params));
- return true;
+ writeInt(SystemMessageId.S1_2.getId());
+ writeInt(1);
+ writeInt(TYPE_TEXT);
+ writeString(sml.getLocalisation(params));
+ return;
}
}
- packet.writeD(_smId.getId());
- packet.writeD(_params.length);
+
+ writeInt(_smId.getId());
+ writeInt(_params.length);
for (SMParam param : _params)
{
if (param == null)
@@ -368,18 +368,18 @@ public class SystemMessage implements IClientOutgoingPacket
PacketLogger.warning("Found null parameter for SystemMessageId " + _smId);
continue;
}
- packet.writeD(param.getType());
+ writeInt(param.getType());
switch (param.getType())
{
case TYPE_TEXT:
case TYPE_PLAYER_NAME:
{
- packet.writeS(param.getStringValue());
+ writeString(param.getStringValue());
break;
}
case TYPE_LONG_NUMBER:
{
- packet.writeQ(param.getLongValue());
+ writeLong(param.getLongValue());
break;
}
case TYPE_ITEM_NAME:
@@ -391,26 +391,25 @@ public class SystemMessage implements IClientOutgoingPacket
case TYPE_INSTANCE_NAME:
case TYPE_DOOR_NAME:
{
- packet.writeD(param.getIntValue());
+ writeInt(param.getIntValue());
break;
}
case TYPE_SKILL_NAME:
{
final int[] array = param.getIntArrayValue();
- packet.writeD(array[0]); // SkillId
- packet.writeD(array[1]); // SkillLevel
+ writeInt(array[0]); // SkillId
+ writeInt(array[1]); // SkillLevel
break;
}
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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
index d357efbb0e..942dc7e4b0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
index 3d7208c06f..0d4761877d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
index 461d458678..07187f64e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,15 +37,14 @@ 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);
- return true;
+ ServerPackets.TELEPORT_TO_LOCATION.writeId(this);
+ writeInt(_targetObjId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(0); // Fade 0, Instant 1.
+ writeInt(_heading);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java
index 8d09576d9d..1afd030d4a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
index 4a2e158ede..36f6544b8b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.TradeItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Yme
@@ -34,22 +33,21 @@ public class TradeOtherAdd extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_OTHER_ADD.writeId(packet);
- packet.writeH(1); // item count
- packet.writeH(0);
- packet.writeD(_item.getObjectId());
- packet.writeD(_item.getItem().getDisplayId());
- packet.writeQ(_item.getCount());
- packet.writeH(_item.getItem().getType2()); // item type2
- packet.writeH(_item.getCustomType1());
- packet.writeD(_item.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
- packet.writeH(_item.getEnchant()); // enchant level
- packet.writeH(0);
- packet.writeH(_item.getCustomType2());
+ ServerPackets.TRADE_OTHER_ADD.writeId(this);
+ writeShort(1); // item count
+ writeShort(0);
+ writeInt(_item.getObjectId());
+ writeInt(_item.getItem().getDisplayId());
+ writeLong(_item.getCount());
+ writeShort(_item.getItem().getType2()); // item type2
+ writeShort(_item.getCustomType1());
+ writeInt(_item.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
+ writeShort(_item.getEnchant()); // enchant level
+ writeShort(0);
+ writeShort(_item.getCustomType2());
// T1
- writeItemElementalAndEnchant(packet, new ItemInfo(_item));
- return true;
+ writeItemElementalAndEnchant(new ItemInfo(_item));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
index 7569bb1512..8d9ea7f725 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
index 1aa74ccfef..784d6e1888 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.TradeItem;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Yme
@@ -34,22 +33,21 @@ public class TradeOwnAdd extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_OWN_ADD.writeId(packet);
- packet.writeH(1); // items added count
- packet.writeH(0);
- packet.writeD(_item.getObjectId());
- packet.writeD(_item.getItem().getDisplayId());
- packet.writeQ(_item.getCount());
- packet.writeH(_item.getItem().getType2()); // item type2
- packet.writeH(_item.getCustomType1());
- packet.writeD(_item.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
- packet.writeH(_item.getEnchant()); // enchant level
- packet.writeH(0);
- packet.writeH(_item.getCustomType2());
+ ServerPackets.TRADE_OWN_ADD.writeId(this);
+ writeShort(1); // items added count
+ writeShort(0);
+ writeInt(_item.getObjectId());
+ writeInt(_item.getItem().getDisplayId());
+ writeLong(_item.getCount());
+ writeShort(_item.getItem().getType2()); // item type2
+ writeShort(_item.getCustomType1());
+ writeInt(_item.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
+ writeShort(_item.getEnchant()); // enchant level
+ writeShort(0);
+ writeShort(_item.getCustomType2());
// T1
- writeItemElementalAndEnchant(packet, new ItemInfo(_item));
- return true;
+ writeItemElementalAndEnchant(new ItemInfo(_item));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
index 52de9aeabf..bf8b34c84b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
@@ -19,11 +19,10 @@ 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.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
{
@@ -37,19 +36,19 @@ public class TradeStart extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if ((_player.getActiveTradeList() == null) || (_player.getActiveTradeList().getPartner() == null))
{
- return false;
+ return;
}
- OutgoingPackets.TRADE_START.writeId(packet);
- packet.writeD(_player.getActiveTradeList().getPartner().getObjectId());
- packet.writeH(_itemList.size());
+
+ ServerPackets.TRADE_START.writeId(this);
+ writeInt(_player.getActiveTradeList().getPartner().getObjectId());
+ writeShort(_itemList.size());
for (Item item : _itemList)
{
- writeItem(packet, item);
+ writeItem(item);
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
index f613303948..d1cd301250 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.HtmlActionScope;
import org.l2jmobius.gameserver.model.actor.Player;
-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();
@@ -34,15 +33,14 @@ public class TutorialCloseHtml implements IClientOutgoingPacket
}
@Override
- public void runImpl(Player player)
+ public void run(Player player)
{
player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML);
}
@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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
index 728020c0b1..4053323c7a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
index 91d0f1384f..935a1cd495 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.
@@ -43,11 +42,10 @@ public class TutorialShowHtml extends AbstractHtmlPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet);
- packet.writeS(getHtml());
- return true;
+ ServerPackets.TUTORIAL_SHOW_HTML.writeId(this);
+ writeString(getHtml());
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
index 9e4b8dba17..8cbc96c4ef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.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 TutorialShowQuestionMark implements IClientOutgoingPacket
+public class TutorialShowQuestionMark extends ServerPacket
{
private final int _markId;
@@ -29,10 +28,9 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_TUTORIAL_MARK.writeId(packet);
- packet.writeD(_markId);
- return true;
+ ServerPackets.SHOW_TUTORIAL_MARK.writeId(this);
+ writeInt(_markId);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
index 0da5db8bc8..d5d5f963b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
@@ -25,9 +24,9 @@ import org.l2jmobius.gameserver.model.Elementals;
import org.l2jmobius.gameserver.model.actor.Player;
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 UserInfo implements IClientOutgoingPacket
+public class UserInfo extends ServerPacket
{
private final Player _player;
private int _relation;
@@ -79,158 +78,157 @@ public class UserInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.USER_INFO.writeId(packet);
- packet.writeD(_player.getX());
- packet.writeD(_player.getY());
- packet.writeD(_player.getZ());
- packet.writeD(_player.getVehicle() != null ? _player.getVehicle().getObjectId() : 0);
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getAppearance().getVisibleName());
- packet.writeD(_player.getRace().ordinal());
- packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
- packet.writeD(_player.getBaseClass());
- 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(_player.getMaxHp());
- packet.writeD((int) Math.round(_player.getCurrentHp()));
- packet.writeD(_player.getMaxMp());
- packet.writeD((int) Math.round(_player.getCurrentMp()));
- packet.writeD((int) _player.getSp());
- packet.writeD(_player.getCurrentLoad());
- packet.writeD(_player.getMaxLoad());
- packet.writeD(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped
+ ServerPackets.USER_INFO.writeId(this);
+ writeInt(_player.getX());
+ writeInt(_player.getY());
+ writeInt(_player.getZ());
+ writeInt(_player.getVehicle() != null ? _player.getVehicle().getObjectId() : 0);
+ writeInt(_player.getObjectId());
+ writeString(_player.getAppearance().getVisibleName());
+ writeInt(_player.getRace().ordinal());
+ writeInt(_player.getAppearance().isFemale());
+ writeInt(_player.getBaseClass());
+ 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(_player.getMaxHp());
+ writeInt((int) Math.round(_player.getCurrentHp()));
+ writeInt(_player.getMaxMp());
+ writeInt((int) Math.round(_player.getCurrentMp()));
+ writeInt((int) _player.getSp());
+ writeInt(_player.getCurrentLoad());
+ writeInt(_player.getMaxLoad());
+ writeInt(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped
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 : getPaperdollOrder())
{
- packet.writeD(_player.getInventory().getPaperdollAugmentationId(slot));
+ writeInt(_player.getInventory().getPaperdollAugmentationId(slot));
}
- packet.writeD(_player.getInventory().getTalismanSlots());
- packet.writeD(_player.getInventory().canEquipCloak() ? 1 : 0);
- packet.writeD((int) _player.getPAtk(null));
- packet.writeD((int) _player.getPAtkSpd());
- packet.writeD((int) _player.getPDef(null));
- packet.writeD(_player.getEvasionRate(null));
- packet.writeD(_player.getAccuracy());
- packet.writeD(_player.getCriticalHit(null, null));
- packet.writeD((int) _player.getMAtk(null, null));
- packet.writeD(_player.getMAtkSpd());
- packet.writeD((int) _player.getPAtkSpd());
- packet.writeD((int) _player.getMDef(null, null));
- packet.writeD(_player.getPvpFlag());
- packet.writeD(_player.getKarma());
- 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());
- packet.writeF(_player.getCollisionRadius());
- packet.writeF(_player.getCollisionHeight());
- packet.writeD(_player.getAppearance().getHairStyle());
- packet.writeD(_player.getAppearance().getHairColor());
- packet.writeD(_player.getAppearance().getFace());
- packet.writeD(_player.isGM() ? 1 : 0); // builder level
+ writeInt(_player.getInventory().getTalismanSlots());
+ writeInt(_player.getInventory().canEquipCloak());
+ writeInt((int) _player.getPAtk(null));
+ writeInt((int) _player.getPAtkSpd());
+ writeInt((int) _player.getPDef(null));
+ writeInt(_player.getEvasionRate(null));
+ writeInt(_player.getAccuracy());
+ writeInt(_player.getCriticalHit(null, null));
+ writeInt((int) _player.getMAtk(null, null));
+ writeInt(_player.getMAtkSpd());
+ writeInt((int) _player.getPAtkSpd());
+ writeInt((int) _player.getMDef(null, null));
+ writeInt(_player.getPvpFlag());
+ writeInt(_player.getKarma());
+ writeInt(_runSpd);
+ writeInt(_walkSpd);
+ writeInt(_swimRunSpd);
+ writeInt(_swimWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(_moveMultiplier);
+ writeDouble(_player.getAttackSpeedMultiplier());
+ writeDouble(_player.getCollisionRadius());
+ writeDouble(_player.getCollisionHeight());
+ writeInt(_player.getAppearance().getHairStyle());
+ writeInt(_player.getAppearance().getHairColor());
+ writeInt(_player.getAppearance().getFace());
+ writeInt(_player.isGM()); // builder level
String title = _player.getTitle();
if (_player.isGM() && _player.isInvisible())
{
title = "[Invisible]";
}
- packet.writeS(title);
+ writeString(title);
- packet.writeD(_player.getClanId());
- packet.writeD(_player.getClanCrestId());
- packet.writeD(_player.getAllyId());
- packet.writeD(_player.getAllyCrestId()); // ally crest id
+ writeInt(_player.getClanId());
+ writeInt(_player.getClanCrestId());
+ writeInt(_player.getAllyId());
+ writeInt(_player.getAllyCrestId()); // ally crest id
// 0x40 leader rights
// siege flags: attacker - 0x180 sword over name, defender - 0x80 shield, 0xC0 crown (|leader), 0x1C0 flag (|leader)
- packet.writeD(_relation);
- 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());
+ writeInt(_relation);
+ writeByte(_player.getMountType().ordinal()); // mount type
+ writeByte(_player.getPrivateStoreType().getId());
+ writeByte(_player.hasDwarvenCraft());
+ writeInt(_player.getPkKills());
+ writeInt(_player.getPvpKills());
- packet.writeH(_player.getCubics().size());
+ writeShort(_player.getCubics().size());
for (int cubicId : _player.getCubics().keySet())
{
- packet.writeH(cubicId);
+ writeShort(cubicId);
}
- packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0);
- packet.writeD(_player.isInvisible() ? _player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _player.getAbnormalVisualEffects());
- packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
- packet.writeD(_player.getClanPrivileges().getBitmask());
- packet.writeH(_player.getRecomLeft()); // c2 recommendations remaining
- packet.writeH(_player.getRecomHave()); // c2 recommendations received
- packet.writeD(_player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0);
- packet.writeH(_player.getInventoryLimit());
- 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.isMounted() || (_airShipHelm != 0) ? 0 : _player.getEnchantEffect());
- packet.writeC(_player.getTeam().getId());
- packet.writeD(_player.getClanCrestLargeId());
- packet.writeC(_player.isNoble() ? 1 : 0); // 1: symbol on char menu ctrl+I
- packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 1: Hero Aura
+ writeByte(_player.isInPartyMatchRoom());
+ writeInt(_player.isInvisible() ? _player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _player.getAbnormalVisualEffects());
+ writeByte(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0);
+ writeInt(_player.getClanPrivileges().getBitmask());
+ writeShort(_player.getRecomLeft()); // c2 recommendations remaining
+ writeShort(_player.getRecomHave()); // c2 recommendations received
+ writeInt(_player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0);
+ writeShort(_player.getInventoryLimit());
+ writeInt(_player.getClassId().getId());
+ writeInt(0); // special effects? circles around player...
+ writeInt(_player.getMaxCp());
+ writeInt((int) _player.getCurrentCp());
+ writeByte(_player.isMounted() || (_airShipHelm != 0) ? 0 : _player.getEnchantEffect());
+ writeByte(_player.getTeam().getId());
+ writeInt(_player.getClanCrestLargeId());
+ writeByte(_player.isNoble()); // 1: symbol on char menu ctrl+I
+ writeByte(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA)); // 1: Hero Aura
- packet.writeC(_player.isFishing() ? 1 : 0); // Fishing Mode
- packet.writeD(_player.getFishX()); // fishing x
- packet.writeD(_player.getFishY()); // fishing y
- packet.writeD(_player.getFishZ()); // fishing z
+ writeByte(_player.isFishing()); // Fishing Mode
+ writeInt(_player.getFishX()); // fishing x
+ writeInt(_player.getFishY()); // fishing y
+ writeInt(_player.getFishZ()); // fishing z
- packet.writeD(_player.getAppearance().getNameColor());
+ writeInt(_player.getAppearance().getNameColor());
// new c5
- packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window
- packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window
- packet.writeD(_player.getPledgeType());
- packet.writeD(_player.getAppearance().getTitleColor());
- packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
+ writeByte(_player.isRunning()); // changes the Speed display on Status Window
+ writeInt(_player.getPledgeClass()); // changes the text above CP on Status Window
+ writeInt(_player.getPledgeType());
+ writeInt(_player.getAppearance().getTitleColor());
+ writeInt(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0);
// T1 Starts
- packet.writeD(_player.getTransformationDisplayId());
+ writeInt(_player.getTransformationDisplayId());
final byte attackAttribute = _player.getAttackElement();
- packet.writeH(attackAttribute);
- packet.writeH(_player.getAttackElementValue(attackAttribute));
- packet.writeH(_player.getDefenseElementValue(Elementals.FIRE));
- packet.writeH(_player.getDefenseElementValue(Elementals.WATER));
- packet.writeH(_player.getDefenseElementValue(Elementals.WIND));
- packet.writeH(_player.getDefenseElementValue(Elementals.EARTH));
- packet.writeH(_player.getDefenseElementValue(Elementals.HOLY));
- packet.writeH(_player.getDefenseElementValue(Elementals.DARK));
- packet.writeD(_player.getAgathionId());
+ writeShort(attackAttribute);
+ writeShort(_player.getAttackElementValue(attackAttribute));
+ writeShort(_player.getDefenseElementValue(Elementals.FIRE));
+ writeShort(_player.getDefenseElementValue(Elementals.WATER));
+ writeShort(_player.getDefenseElementValue(Elementals.WIND));
+ writeShort(_player.getDefenseElementValue(Elementals.EARTH));
+ writeShort(_player.getDefenseElementValue(Elementals.HOLY));
+ writeShort(_player.getDefenseElementValue(Elementals.DARK));
+ writeInt(_player.getAgathionId());
// T2 Starts
- packet.writeD(_player.getFame()); // Fame
- packet.writeD(_player.isMinimapAllowed() ? 1 : 0); // Minimap on Hellbound
- packet.writeD(_player.getVitalityPoints()); // Vitality Points
- packet.writeD(_player.getAbnormalVisualEffectSpecial());
- // packet.writeD(_territoryId); // CT2.3
- // packet.writeD((_isDisguised ? 1: 0)); // CT2.3
- // packet.writeD(_territoryId); // CT2.3
- return true;
+ writeInt(_player.getFame()); // Fame
+ writeInt(_player.isMinimapAllowed()); // Minimap on Hellbound
+ writeInt(_player.getVitalityPoints()); // Vitality Points
+ writeInt(_player.getAbnormalVisualEffectSpecial());
+ // writeInt(_territoryId); // CT2.3
+ // writeInt((_isDisguised ? 1: 0)); // CT2.3
+ // writeInt(_territoryId); // CT2.3
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
index c0e8db5c66..3e13461b1d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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,14 +32,13 @@ 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());
- return true;
+ ServerPackets.VALIDATE_LOCATION.writeId(this);
+ writeInt(_objectId);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeInt(_loc.getHeading());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
index 4370d9cd4a..8ae443a706 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -40,15 +39,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
index 7e30bef6bc..e0debf7530 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -36,14 +35,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
index 15d7d858d4..c69eeb300c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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;
@@ -46,15 +45,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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
index 4a995a6352..05a266992a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
index bf629dcbbc..a416efdd6a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
index f4e5784249..6cf0c88dcb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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
{
@@ -58,17 +57,16 @@ public class WareHouseDepositList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet);
- packet.writeH(_whType);
- packet.writeQ(_playerAdena);
- packet.writeH(_items.size());
+ ServerPackets.WAREHOUSE_DEPOSIT_LIST.writeId(this);
+ writeShort(_whType);
+ writeLong(_playerAdena);
+ writeShort(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
index 4477cd33a3..059fe2525a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.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.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
public class WareHouseWithdrawalList extends AbstractItemPacket
{
@@ -56,17 +55,16 @@ public class WareHouseWithdrawalList extends AbstractItemPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet);
- packet.writeH(_whType);
- packet.writeQ(_playerAdena);
- packet.writeH(_items.size());
+ ServerPackets.WAREHOUSE_WITHDRAW_LIST.writeId(this);
+ writeShort(_whType);
+ writeLong(_playerAdena);
+ writeShort(_items.size());
for (Item item : _items)
{
- writeItem(packet, item);
- packet.writeD(item.getObjectId());
+ writeItem(item);
+ writeInt(item.getObjectId());
}
- return true;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServer.java
deleted file mode 100644
index 53d7214818..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServer.java
+++ /dev/null
@@ -1,140 +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.telnet;
-
-import java.net.InetSocketAddress;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-
-/**
- * @author UnAfraid
- */
-public class TelnetServer
-{
- private static final Logger LOGGER = Logger.getLogger(TelnetServer.class.getName());
- private final Map _commands = new LinkedHashMap<>();
- private final EventLoopGroup _workerGroup = new NioEventLoopGroup(1);
-
- protected TelnetServer()
- {
- if (Config.TELNET_ENABLED)
- {
- init();
- }
- else
- {
- LOGGER.info("Telnet server is currently disabled.");
- }
- }
-
- private void init()
- {
- addHandler(new ITelnetCommand()
- {
- @Override
- public String getCommand()
- {
- return "help";
- }
-
- @Override
- public String getUsage()
- {
- return "help [command]";
- }
-
- @Override
- public String handle(ChannelHandlerContext ctx, String[] args)
- {
- if (args.length == 0)
- {
- final StringBuilder sb = new StringBuilder("Available commands:" + Config.EOL);
- for (ITelnetCommand cmd : TelnetServer.getInstance().getCommands())
- {
- sb.append(cmd.getCommand() + Config.EOL);
- }
- return sb.toString();
- }
- final ITelnetCommand cmd = TelnetServer.getInstance().getCommand(args[0]);
- if (cmd == null)
- {
- return "Unknown command." + Config.EOL;
- }
- return "Usage:" + Config.EOL + cmd.getUsage() + Config.EOL;
- }
- });
-
- try
- {
- final InetSocketAddress socket = Config.TELNET_HOSTNAME.equals("*") ? new InetSocketAddress(Config.TELNET_PORT) : new InetSocketAddress(Config.TELNET_HOSTNAME, Config.TELNET_PORT);
- //@formatter:off
- new ServerBootstrap().group(_workerGroup)
- .channel(NioServerSocketChannel.class)
- //.option(ChannelOption.SO_KEEPALIVE, true)
- .childHandler(new TelnetServerInitializer())
- .bind(socket);
- //@formatter:on
- LOGGER.info(getClass().getSimpleName() + ": Listening on " + Config.TELNET_HOSTNAME + ":" + Config.TELNET_PORT);
- }
- catch (Exception e)
- {
- LOGGER.log(Level.WARNING, e.getMessage(), e);
- }
- }
-
- public void addHandler(ITelnetCommand handler)
- {
- _commands.put(handler.getCommand(), handler);
- }
-
- public ITelnetCommand getCommand(String command)
- {
- return _commands.get(command);
- }
-
- public Collection getCommands()
- {
- return _commands.values();
- }
-
- public void shutdown()
- {
- _workerGroup.shutdownGracefully();
- LOGGER.info("Shutting down..");
- }
-
- public static TelnetServer getInstance()
- {
- return SingletonHolder.INSTANCE;
- }
-
- private static class SingletonHolder
- {
- protected static final TelnetServer INSTANCE = new TelnetServer();
- }
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServerHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServerHandler.java
deleted file mode 100644
index bbff0af5ee..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServerHandler.java
+++ /dev/null
@@ -1,172 +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.telnet;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.l2jmobius.Config;
-
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandler.Sharable;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.util.AttributeKey;
-
-/**
- * @author UnAfraid
- */
-@Sharable
-public class TelnetServerHandler extends ChannelInboundHandlerAdapter
-{
- private static final Pattern COMMAND_ARGS_PATTERN = Pattern.compile("\"([^\"]*)\"|([^\\s]+)");
- private static final AttributeKey AUTHORIZED = AttributeKey.valueOf(TelnetServerHandler.class, "AUTHORIZED");
-
- private String tryHandleCommand(ChannelHandlerContext ctx, String command, String[] args)
- {
- final ITelnetCommand cmd = TelnetServer.getInstance().getCommand(command);
- if (cmd == null)
- {
- return "Unknown command." + Config.EOL;
- }
-
- String response = cmd.handle(ctx, args);
- if (response == null)
- {
- response = "Usage:" + Config.EOL + cmd.getUsage() + Config.EOL;
- }
-
- return response;
- }
-
- @Override
- public void handlerAdded(ChannelHandlerContext ctx)
- {
- String ip = ctx.channel().remoteAddress().toString();
- ip = ip.substring(1, ip.lastIndexOf(':')); // Trim out /127.0.0.1:14013
- if (!Config.TELNET_HOSTS.contains(ip))
- {
- final ChannelFuture future = ctx.write("Your ip: " + ip + " is not allowed to connect." + Config.EOL);
- future.addListener(ChannelFutureListener.CLOSE);
- ctx.flush();
- return;
- }
-
- // Send greeting for a new connection.
- ctx.write("Welcome to the telnet session." + Config.EOL);
- ctx.write("It is " + new Date() + " now." + Config.EOL);
- ctx.write("Please enter your password:" + Config.EOL);
- if (!Config.TELNET_PASSWORD.isEmpty())
- {
- // Ask password
- ctx.write("Password:");
- ctx.channel().attr(AUTHORIZED).set(Boolean.FALSE);
- }
- else
- {
- ctx.write("Type 'help' to see all available commands." + Config.EOL);
- ctx.channel().attr(AUTHORIZED).set(Boolean.TRUE);
- }
- ctx.flush();
- }
-
- @Override
- public void channelRead(ChannelHandlerContext ctx, Object msg)
- {
- // Cast to a String first.
- // We know it is a String because we put some codec in TelnetPipelineFactory.
- String request = (String) msg;
-
- // Generate and write a response.
- String response = null;
- boolean close = false;
- if (Boolean.FALSE.equals(ctx.channel().attr(AUTHORIZED).get()))
- {
- if (Config.TELNET_PASSWORD.equals(request))
- {
- ctx.channel().attr(AUTHORIZED).set(Boolean.TRUE);
- request = "";
- }
- else
- {
- response = "Wrong password!" + Config.EOL;
- close = true;
- }
- }
-
- if (Boolean.TRUE.equals(ctx.channel().attr(AUTHORIZED).get()))
- {
- if (request.isEmpty())
- {
- response = "Type 'help' to see all available commands." + Config.EOL;
- }
- else if (request.equalsIgnoreCase("exit"))
- {
- response = "Have a good day!" + Config.EOL;
- close = true;
- }
- else
- {
- final Matcher m = COMMAND_ARGS_PATTERN.matcher(request);
- if (m.find())
- {
- final String command = m.group();
- final List args = new ArrayList<>();
- String arg;
-
- while (m.find())
- {
- arg = m.group(1);
- if (arg == null)
- {
- arg = m.group(0);
- }
-
- args.add(arg);
- }
-
- response = tryHandleCommand(ctx, command, args.toArray(new String[args.size()]));
- if (!response.endsWith(Config.EOL))
- {
- response += Config.EOL;
- }
- }
- }
- }
-
- // We do not need to write a ChannelBuffer here.
- // We know the encoder inserted at TelnetPipelineFactory will do the conversion.
- final ChannelFuture future = ctx.write(response);
-
- // Close the connection after sending 'Have a good day!'
- // if the client has sent 'exit'.
- if (close)
- {
- future.addListener(ChannelFutureListener.CLOSE);
- }
- }
-
- @Override
- public void channelReadComplete(ChannelHandlerContext ctx)
- {
- ctx.flush();
- }
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServerInitializer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServerInitializer.java
deleted file mode 100644
index d293fec0e1..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/telnet/TelnetServerInitializer.java
+++ /dev/null
@@ -1,47 +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.telnet;
-
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.DelimiterBasedFrameDecoder;
-import io.netty.handler.codec.Delimiters;
-import io.netty.handler.codec.string.StringDecoder;
-import io.netty.handler.codec.string.StringEncoder;
-
-/**
- * @author UnAfraid
- */
-public class TelnetServerInitializer extends ChannelInitializer
-{
- private static final StringEncoder ENCODER = new StringEncoder();
- private static final StringDecoder DECODER = new StringDecoder();
- private static final TelnetServerHandler HANDLER = new TelnetServerHandler();
-
- @Override
- public void initChannel(SocketChannel ch)
- {
- final ChannelPipeline pipeline = ch.pipeline();
-
- // Add the text line codec combination first,
- pipeline.addLast(new DelimiterBasedFrameDecoder(8192, Delimiters.lineDelimiter()));
- pipeline.addLast(DECODER);
- pipeline.addLast(ENCODER);
- pipeline.addLast(HANDLER);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 44ad3f2c11..d58d80d1bf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -206,9 +206,9 @@ public class SecondaryPasswordAuth
}
else
{
- LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime());
- LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink());
- LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row.");
+ LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getIp(), SecondaryAuthData.getInstance().getBanTime());
+ LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getIp(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink());
+ LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getIp() + ") has inputted the wrong password " + _wrongAttempts + " times in row.");
insertWrongAttempt(0);
_activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts()));
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
index 3507f3739e..7e7d329533 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.network.serverpackets.CharInfo;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
-import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $
@@ -48,15 +48,15 @@ public class Broadcast
* In order to inform other players of state modification on the Creature, server just need to go through _knownPlayers to send Server->Client Packet
* Caution: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)
* @param creature
- * @param mov
+ * @param packet
*/
- public static void toPlayersTargettingMyself(Creature creature, IClientOutgoingPacket mov)
+ public static void toPlayersTargettingMyself(Creature creature, ServerPacket packet)
{
World.getInstance().forEachVisibleObject(creature, Player.class, player ->
{
if (player.getTarget() == creature)
{
- player.sendPacket(mov);
+ player.sendPacket(packet);
}
});
}
@@ -70,16 +70,16 @@ public class Broadcast
* In order to inform other players of state modification on the Creature, server just need to go through _knownPlayers to send Server->Client Packet
* Caution: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)
* @param creature
- * @param mov
+ * @param packet
*/
- public static void toKnownPlayers(Creature creature, IClientOutgoingPacket mov)
+ public static void toKnownPlayers(Creature creature, ServerPacket packet)
{
World.getInstance().forEachVisibleObject(creature, Player.class, player ->
{
try
{
- player.sendPacket(mov);
- if ((mov instanceof CharInfo) && creature.isPlayer())
+ player.sendPacket(packet);
+ if ((packet instanceof CharInfo) && creature.isPlayer())
{
final int relation = ((Player) creature).getRelation(player);
final boolean isAutoAttackable = creature.isAutoAttackable(player);
@@ -114,7 +114,7 @@ public class Broadcast
* @param packet
* @param radiusValue
*/
- public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
+ public static void toKnownPlayersInRadius(Creature creature, ServerPacket packet, int radiusValue)
{
int radius = radiusValue;
if (radius < 0)
@@ -133,20 +133,20 @@ public class Broadcast
* Player in the detection area of the Creature are identified in _knownPlayers.
* In order to inform other players of state modification on the Creature, server just need to go through _knownPlayers to send Server->Client Packet
* @param creature
- * @param mov
+ * @param packet
*/
- public static void toSelfAndKnownPlayers(Creature creature, IClientOutgoingPacket mov)
+ public static void toSelfAndKnownPlayers(Creature creature, ServerPacket packet)
{
if (creature.isPlayer())
{
- creature.sendPacket(mov);
+ creature.sendPacket(packet);
}
- toKnownPlayers(creature, mov);
+ toKnownPlayers(creature, packet);
}
// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
- public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
+ public static void toSelfAndKnownPlayersInRadius(Creature creature, ServerPacket packet, int radiusValue)
{
int radius = radiusValue;
if (radius < 0)
@@ -171,7 +171,7 @@ public class Broadcast
* Caution: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)
* @param packet
*/
- public static void toAllOnlinePlayers(IClientOutgoingPacket packet)
+ public static void toAllOnlinePlayers(ServerPacket packet)
{
for (Player player : World.getInstance().getPlayers())
{
@@ -192,7 +192,7 @@ public class Broadcast
toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text));
}
- public static void toPlayersInInstance(IClientOutgoingPacket packet, int instanceId)
+ public static void toPlayersInInstance(ServerPacket packet, int instanceId)
{
for (Player player : World.getInstance().getPlayers())
{
@@ -214,7 +214,7 @@ public class Broadcast
* @param zoneType : The zone type to send packets.
* @param packets : The packets to send.
*/
- public static void toAllPlayersInZoneType(Class zoneType, IClientOutgoingPacket... packets)
+ public static void toAllPlayersInZoneType(Class zoneType, ServerPacket... packets)
{
for (ZoneType zone : ZoneManager.getInstance().getAllZones(zoneType))
{
@@ -225,7 +225,7 @@ public class Broadcast
continue;
}
- for (IClientOutgoingPacket packet : packets)
+ for (ServerPacket packet : packets)
{
creature.sendPacket(packet);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
index 96758c73fc..6987cb5933 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
@@ -190,7 +190,7 @@ public class FloodProtectorAction
{
if (!_client.isDetached())
{
- address = _client.getConnectionAddress().getHostAddress();
+ address = _client.getIp();
}
}
catch (Exception e)
@@ -198,7 +198,7 @@ public class FloodProtectorAction
// Ignore.
}
- final ConnectionState state = (ConnectionState) _client.getConnectionState();
+ final ConnectionState state = _client.getConnectionState();
switch (state)
{
case ENTERING:
@@ -232,7 +232,7 @@ public class FloodProtectorAction
}
default:
{
- throw new IllegalStateException("Missing state on switch");
+ throw new IllegalStateException("Missing state on switch.");
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/AccountingFormatter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/AccountingFormatter.java
index b60321d100..e01de86af7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/AccountingFormatter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/AccountingFormatter.java
@@ -24,7 +24,6 @@ import java.util.logging.LogRecord;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.GameClient;
public class AccountingFormatter extends Formatter
@@ -56,7 +55,7 @@ public class AccountingFormatter extends Formatter
{
if (!client.isDetached())
{
- address = client.getConnectionAddress().getHostAddress();
+ address = client.getIp();
}
}
catch (Exception e)
@@ -64,7 +63,7 @@ public class AccountingFormatter extends Formatter
// Ignore.
}
- switch ((ConnectionState) client.getConnectionState())
+ switch (client.getConnectionState())
{
case ENTERING:
case IN_GAME:
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java
index b7a9ef5e05..0573e931de 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java
@@ -54,7 +54,7 @@ public class EnchantFormatter extends Formatter
StringUtil.append(output, "Character:", player.getName(), " [" + player.getObjectId() + "] Account:", player.getAccountName());
if ((player.getClient() != null) && !player.getClient().isDetached())
{
- StringUtil.append(output, " IP:", player.getClient().getConnectionAddress().getHostAddress());
+ StringUtil.append(output, " IP:", player.getClient().getIp());
}
}
else if (p instanceof Item)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java
index fd6d1474e5..b7fa1265a5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -27,11 +27,11 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
-import org.l2jmobius.commons.network.BaseSendablePacket;
-import org.l2jmobius.commons.util.crypt.NewCrypt;
-import org.l2jmobius.commons.util.crypt.ScrambledKeyPair;
+import org.l2jmobius.commons.crypt.NewCrypt;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.GameServerTable.GameServerInfo;
import org.l2jmobius.loginserver.network.GameServerPacketHandler;
+import org.l2jmobius.loginserver.network.ScrambledKeyPair;
import org.l2jmobius.loginserver.network.GameServerPacketHandler.GameServerState;
import org.l2jmobius.loginserver.network.loginserverpackets.ChangePasswordResponse;
import org.l2jmobius.loginserver.network.loginserverpackets.InitLS;
@@ -46,6 +46,10 @@ import org.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters;
public class GameServerThread extends Thread
{
protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName());
+
+ /** Authed Clients on GameServer */
+ private final Set _accountsOnGameServer = ConcurrentHashMap.newKeySet();
+
private final Socket _connection;
private InputStream _in;
private OutputStream _out;
@@ -53,15 +57,9 @@ public class GameServerThread extends Thread
private final RSAPrivateKey _privateKey;
private NewCrypt _blowfish;
private GameServerState _loginConnectionState = GameServerState.CONNECTED;
-
private final String _connectionIp;
-
- private GameServerInfo _gsi;
-
- /** Authed Clients on a GameServer */
- private final Set _accountsOnGameServer = ConcurrentHashMap.newKeySet();
-
private String _connectionIPAddress;
+ private GameServerInfo _gsi;
@Override
public void run()
@@ -220,29 +218,39 @@ public class GameServerThread extends Thread
start();
}
- /**
- * @param sl
- */
- public void sendPacket(BaseSendablePacket sl)
+ public void sendPacket(WritablePacket packet)
{
try
{
- final byte[] data = sl.getContent();
- NewCrypt.appendChecksum(data);
- _blowfish.crypt(data, 0, data.length);
+ packet.write(); // write initial data
+ packet.writeInt(0); // reserved for checksum
+ int size = packet.getLength() - 2; // size without header
+ final int padding = size % 8; // padding of 8 bytes
+ if (padding != 0)
+ {
+ for (int i = padding; i < 8; i++)
+ {
+ packet.writeByte(0);
+ }
+ }
+
+ // size header + encrypted[data + checksum (int) + padding]
+ final byte[] data = packet.getSendableBytes();
+
+ // encrypt
+ size = data.length - 2; // data size without header
+ NewCrypt.appendChecksum(data, 2, size);
+ _blowfish.crypt(data, 2, size);
- final int len = data.length + 2;
synchronized (_out)
{
- _out.write(len & 0xff);
- _out.write((len >> 8) & 0xff);
_out.write(data);
_out.flush();
}
}
catch (IOException e)
{
- LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName());
+ LOGGER.severe("IOException while sending packet " + packet.getClass().getSimpleName());
}
}
@@ -256,7 +264,7 @@ public class GameServerThread extends Thread
sendPacket(new RequestCharacters(account));
}
- public void ChangePasswordResponse(byte successful, String characterName, String msgToSend)
+ public void changePasswordResponse(byte successful, String characterName, String msgToSend)
{
sendPacket(new ChangePasswordResponse(successful, characterName, msgToSend));
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java
index 86bdd3e14d..adedad3f58 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java
@@ -16,8 +16,6 @@
*/
package org.l2jmobius.loginserver;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.KeyPairGenerator;
@@ -42,12 +40,12 @@ import javax.crypto.SecretKey;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.commons.util.crypt.ScrambledKeyPair;
import org.l2jmobius.loginserver.GameServerTable.GameServerInfo;
import org.l2jmobius.loginserver.enums.LoginFailReason;
import org.l2jmobius.loginserver.enums.LoginResult;
import org.l2jmobius.loginserver.model.data.AccountInfo;
import org.l2jmobius.loginserver.network.LoginClient;
+import org.l2jmobius.loginserver.network.ScrambledKeyPair;
public class LoginController
{
@@ -61,8 +59,8 @@ public class LoginController
/** Authed Clients on LoginServer */
protected Map _loginServerClients = new ConcurrentHashMap<>();
- private final Map _failedLoginAttemps = new HashMap<>();
- private final Map _bannedIps = new ConcurrentHashMap<>();
+ private final Map _failedLoginAttemps = new HashMap<>();
+ private final Map _bannedIps = new ConcurrentHashMap<>();
private final ScrambledKeyPair[] _keyPairs;
private final KeyGenerator _blowfishKeyGenerator;
@@ -123,12 +121,12 @@ public class LoginController
return _loginServerClients.get(account);
}
- public AccountInfo retriveAccountInfo(InetAddress clientAddr, String login, String password)
+ public AccountInfo retriveAccountInfo(String clientAddr, String login, String password)
{
return retriveAccountInfo(clientAddr, login, password, true);
}
- private void recordFailedLoginAttemp(InetAddress addr)
+ private void recordFailedLoginAttemp(String addr)
{
// We need to synchronize this!
// When multiple connections from the same address fail to login at the
@@ -154,19 +152,19 @@ public class LoginController
addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000);
// we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts
clearFailedLoginAttemps(addr);
- LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attempts.");
+ LOGGER.warning("Added banned address " + addr + "! Too many login attempts.");
}
}
- private void clearFailedLoginAttemps(InetAddress addr)
+ private void clearFailedLoginAttemps(String clientAddr)
{
synchronized (_failedLoginAttemps)
{
- _failedLoginAttemps.remove(addr);
+ _failedLoginAttemps.remove(clientAddr);
}
}
- private AccountInfo retriveAccountInfo(InetAddress addr, String login, String password, boolean autoCreateIfEnabled)
+ private AccountInfo retriveAccountInfo(String clientAddr, String login, String password, boolean autoCreateIfEnabled)
{
try
{
@@ -187,11 +185,11 @@ public class LoginController
if (!info.checkPassHash(hashBase64))
{
// wrong password
- recordFailedLoginAttemp(addr);
+ recordFailedLoginAttemp(clientAddr);
return null;
}
- clearFailedLoginAttemps(addr);
+ clearFailedLoginAttemps(clientAddr);
return info;
}
}
@@ -200,7 +198,7 @@ public class LoginController
if (!autoCreateIfEnabled || !Config.AUTO_CREATE_ACCOUNTS)
{
// account does not exist and auto create account is not desired
- recordFailedLoginAttemp(addr);
+ recordFailedLoginAttemp(clientAddr);
return null;
}
@@ -211,7 +209,7 @@ public class LoginController
ps.setString(2, hashBase64);
ps.setLong(3, System.currentTimeMillis());
ps.setInt(4, 0);
- ps.setString(5, addr.getHostAddress());
+ ps.setString(5, clientAddr);
ps.execute();
}
catch (Exception e)
@@ -221,7 +219,7 @@ public class LoginController
}
LOGGER.info("Auto created account '" + login + "'.");
- return retriveAccountInfo(addr, login, password, false);
+ return retriveAccountInfo(clientAddr, login, password, false);
}
catch (Exception e)
{
@@ -230,7 +228,7 @@ public class LoginController
}
}
- public LoginResult tryCheckinAccount(LoginClient client, InetAddress address, AccountInfo info)
+ public LoginResult tryCheckinAccount(LoginClient client, String address, AccountInfo info)
{
if (info.getAccessLevel() < 0)
{
@@ -256,49 +254,45 @@ public class LoginController
return ret;
}
- /**
- * Adds the address to the ban list of the login server, with the given end time in milliseconds.
- * @param address The Address to be banned.
- * @param expiration Timestamp in milliseconds when this ban expires
- * @throws UnknownHostException if the address is invalid.
- */
- public void addBanForAddress(String address, long expiration) throws UnknownHostException
- {
- _bannedIps.putIfAbsent(InetAddress.getByName(address), expiration);
- }
-
/**
* Adds the address to the ban list of the login server, with the given duration.
* @param address The Address to be banned.
* @param duration is milliseconds
*/
- public void addBanForAddress(InetAddress address, long duration)
+ public void addBanForAddress(String address, long duration)
{
- _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration);
+ if (duration > 0)
+ {
+ _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration);
+ }
+ else // Permanent ban.
+ {
+ _bannedIps.putIfAbsent(address, Long.MAX_VALUE);
+ }
}
- public boolean isBannedAddress(InetAddress address) throws UnknownHostException
+ public boolean isBannedAddress(String address)
{
- final String[] parts = address.getHostAddress().split("\\.");
+ final String[] parts = address.split("\\.");
Long bi = _bannedIps.get(address);
if (bi == null)
{
- bi = _bannedIps.get(InetAddress.getByName(parts[0] + "." + parts[1] + "." + parts[2] + ".0"));
+ bi = _bannedIps.get(parts[0] + "." + parts[1] + "." + parts[2] + ".0");
}
if (bi == null)
{
- bi = _bannedIps.get(InetAddress.getByName(parts[0] + "." + parts[1] + ".0.0"));
+ bi = _bannedIps.get(parts[0] + "." + parts[1] + ".0.0");
}
if (bi == null)
{
- bi = _bannedIps.get(InetAddress.getByName(parts[0] + ".0.0.0"));
+ bi = _bannedIps.get(parts[0] + ".0.0.0");
}
if (bi != null)
{
if ((bi > 0) && (bi < System.currentTimeMillis()))
{
_bannedIps.remove(address);
- LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + ".");
+ LOGGER.info("Removed expired ip address ban " + address + ".");
return false;
}
return true;
@@ -306,7 +300,7 @@ public class LoginController
return false;
}
- public Map getBannedIps()
+ public Map getBannedIps()
{
return _bannedIps;
}
@@ -316,26 +310,9 @@ public class LoginController
* @param address The address to be removed from the ban list
* @return true if the ban was removed, false if there was no ban for this ip
*/
- public boolean removeBanForAddress(InetAddress address)
- {
- return _bannedIps.remove(address) != null;
- }
-
- /**
- * Remove the specified address from the ban list
- * @param address The address to be removed from the ban list
- * @return true if the ban was removed, false if there was no ban for this ip or the address was invalid.
- */
public boolean removeBanForAddress(String address)
{
- try
- {
- return removeBanForAddress(InetAddress.getByName(address));
- }
- catch (UnknownHostException e)
- {
- return false;
- }
+ return _bannedIps.remove(address) != null;
}
public SessionKey getKeyForAccount(String account)
@@ -487,12 +464,12 @@ public class LoginController
* @param info the account info to checkin
* @return true when ok to checkin, false otherwise
*/
- public boolean canCheckin(LoginClient client, InetAddress address, AccountInfo info)
+ public boolean canCheckin(LoginClient client, String address, AccountInfo info)
{
try
{
- final List ipWhiteList = new ArrayList<>();
- final List ipBlackList = new ArrayList<>();
+ final List ipWhiteList = new ArrayList<>();
+ final List ipBlackList = new ArrayList<>();
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(ACCOUNT_IPAUTH_SELECT))
{
@@ -511,11 +488,11 @@ public class LoginController
}
if (type.equals("allow"))
{
- ipWhiteList.add(InetAddress.getByName(ip));
+ ipWhiteList.add(ip);
}
else if (type.equals("deny"))
{
- ipBlackList.add(InetAddress.getByName(ip));
+ ipBlackList.add(ip);
}
}
}
@@ -526,13 +503,13 @@ public class LoginController
{
if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address))
{
- LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'.");
+ LOGGER.warning("Account checkin attemp from address(" + address + ") not present on whitelist for account '" + info.getLogin() + "'.");
return false;
}
if (!ipBlackList.isEmpty() && ipBlackList.contains(address))
{
- LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'.");
+ LOGGER.warning("Account checkin attemp from address(" + address + ") on blacklist for account '" + info.getLogin() + "'.");
return false;
}
}
@@ -543,7 +520,7 @@ public class LoginController
PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE))
{
ps.setLong(1, System.currentTimeMillis());
- ps.setString(2, address.getHostAddress());
+ ps.setString(2, address);
ps.setString(3, info.getLogin());
ps.execute();
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java
index d3dc93da11..659bd29260 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
-import java.net.UnknownHostException;
import java.security.GeneralSecurityException;
import java.util.logging.Level;
import java.util.logging.LogManager;
@@ -33,9 +32,11 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseBackup;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.enums.ServerMode;
+import org.l2jmobius.commons.network.NetServer;
import org.l2jmobius.commons.util.PropertiesParser;
import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
-import org.l2jmobius.loginserver.network.ClientNetworkManager;
+import org.l2jmobius.loginserver.network.LoginClient;
+import org.l2jmobius.loginserver.network.LoginPacketHandler;
import org.l2jmobius.loginserver.ui.Gui;
/**
@@ -128,7 +129,13 @@ public class LoginServer
System.exit(1);
}
- ClientNetworkManager.getInstance().start();
+ final NetServer server = new NetServer<>(Config.LOGIN_BIND_ADDRESS, Config.PORT_LOGIN, new LoginPacketHandler(), LoginClient::new);
+ server.setName(getClass().getSimpleName());
+ server.getNetConfig().setReadPoolSize(2000);
+ server.getNetConfig().setExecutePoolSize(2000);
+ server.getNetConfig().setPacketQueueLimit(10);
+ server.getNetConfig().setPacketFloodDisconnect(true);
+ server.start();
}
public GameServerListener getGameServerListener()
@@ -174,7 +181,7 @@ public class LoginServer
{
LoginController.getInstance().addBanForAddress(address, duration);
}
- catch (UnknownHostException e)
+ catch (Exception e)
{
LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber());
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/enums/LoginFailReason.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/enums/LoginFailReason.java
index 880b631caf..f1e7b9e0af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/enums/LoginFailReason.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/enums/LoginFailReason.java
@@ -23,6 +23,7 @@ public enum LoginFailReason
REASON_USER_OR_PASS_WRONG(0x02),
REASON_ACCESS_FAILED_TRY_AGAIN_LATER(0x04),
REASON_ACCOUNT_INFO_INCORRECT_CONTACT_SUPPORT(0x05),
+ REASON_NOT_AUTHED(0x06),
REASON_ACCOUNT_IN_USE(0x07),
REASON_UNDER_18_YEARS_KR(0x0C),
REASON_SERVER_OVERLOADED(0x0F),
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/BannedIpFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/BannedIpFilter.java
deleted file mode 100644
index b7e2f1a9af..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/BannedIpFilter.java
+++ /dev/null
@@ -1,39 +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.loginserver.network;
-
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-
-import org.l2jmobius.loginserver.LoginController;
-
-import io.netty.channel.ChannelHandler.Sharable;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.ipfilter.AbstractRemoteAddressFilter;
-
-/**
- * @author lord_rex
- */
-@Sharable
-public class BannedIpFilter extends AbstractRemoteAddressFilter
-{
- @Override
- protected boolean accept(ChannelHandlerContext ctx, InetSocketAddress remoteAddress) throws UnknownHostException
- {
- return !LoginController.getInstance().isBannedAddress(remoteAddress.getAddress());
- }
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ClientInitializer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ClientInitializer.java
deleted file mode 100644
index af12a738c2..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ClientInitializer.java
+++ /dev/null
@@ -1,56 +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.loginserver.network;
-
-import java.nio.ByteOrder;
-
-import javax.crypto.SecretKey;
-
-import org.l2jmobius.commons.network.codecs.CryptCodec;
-import org.l2jmobius.commons.network.codecs.LengthFieldBasedFrameEncoder;
-import org.l2jmobius.commons.network.codecs.PacketDecoder;
-import org.l2jmobius.commons.network.codecs.PacketEncoder;
-import org.l2jmobius.commons.util.crypt.LoginCrypt;
-import org.l2jmobius.loginserver.LoginController;
-
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-
-/**
- * @author Nos
- */
-public class ClientInitializer extends ChannelInitializer
-{
- private static final LengthFieldBasedFrameEncoder LENGTH_ENCODER = new LengthFieldBasedFrameEncoder();
- private static final PacketEncoder PACKET_ENCODER = new PacketEncoder(0x8000 - 2);
-
- @Override
- protected void initChannel(SocketChannel ch)
- {
- final SecretKey newKey = LoginController.getInstance().generateBlowfishKey();
- final LoginClient client = new LoginClient(newKey);
- ch.pipeline().addLast(new BannedIpFilter());
- ch.pipeline().addLast("length-decoder", new LengthFieldBasedFrameDecoder(ByteOrder.LITTLE_ENDIAN, 0x8000 - 2, 0, 2, -2, 2, false));
- ch.pipeline().addLast("length-encoder", LENGTH_ENCODER);
- ch.pipeline().addLast("crypt-codec", new CryptCodec(new LoginCrypt(newKey)));
- // ch.pipeline().addLast(new LoggingHandler(LogLevel.INFO));
- ch.pipeline().addLast("packet-decoder", new PacketDecoder<>(IncomingPackets.PACKET_ARRAY, client));
- ch.pipeline().addLast("packet-encoder", PACKET_ENCODER);
- ch.pipeline().addLast(client);
- }
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ClientNetworkManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ClientNetworkManager.java
deleted file mode 100644
index c39f9e6c05..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ClientNetworkManager.java
+++ /dev/null
@@ -1,41 +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.loginserver.network;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.NetworkManager;
-
-/**
- * @author Nos
- */
-public class ClientNetworkManager extends NetworkManager
-{
- protected ClientNetworkManager()
- {
- super(EventLoopGroupManager.getInstance().getBossGroup(), EventLoopGroupManager.getInstance().getWorkerGroup(), new ClientInitializer(), Config.LOGIN_BIND_ADDRESS, Config.PORT_LOGIN);
- }
-
- public static ClientNetworkManager getInstance()
- {
- return SingletonHolder.INSTANCE;
- }
-
- private static class SingletonHolder
- {
- protected static final ClientNetworkManager INSTANCE = new ClientNetworkManager();
- }
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ConnectionState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ConnectionState.java
index 70852dc4a7..5ed3f9ddac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ConnectionState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ConnectionState.java
@@ -16,12 +16,10 @@
*/
package org.l2jmobius.loginserver.network;
-import org.l2jmobius.commons.network.IConnectionState;
-
/**
* @author Mobius
*/
-public enum ConnectionState implements IConnectionState
+public enum ConnectionState
{
CONNECTED,
AUTHED_GG,
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/EventLoopGroupManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/EventLoopGroupManager.java
deleted file mode 100644
index 23bc038797..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/EventLoopGroupManager.java
+++ /dev/null
@@ -1,56 +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.loginserver.network;
-
-import org.l2jmobius.Config;
-
-import io.netty.channel.nio.NioEventLoopGroup;
-
-/**
- * @author Nos
- */
-public class EventLoopGroupManager
-{
- private final NioEventLoopGroup _bossGroup = new NioEventLoopGroup(1);
- private final NioEventLoopGroup _workerGroup = new NioEventLoopGroup(Config.IO_PACKET_THREAD_CORE_SIZE);
-
- public NioEventLoopGroup getBossGroup()
- {
- return _bossGroup;
- }
-
- public NioEventLoopGroup getWorkerGroup()
- {
- return _workerGroup;
- }
-
- public void shutdown()
- {
- _bossGroup.shutdownGracefully();
- _workerGroup.shutdownGracefully();
- }
-
- public static EventLoopGroupManager getInstance()
- {
- return SingletonHolder.INSTANCE;
- }
-
- private static class SingletonHolder
- {
- protected static final EventLoopGroupManager INSTANCE = new EventLoopGroupManager();
- }
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/GameServerPacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/GameServerPacketHandler.java
index 44e15afc1f..1d2f292285 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/GameServerPacketHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/GameServerPacketHandler.java
@@ -18,7 +18,7 @@ package org.l2jmobius.loginserver.network;
import java.util.logging.Logger;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.GameServerThread;
import org.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey;
import org.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel;
@@ -47,9 +47,9 @@ public class GameServerPacketHandler
AUTHED
}
- public static BaseRecievePacket handlePacket(byte[] data, GameServerThread server)
+ public static ReadablePacket handlePacket(byte[] data, GameServerThread server)
{
- BaseRecievePacket msg = null;
+ ReadablePacket msg = null;
final int opcode = data[0] & 0xff;
final GameServerState state = server.getLoginConnectionState();
switch (state)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java
index 8bb4bcef1f..efcc6c82d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java
@@ -16,19 +16,15 @@
*/
package org.l2jmobius.loginserver.network;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Logger;
import javax.crypto.SecretKey;
-import org.l2jmobius.commons.network.ChannelInboundHandler;
-import org.l2jmobius.commons.network.IIncomingPacket;
-import org.l2jmobius.commons.network.IOutgoingPacket;
+import org.l2jmobius.commons.network.EncryptionInterface;
+import org.l2jmobius.commons.network.NetClient;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.commons.util.crypt.ScrambledKeyPair;
import org.l2jmobius.loginserver.LoginController;
import org.l2jmobius.loginserver.SessionKey;
import org.l2jmobius.loginserver.enums.LoginFailReason;
@@ -37,22 +33,14 @@ import org.l2jmobius.loginserver.network.serverpackets.Init;
import org.l2jmobius.loginserver.network.serverpackets.LoginFail;
import org.l2jmobius.loginserver.network.serverpackets.PlayFail;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-
/**
* Represents a client connected into the LoginServer
* @author KenM
*/
-public class LoginClient extends ChannelInboundHandler
+public class LoginClient extends NetClient
{
- private static final Logger LOGGER = Logger.getLogger(LoginClient.class.getName());
-
- // Crypt
- private final ScrambledKeyPair _scrambledPair;
- private final SecretKey _blowfishKey;
- private InetAddress _addr;
- private Channel _channel;
+ private ScrambledKeyPair _scrambledPair;
+ private SecretKey _blowfishKey;
private String _account;
private int _accessLevel;
@@ -62,32 +50,29 @@ public class LoginClient extends ChannelInboundHandler
private boolean _joinedGS;
private Map _charsOnServers;
private Map _charsToDelete;
-
+ private ConnectionState _connectionState = ConnectionState.CONNECTED;
private long _connectionStartTime;
-
- public LoginClient(SecretKey blowfishKey)
- {
- super();
- _blowfishKey = blowfishKey;
- _scrambledPair = LoginController.getInstance().getScrambledRSAKeyPair();
- }
+ private final LoginEncryption _encryption = new LoginEncryption();
@Override
- public void channelActive(ChannelHandlerContext ctx)
+ public void onConnection()
{
- super.channelActive(ctx);
-
- setConnectionState(ConnectionState.CONNECTED);
- final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress();
- _addr = address.getAddress();
- _channel = ctx.channel();
+ _blowfishKey = LoginController.getInstance().generateBlowfishKey();
+ _encryption.setKey(_blowfishKey.getEncoded());
+ _scrambledPair = LoginController.getInstance().getScrambledRSAKeyPair();
_sessionId = Rnd.nextInt();
_connectionStartTime = System.currentTimeMillis();
sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId));
+
+ if (LoginController.getInstance().isBannedAddress(getIp()))
+ {
+ sendPacket(new LoginFail(LoginFailReason.REASON_NOT_AUTHED));
+ disconnect();
+ }
}
@Override
- public void channelInactive(ChannelHandlerContext ctx)
+ public void onDisconnection()
{
if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis()))
{
@@ -95,29 +80,6 @@ public class LoginClient extends ChannelInboundHandler
}
}
- @Override
- protected void channelRead0(ChannelHandlerContext ctx, IIncomingPacket packet)
- {
- try
- {
- packet.run(this);
- }
- catch (Exception e)
- {
- LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage());
- }
- }
-
- @Override
- public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
- {
- }
-
- public InetAddress getConnectionAddress()
- {
- return _addr;
- }
-
public String getAccount()
{
return _account;
@@ -183,7 +145,7 @@ public class LoginClient extends ChannelInboundHandler
return _connectionStartTime;
}
- public void sendPacket(IOutgoingPacket packet)
+ public void sendPacket(WritablePacket packet)
{
if ((packet == null))
{
@@ -191,7 +153,17 @@ public class LoginClient extends ChannelInboundHandler
}
// Write into the channel.
- _channel.writeAndFlush(packet);
+ if ((getChannel() != null) && getChannel().isConnected())
+ {
+ try
+ {
+ // Send the packet data.
+ getChannel().write(packet.getSendableByteBuffer());
+ }
+ catch (Exception ignored)
+ {
+ }
+ }
}
public void close(LoginFailReason reason)
@@ -204,7 +176,7 @@ public class LoginClient extends ChannelInboundHandler
close(new PlayFail(reason));
}
- public void close(IOutgoingPacket packet)
+ public void close(WritablePacket packet)
{
sendPacket(packet);
closeNow();
@@ -212,10 +184,7 @@ public class LoginClient extends ChannelInboundHandler
public void closeNow()
{
- if (_channel != null)
- {
- _channel.close();
- }
+ disconnect();
}
public void setCharsOnServ(int servId, int chars)
@@ -245,4 +214,45 @@ public class LoginClient extends ChannelInboundHandler
{
return _charsToDelete;
}
+
+ public ConnectionState getConnectionState()
+ {
+ return _connectionState;
+ }
+
+ public void setConnectionState(ConnectionState connectionState)
+ {
+ _connectionState = connectionState;
+ }
+
+ @Override
+ public EncryptionInterface getEncryption()
+ {
+ return _encryption;
+ }
+
+ @Override
+ public String toString()
+ {
+ final String ip = getIp();
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getClass().getSimpleName());
+ sb.append(" [");
+ if (_account != null)
+ {
+ sb.append("Account: ");
+ sb.append(_account);
+ }
+ if (ip != null)
+ {
+ if (_account != null)
+ {
+ sb.append(" - ");
+ }
+ sb.append("IP: ");
+ sb.append(ip);
+ }
+ sb.append("]");
+ return sb.toString();
+ }
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/IncomingPackets.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClientPackets.java
similarity index 61%
rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/IncomingPackets.java
rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClientPackets.java
index 3d36f0fe3f..1fdfffedd9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/IncomingPackets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClientPackets.java
@@ -21,10 +21,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.function.Supplier;
-import org.l2jmobius.commons.network.IConnectionState;
-import org.l2jmobius.commons.network.IIncomingPacket;
-import org.l2jmobius.commons.network.IIncomingPackets;
import org.l2jmobius.loginserver.network.clientpackets.AuthGameGuard;
+import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
import org.l2jmobius.loginserver.network.clientpackets.RequestAuthLogin;
import org.l2jmobius.loginserver.network.clientpackets.RequestServerList;
import org.l2jmobius.loginserver.network.clientpackets.RequestServerLogin;
@@ -32,7 +30,7 @@ import org.l2jmobius.loginserver.network.clientpackets.RequestServerLogin;
/**
* @author Mobius
*/
-public enum IncomingPackets implements IIncomingPackets
+public enum LoginClientPackets
{
AUTH_GAME_GUARD(0x07, AuthGameGuard::new, ConnectionState.CONNECTED),
REQUEST_AUTH_LOGIN(0x00, RequestAuthLogin::new, ConnectionState.AUTHED_GG),
@@ -41,49 +39,45 @@ public enum IncomingPackets implements IIncomingPackets
REQUEST_PI_AGREEMENT_CHECK(0x0E, null, ConnectionState.AUTHED_LOGIN),
REQUEST_PI_AGREEMENT(0x0F, null, ConnectionState.AUTHED_LOGIN);
- public static final IncomingPackets[] PACKET_ARRAY;
-
+ public static final LoginClientPackets[] PACKET_ARRAY;
static
{
- final short maxPacketId = (short) Arrays.stream(values()).mapToInt(IIncomingPackets::getPacketId).max().orElse(0);
- PACKET_ARRAY = new IncomingPackets[maxPacketId + 1];
- for (IncomingPackets incomingPacket : values())
+ final short maxPacketId = (short) Arrays.stream(values()).mapToInt(LoginClientPackets::getPacketId).max().orElse(0);
+ PACKET_ARRAY = new LoginClientPackets[maxPacketId + 1];
+ for (LoginClientPackets packet : values())
{
- PACKET_ARRAY[incomingPacket.getPacketId()] = incomingPacket;
+ PACKET_ARRAY[packet.getPacketId()] = packet;
}
}
private short _packetId;
- private Supplier> _incomingPacketFactory;
- private Set _connectionStates;
+ private Supplier _packetSupplier;
+ private Set _connectionStates;
- IncomingPackets(int packetId, Supplier> incomingPacketFactory, IConnectionState... connectionStates)
+ LoginClientPackets(int packetId, Supplier packetSupplier, ConnectionState... connectionStates)
{
- // packetId is an unsigned byte
+ // Packet id is an unsigned byte.
if (packetId > 0xFF)
{
- throw new IllegalArgumentException("packetId must not be bigger than 0xFF");
+ throw new IllegalArgumentException("Packet id must not be bigger than 0xFF");
}
_packetId = (short) packetId;
- _incomingPacketFactory = incomingPacketFactory != null ? incomingPacketFactory : () -> null;
+ _packetSupplier = packetSupplier != null ? packetSupplier : () -> null;
_connectionStates = new HashSet<>(Arrays.asList(connectionStates));
}
- @Override
public int getPacketId()
{
return _packetId;
}
- @Override
- public IIncomingPacket newIncomingPacket()
+ public LoginClientPacket newPacket()
{
- return _incomingPacketFactory.get();
+ return _packetSupplier.get();
}
- @Override
- public Set getConnectionStates()
+ public Set getConnectionStates()
{
return _connectionStates;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginEncryption.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginEncryption.java
new file mode 100644
index 0000000000..e9dad1d022
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginEncryption.java
@@ -0,0 +1,122 @@
+/*
+ * 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.loginserver.network;
+
+import org.l2jmobius.commons.crypt.NewCrypt;
+import org.l2jmobius.commons.network.EncryptionInterface;
+import org.l2jmobius.commons.util.Rnd;
+
+/**
+ * @author KenM
+ */
+public class LoginEncryption implements EncryptionInterface
+{
+ private static final byte[] STATIC_BLOWFISH_KEY =
+ {
+ (byte) 0x6b,
+ (byte) 0x60,
+ (byte) 0xcb,
+ (byte) 0x5b,
+ (byte) 0x82,
+ (byte) 0xce,
+ (byte) 0x90,
+ (byte) 0xb1,
+ (byte) 0xcc,
+ (byte) 0x2b,
+ (byte) 0x6c,
+ (byte) 0x55,
+ (byte) 0x6c,
+ (byte) 0x6c,
+ (byte) 0x6c,
+ (byte) 0x6c
+ };
+
+ private static final NewCrypt _STATIC_CRYPT = new NewCrypt(STATIC_BLOWFISH_KEY);
+ private NewCrypt _crypt = null;
+ private boolean _static = true;
+
+ /**
+ * Method to initialize the the blowfish cipher with dynamic key.
+ * @param key the blowfish key to initialize the dynamic blowfish cipher with
+ */
+ public void setKey(byte[] key)
+ {
+ _crypt = new NewCrypt(key);
+ }
+
+ /**
+ * Method to decrypt an incoming login client packet.
+ * @param raw array with encrypted data
+ * @param offset offset where the encrypted data is located
+ * @param size number of bytes of encrypted data
+ */
+ @Override
+ public void decrypt(byte[] raw, int offset, int size)
+ {
+ if ((size % 8) != 0)
+ {
+ // throw new IOException("size have to be multiple of 8");
+ }
+ if ((offset + size) > raw.length)
+ {
+ // throw new IOException("raw array too short for size starting from offset");
+ }
+
+ _crypt.decrypt(raw, offset, size);
+ }
+
+ /**
+ * Method to encrypt an outgoing packet to login client.
+ * Performs padding and resizing of data array.
+ * @param raw array with plain data
+ * @param offset offset where the plain data is located
+ * @param length number of bytes of plain data
+ */
+ @Override
+ public void encrypt(byte[] raw, int offset, int length)
+ {
+ // reserve checksum
+ int size = length + 4;
+
+ if (_static)
+ {
+ // reserve for XOR "key"
+ size += 4;
+
+ // padding
+ size += 8 - (size % 8);
+ if ((offset + size) > raw.length)
+ {
+ // throw new IOException("packet too long");
+ }
+ NewCrypt.encXORPass(raw, offset, size, Rnd.nextInt());
+ _STATIC_CRYPT.crypt(raw, offset, size);
+ _static = false;
+ }
+ else
+ {
+ // padding
+ size += 8 - (size % 8);
+ if ((offset + size) > raw.length)
+ {
+ // throw new IOException("packet too long");
+ }
+ NewCrypt.appendChecksum(raw, offset, size);
+ _crypt.crypt(raw, offset, size);
+ }
+ }
+}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java
new file mode 100644
index 0000000000..50c70e18f8
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java
@@ -0,0 +1,114 @@
+/*
+ * 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.loginserver.network;
+
+import java.util.logging.Logger;
+
+import org.l2jmobius.commons.network.PacketHandlerInterface;
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
+
+/**
+ * @author Mobius
+ */
+public class LoginPacketHandler implements PacketHandlerInterface
+{
+ private static final Logger LOGGER = Logger.getLogger(LoginPacketHandler.class.getName());
+
+ @Override
+ public void handle(LoginClient client, ReadablePacket packet)
+ {
+ // Read packet id.
+ final int packetId;
+ try
+ {
+ packetId = packet.readByte();
+ }
+ catch (Exception e)
+ {
+ PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+ PacketLogger.warning(CommonUtil.getStackTrace(e));
+ client.disconnect();
+ return;
+ }
+
+ // Check if packet id is within valid range.
+ if ((packetId < 0) || (packetId >= LoginClientPackets.PACKET_ARRAY.length))
+ {
+ return;
+ }
+
+ // Find packet enum.
+ final LoginClientPackets packetEnum = LoginClientPackets.PACKET_ARRAY[packetId];
+ if (packetEnum == null)
+ {
+ return;
+ }
+
+ // Check connection state.
+ if (!packetEnum.getConnectionStates().contains(client.getConnectionState()))
+ {
+ return;
+ }
+
+ // Create new LoginClientPacket.
+ final LoginClientPacket newPacket = packetEnum.newPacket();
+ if (newPacket == null)
+ {
+ return;
+ }
+
+ // Continue on another thread.
+ final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+ thread.setPriority(Thread.NORM_PRIORITY);
+ thread.setDaemon(false);
+ thread.start();
+ }
+
+ private class ExecuteTask implements Runnable
+ {
+ private final LoginClient _client;
+ private final ReadablePacket _packet;
+ private final LoginClientPacket _newPacket;
+ private final int _packetId;
+
+ public ExecuteTask(LoginClient client, ReadablePacket packet, LoginClientPacket 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("LoginPacketHandler->ExecuteTask: Problem with " + _client + " [Packet: 0x" + Integer.toHexString(_packetId).toUpperCase() + "]");
+ LOGGER.warning(CommonUtil.getStackTrace(e));
+ }
+ }
+ }
+}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/OutgoingPackets.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginServerPackets.java
similarity index 64%
rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/OutgoingPackets.java
rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginServerPackets.java
index ec70562b15..b059603ef3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/OutgoingPackets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginServerPackets.java
@@ -16,12 +16,12 @@
*/
package org.l2jmobius.loginserver.network;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author Mobius
*/
-public enum OutgoingPackets
+public enum LoginServerPackets
{
INIT(0x00),
LOGIN_FAIL(0x01),
@@ -39,45 +39,23 @@ public enum OutgoingPackets
private final int _id1;
private final int _id2;
- OutgoingPackets(int id1)
+ LoginServerPackets(int id1)
{
this(id1, -1);
}
- OutgoingPackets(int id1, int id2)
+ LoginServerPackets(int id1, int id2)
{
_id1 = id1;
_id2 = id2;
}
- public int getId1()
+ public void writeId(WritablePacket packet)
{
- return _id1;
- }
-
- public int getId2()
- {
- return _id2;
- }
-
- public void writeId(PacketWriter packet)
- {
- 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_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ScrambledKeyPair.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/ScrambledKeyPair.java
rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ScrambledKeyPair.java
index 44a1c08b67..3db2617611 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/ScrambledKeyPair.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/ScrambledKeyPair.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.l2jmobius.commons.util.crypt;
+package org.l2jmobius.loginserver.network;
import java.math.BigInteger;
import java.security.Key;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/clientpackets/AuthGameGuard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/clientpackets/AuthGameGuard.java
index 9b85a015e2..f5c82b5681 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/clientpackets/AuthGameGuard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/clientpackets/AuthGameGuard.java
@@ -16,8 +16,7 @@
*/
package org.l2jmobius.loginserver.network.clientpackets;
-import org.l2jmobius.commons.network.IIncomingPacket;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.enums.LoginFailReason;
import org.l2jmobius.loginserver.network.ConnectionState;
import org.l2jmobius.loginserver.network.LoginClient;
@@ -27,7 +26,7 @@ import org.l2jmobius.loginserver.network.serverpackets.GGAuth;
* Format: ddddd
* @author -Wooden-
*/
-public class AuthGameGuard implements IIncomingPacket
+public class AuthGameGuard implements LoginClientPacket
{
private int _sessionId;
@@ -41,18 +40,16 @@ public class AuthGameGuard implements IIncomingPacket